Windows command runner

.gitignore

@@ -1,2 +1,4 @@
 coverage
 test/home/.config
+test/home/builds
+node_modules/

README.md

@@ -36,6 +36,8 @@ gcr - a gitlab ci runner
       -s, --strictSSL             enable/disable strict ssl
       -n, --npm                   run npm install/test if no commands are present
       -k, --keypath <path>        specify path to rsa key
+      -s, --shell <path>          specify path to shell e.g. /bin/bash
+      -sf, --shellFlag <flag>     set the flag to run commands on your shell e.g. -c
 ```
 
 ## Why?

bin/cmd.js

@@ -20,6 +20,8 @@ var gcr = require('../lib/gcr')
                 , strictSSL: Boolean
                 , timeout: Number
                 , keypath: path
+                , shell: path
+                , shellFlag: String
                 }
   , shortHand = { verbose: ['--loglevel', 'verbose']
                 , h: ['--help']
@@ -30,6 +32,8 @@ var gcr = require('../lib/gcr')
                 , s: ['--strictSSL']
                 , T: ['--timeout']
                 , k: ['--keypath']
+                , s: ['--shell']
+                , sf: ['--shellFlag']
                 }
   , parsed = nopt(knownOpts, shortHand)
 

bin/usage.txt

@@ -16,3 +16,5 @@ gcr - a gitlab ci runner
       -s, --strictSSL             enable/disable strict ssl
       -n, --npm                   run npm install/test if no commands are present
       -k, --keypath <path>        specify path to rsa key
+      -s, --shell <path>          specify path to shell e.g. /bin/bash
+      -sf, --shellFlag <flag>     set the flag to run commands on your shell e.g. -c

lib/build.js

@@ -173,7 +173,7 @@ Build.prototype.runCommand = function(cmd, dir, cb) {
   log.verbose('[builder]', 'cmd', cmd)
   this.append(util.format('\n%s\n', cmd))
 
-  var child = spawn('/bin/bash', ['-c', fixedCmd.join(' ')], opts)
+  var child = spawn(gcr.config.get('shell'), [gcr.config.get('shellFlag'), fixedCmd.join(' ')], opts)
   var timedout = false
   var timer = setTimeout(function() {
     timedout = true

lib/config.default.js

@@ -19,5 +19,8 @@ module.exports = function(parsed) {
   o.strictSSL = parsed.hasOwnProperty('strictSSL')
               ? parsed.strictSSL
               : true
+
+  o.shell = parsed.shell ? parsed.shell : isWin ? 'C:\\Windows\\System32\\cmd.exe' : '/bin/bash'
+  o.shellFlag = parsed.shellFlag ? parsed.shellFlag : isWin ? '/C' : '-c'
   return o
 }

lib/gcr.js

@@ -15,7 +15,8 @@ log.heading = 'gcr'
 
 module.exports = gcr
 
-gcr.root = path.dirname(confFile)
+gcr.confFile = confFile
+gcr.root = path.dirname(gcr.confFile)
 gcr.loaded = false
 gcr.version = require('../package').version
 
@@ -30,7 +31,7 @@ gcr.load = function(opts, cb) {
       err.heading = '[mkdirp]'
       return cb(err)
     }
-    nconf.file({ file: confFile })
+    nconf.file({ file: gcr.confFile })
     nconf.defaults(require('./config.default')(opts))
     if (opts.url) {
       nconf.set('url', opts.url)
@@ -56,6 +57,12 @@ gcr.load = function(opts, cb) {
     if (opts.keypath) {
       nconf.set('keypath', opts.keypath)
     }
+    if (opts.shell) {
+      nconf.set('shell', opts.shell)
+    }
+    if (opts.shellFlag) {
+      nconf.set('shellFlag', opts.shellFlag)
+    }
     gcr.config = nconf
     chain([
         validateGit

test/gcr.js

@@ -18,6 +18,9 @@ describe('gcr', function() {
       port = server.address().port
       done()
     })
+
+    gcr.root = path.join(HOME, '.config')
+    gcr.confFile = path.join(HOME, '.config', 'gcr.json')
   })
 
   it('should be an EventEmitter', function() {
@@ -29,6 +32,11 @@ describe('gcr', function() {
     gcr.root.should.equal(path.join(HOME, '.config'))
   })
 
+  it('should have property confFile', function(){
+    should.exist(gcr.confFile)
+    gcr.confFile.should.equal(path.join(HOME, '.config', 'gcr.json'))
+  })
+
   it('should have property loaded', function() {
     gcr.loaded.should.be.false
   })
@@ -46,7 +54,7 @@ describe('gcr', function() {
     gcr.load({
       url: 'http://127.0.0.1:' + port + '/ci'
     , token: 'biscuits'
-    , buildDir: '/tmp/gcr-builds'
+    , buildDir: __dirname + '/home/builds'
     , npm: true
     , strictSSL: false
     , timeout: 5000
@@ -66,6 +74,11 @@ describe('gcr', function() {
     gcr.should.have.property('config')
   })
 
+  it('should set the shell options', function(){
+    gcr.config.get('shell').should.exist
+    gcr.config.get('shellFlag').should.exist
+  })
+
   describe('build', function() {
     var Build = require('../lib/build')
     var build
@@ -89,7 +102,7 @@ describe('gcr', function() {
       build.should.have.property('opts')
       build.should.have.property('output')
       build.should.have.property('projectDir')
-      build.projectDir.should.equal('/tmp/gcr-builds/project-1')
+      build.projectDir.should.equal(__dirname + '/home/builds/project-1'.replace(/\//g, path.sep))
       build.should.have.property('state', 'waiting')
     })