Fix windows

lib/print-script.test.js

@@ -13,13 +13,8 @@ module.exports = {
     this.subject(script)
 
     assert.includes(log.read(), 'Executing "' + script + '":\n')
-    assert.includes(log.read(),
-      '> #!/usr/bin/env sh\n' +
-      '> \n' +
-      '> npm test -- --debug-brk\n' +
-      '> \n' +
-      '\n'
-    )
+    assert.includes(log.read(), '> #!/usr/bin/env sh')
+    assert.includes(log.read(), '> npm test -- --debug-brk')
   },
   sadPath: function () {
     var script = '/silly/nonsense'

lib/resolve-script/find-executables.js

@@ -1,4 +1,5 @@
 var glob = require('glob')
+var path = require('path')
 var async = require('async')
 var isExecutable = require('./is-executable')
 var _ = require('lodash')
@@ -9,7 +10,7 @@ module.exports = function (pattern, cb) {
     async.map(results, function (result, cb) {
       isExecutable(result, function (er, itIsExecutable) {
         if (itIsExecutable) {
-          cb(er, result)
+          cb(er, path.resolve(result))
         } else {
           console.warn(
             'Warning: scripty - ignoring script "' + result + '" because it' +
@@ -24,4 +25,3 @@ module.exports = function (pattern, cb) {
     })
   })
 }
-

lib/resolve-script/find-executables.test.js

@@ -17,8 +17,6 @@ module.exports = {
     })
   },
   noFilesFound: function (done) {
-    fs.writeFileSync(this.foo1, 'hi')
-
     this.subject(path.resolve(__dirname, 'foo*'), function (er, result) {
       assert.deepEqual(result, [])
       done(er)
@@ -34,6 +32,7 @@ module.exports = {
     }.bind(this))
   },
   oneFileFoundWithOneNonExecutable: function (done) {
+    if (process.platform === 'win32') return done()
     fs.writeFileSync(this.foo1, 'hi')
     fs.writeFileSync(this.foo2, 'hi')
     exec('chmod +x "' + this.foo1 + '"', function () {

lib/resolve-script/generate-glob.js

@@ -2,12 +2,12 @@ var path = require('path')
 var fs = require('fs')
 
 module.exports = function (dir1, dir2) {
-  var expanded = path.resolve(dir1, dir2.replace(/\:/g, '/'))
+  var expanded = path.resolve(dir1, path.join.apply(this, dir2.split(':')))
   if (isDir(expanded)) {
     if (containsIndexFile(expanded)) {
-      return expanded + '/index*'
+      return path.join(expanded, 'index') + '*'
     } else {
-      return expanded + '/*'
+      return path.join(expanded, '/') + '*'
     }
   } else {
     return expanded + '*'

lib/resolve-script/generate-glob.test.js

@@ -1,23 +1,27 @@
 var path = require('path')
 
+var base = path.resolve('test/fixtures/user-scripts')
 module.exports = {
   beforeEach: function () {
     this.subject = require('./generate-glob')
-    this.root = path.resolve('test/fixtures/user-scripts')
   },
   fileInADir: function () {
-    assert.equal(this.root + '/foo/bar*', this.subject(this.root, 'foo:bar'))
+    assert.equal(this.subject(base, 'foo:bar'), globFor('foo/bar'))
   },
   nonExistentFile: function () {
-    assert.equal(this.root + '/fake/stuff*', this.subject(this.root, 'fake:stuff'))
+    assert.equal(this.subject(base, 'fake:stuff'), globFor('fake/stuff'))
   },
   dirWithNoIndex: function () {
-    assert.equal(this.root + '/baz/*', this.subject(this.root, 'baz'))
+    assert.equal(this.subject(base, 'baz'), globFor('baz/'))
   },
   dirWithAnIndexFile: function () {
-    assert.equal(this.root + '/car/index*', this.subject(this.root, 'car'))
+    assert.equal(this.subject(base, 'car'), globFor('car/index'))
   },
   dirWithADirNamedIndex: function () {
-    assert.equal(this.root + '/dog/*', this.subject(this.root, 'dog'))
+    assert.equal(this.subject(base, 'dog'), globFor('dog/'))
   }
 }
+
+function globFor (partialPath) {
+  return path.join(base, partialPath) + '*'
+}

lib/resolve-script/index.js

@@ -1,17 +1,15 @@
-var path = require('path')
-
 var generateGlob = require('./generate-glob')
 var findExecutables = require('./find-executables')
+var scriptDirs = require('./script-dirs')
 
 module.exports = function (name, options, cb) {
-  var userDir = options.scripts || path.resolve(process.cwd(), 'scripts')
-  var userGlob = generateGlob(userDir, name)
+  var dirs = scriptDirs(options)
+  var userGlob = generateGlob(dirs.userDir, name)
   findExecutables(userGlob, function (er, userPaths) {
     if (userPaths.length > 0) {
       cb(er, userPaths)
     } else {
-      var ourDir = options.builtIn || path.resolve(__dirname, '../../scripts')
-      var ourGlob = generateGlob(ourDir, name)
+      var ourGlob = generateGlob(dirs.ourDir, name)
       findExecutables(ourGlob, function (er, ourPaths) {
         if (ourPaths.length > 0) {
           cb(er, ourPaths)

lib/resolve-script/index.test.js

@@ -1,15 +1,16 @@
-var path = require('path')
+var isA = td.matchers.isA
 
 module.exports = {
   beforeEach: function () {
     td.when(td.replace(process, 'cwd')()).thenReturn('/user-dir')
     this.generateGlob = td.replace('./generate-glob')
     this.findExecutables = td.replace('./find-executables')
+    this.scriptDirs = td.replace('./script-dirs')
     this.subject = require('./index')
 
-    this.scriptsDir = path.resolve(__dirname, '../../scripts')
-    td.when(this.generateGlob('/user-dir/scripts', 'fake')).thenReturn('glob1')
-    td.when(this.generateGlob(this.scriptsDir, 'fake')).thenReturn('glob2')
+    td.when(this.scriptDirs(isA(Object))).thenReturn({userDir: 'A', ourDir: 'B'})
+    td.when(this.generateGlob('A', 'fake')).thenReturn('glob1')
+    td.when(this.generateGlob('B', 'fake')).thenReturn('glob2')
   },
   bothUserAndBuiltInScriptsExist: function (done) {
     td.when(this.findExecutables('glob1')).thenCallback(null, ['user-path'])

lib/resolve-script/is-executable.js

@@ -1,14 +1,15 @@
 var fs = require('fs')
 
 module.exports = function (path, cb) {
+  if (process.platform === 'win32') return cb(null, true)
   fs.stat(path, function (er, stats) {
+    if (er) return cb(er)
     var mode = stats.mode
 
     var owner = mode >> 6
     var group = (mode << 3) >> 6
     var others = (mode << 6) >> 6
 
-    if (er) return cb(er)
     cb(er, !!(owner & 1) || !!(group & 1) || !!(others & 1))
   })
 }

lib/resolve-script/is-executable.test.js

@@ -33,10 +33,18 @@ module.exports = {
     })
   },
   noXIsNotX: function (done) {
+    if (process.platform === 'win32') return done()
     fs.chmodSync(root + '/no-x', '644')
     subject(root + '/no-x', function (er, answer) {
       assert.equal(answer, false)
       done(er)
     })
+  },
+  anyWindowsIsAllX: function (done) {
+    if (process.platform !== 'win32') return done()
+    subject(root + '/silly-lololo', function (er, answer) {
+      assert.equal(answer, true)
+      done(er)
+    })
   }
 }

lib/resolve-script/script-dirs.js

@@ -0,0 +1,19 @@
+var path = require('path')
+var fs = require('fs')
+
+module.exports = function (options) {
+  return {
+    userDir: findDir(process.cwd(), options.scripts),
+    ourDir: findDir(path.resolve(__dirname, '../..'), options.builtIn)
+  }
+}
+
+function findDir (base, custom) {
+  if (custom) {
+    return custom
+  } else if (process.platform === 'win32' && fs.existsSync(path.resolve(base, 'scripts-win'))) {
+    return path.resolve(base, 'scripts-win')
+  } else {
+    return path.resolve(base, 'scripts')
+  }
+}

lib/resolve-script/script-dirs.test.js

@@ -0,0 +1,26 @@
+var path = require('path')
+
+var subject = require('./script-dirs')
+
+module.exports = {
+  optionSet: function () {
+    assert.equal(subject({scripts: 'A'}).userDir, 'A')
+    assert.equal(subject({builtIn: 'B'}).ourDir, 'B')
+  },
+  noOptionSet: function () {
+    var dirName = process.platform === 'win32' ? 'scripts-win' : 'scripts'
+
+    var result = subject({})
+
+    assert.equal(result.userDir, path.resolve(process.cwd(), dirName))
+    assert.equal(result.ourDir, path.resolve(__dirname, '../..', dirName))
+  },
+  onWindowsAndNoScriptsWinAssumesScripts: function () {
+    if (process.platform !== 'win32') return
+    td.when(td.replace(process, 'cwd')()).thenReturn(__dirname)
+
+    var result = subject({})
+
+    assert.equal(result.userDir, path.resolve(process.cwd(), 'scripts'))
+  }
+}

scripts-win/noop.cmd

@@ -0,0 +1 @@
+

test/fixtures/built-in-scripts-win/hello/world.cmd

@@ -0,0 +1,5 @@
+@ECHO OFF
+
+SET WORLD=World
+
+ECHO Hello, %WORLD%!

test/fixtures/user-scripts-win/fail.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+type C:\silly\nonsense

test/fixtures/user-scripts-win/parent/a.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ECHO AAA

test/fixtures/user-scripts-win/parent/b.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ECHO BBB

test/fixtures/user-scripts-win/parent/c.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ECHO CCC

test/fixtures/user-scripts-win/top/index.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ECHO rubby

test/run-scripty.js

@@ -4,13 +4,22 @@ var path = require('path')
 var scripty = require('../index')
 var grabStdio = require('./grab-stdio')
 
+var builtInPath, userPath
+if (process.platform === 'win32') {
+  builtInPath = path.resolve('test/fixtures/built-in-scripts-win')
+  userPath = path.resolve('test/fixtures/user-scripts-win')
+} else {
+  builtInPath = path.resolve('test/fixtures/built-in-scripts')
+  userPath = path.resolve('test/fixtures/user-scripts')
+}
+
 module.exports = function (name, opts, cb) {
   var stdio = {}
 
   scripty(name, _.extend({}, {
     resolve: {
-      builtIn: path.resolve('test/fixtures/built-in-scripts'),
-      scripts: path.resolve('test/fixtures/user-scripts')
+      builtIn: builtInPath,
+      scripts: userPath
     },
     spawn: {
       tap: grabStdio(stdio)

test/safe/basic-test.js

@@ -5,7 +5,11 @@ module.exports = {
   outputAndRunScript: function (done) {
     runScripty('hello:world', {}, function (er, code, stdio) {
       assert.equal(0, code)
-      assert.includes(log.read(), '> echo "Hello, $WORLD!"')
+      if (process.platform === 'win32') {
+        assert.includes(log.read(), '> ECHO Hello, %WORLD%!')
+      } else {
+        assert.includes(log.read(), '> echo "Hello, $WORLD!')
+      }
       assert.includes(stdio.stdout, 'Hello, World!')
 
       done(er)
@@ -28,9 +32,11 @@ module.exports = {
         'Error: scripty - script "fail" failed by exiting ' +
         'with a non-zero code (' + code + ').'
       )
-      assert.includes(stdio.stderr,
-        'cat: /silly/nonsense: No such file or directory'
-      )
+      if (process.platform === 'win32') {
+        assert.includes(stdio.stderr, 'The system cannot find the path specified.')
+      } else {
+        assert.includes(stdio.stderr, 'cat: /silly/nonsense: No such file or directory')
+      }
       done(null)
     })
   }