added option to run from 'cross-os' section in the package.json

Author: milewski

README.md

@@ -20,11 +20,11 @@ Add scripts to your package.json like so:
 
 ```json
 "scripts": {
-  "foo": "cross-os fight",
-  "fight": {
-    "darwin": "echo 'i make the product that the artist chooses' && echo 'and the GUI that Melinda uses'",
-    "win32": "echo 'fine, you wanna be like that, die then.'",
-    "linux": "echo 'i stomp on a mac and a PC too, im a Linux bitch, i thought you both GNU",
+  "foo": "cross-os bar",
+  "bar": {
+    "darwin": "echo 'i will only run on Mac'",
+    "win32": "echo 'i will only run on Windows'",
+    "linux": "echo 'i will only run on Linux'"
   }
 }
 ```
@@ -33,6 +33,21 @@ And call it like:
 npm run foo
 ```
 
+Alternatively you can also specify scripts on its own section in your `package.json`
+
+```json
+"scripts": {
+  "foo": "cross-os bar"
+}
+"cross-os": {
+  "bar": {
+    "darwin": "echo 'i will only run on Mac'",
+    "win32": "echo 'i will only run on Windows'",
+    "linux": "echo 'i will only run on Linux'"
+  }
+}
+```
+
 ## License 
 
-[MIT](LICENSE)
+[MIT](LICENSE) © 2017 [Rafael Milewski](https://github.com/milewski)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-os",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Allow to add OS-specific scripts in your package.json!",
   "main": "source/index.js",
   "bin": "source/index.js",
@@ -34,14 +34,13 @@
     "source/*.js",
     "test"
   ],
-  "dependencies": {
-  },
   "scripts": {
     "prepublish": "npm run build && npm test",
     "build": "tsc",
     "pretest": "npm run build",
     "test": "mocha --no-timeouts"
   },
+  "dependencies": {},
   "devDependencies": {
     "@types/mocha": "^2.2.40",
     "@types/node": "^7.0.12",

source/index.ts

@@ -15,10 +15,15 @@ const pipeline = new Promise(resolve => {
     /**
      * Check if the desired script exists
      */
-    let script = process.argv.pop();
+    let script = process.argv.pop(),
+        property = 'scripts';
+
+    if (config[property] && !config[property][script]) {
+        property = 'cross-os'
+    }
 
     try {
-        return Promise.resolve(config['scripts'][script][process.platform]);
+        return Promise.resolve(config[property][script][process.platform]);
     } catch (e) {
         throw script
     }

test/package.json

@@ -7,6 +7,16 @@
     },
     "second": {},
     "third": "echo 'it is working just fine'",
-    "fourth": "node ../source/index.js first"
+    "fourth": "node ../source/index.js first",
+    "sixth": "node ../source/index.js first",
+    "seventh": "node ../source/index.js fifth"
+  },
+  "cross-os": {
+    "fifth": {
+      "win32": "echo hello from cross-os win32",
+      "linux": "echo hello from cross-os linux",
+      "darwin": "echo hello from cross-os darwin"
+    },
+    "sixth": "echo i should not been seen"
   }
 }

test/test.ts

@@ -40,7 +40,7 @@ describe('Loader', () => {
         })
 
         child.on('exit', code => {
-            expect(output).to.match(/it is working just fine/)
+            expect(output.trim()).to.match(/it is working just fine/)
             expect(code).to.be(0)
             done()
         })
@@ -58,7 +58,50 @@ describe('Loader', () => {
         })
 
         child.on('exit', code => {
-            expect(output).to.match(new RegExp(`hello from ${process.platform}`))
+            expect(output.trim()).to.match(new RegExp(`hello from ${process.platform}`))
+            expect(code).to.be(0)
+            done()
+        })
+
+    })
+
+    it('should run scripts defined in cross-os attributes', () => {
+
+        const stdout = execSync(`node ${cross} fifth`)
+        expect(stdout.toString()).to.match(new RegExp(`hello from cross-os ${process.platform}`))
+
+    })
+
+    it('should run scripts defined in cross-os attributes (called from npm scripts)', done => {
+
+        const child = exec('npm run seventh --silent')
+
+        let output = '';
+
+        child.stdout.on('data', (buffer: Buffer) => {
+            output += buffer.toString('utf-8')
+        })
+
+        child.on('exit', code => {
+            expect(output.trim()).to.match(new RegExp(`hello from cross-os ${process.platform}`))
+            expect(code).to.be(0)
+            done()
+        })
+
+    })
+
+    it('scripts should have precedence over cross-os attribute', done => {
+
+        const child = exec('npm run sixth --silent')
+
+        let output = '';
+
+        child.stdout.on('data', (buffer: Buffer) => {
+            output += buffer.toString('utf-8')
+        })
+
+        child.on('exit', code => {
+            expect(output.trim()).to.match(new RegExp(`hello from ${process.platform}`))
             expect(code).to.be(0)
             done()
         })