Skip to content

Commit

Permalink
Apply code style, fix node versions in TravisCI setup
Browse files Browse the repository at this point in the history
  • Loading branch information
nknapp committed Dec 20, 2016
1 parent 4d5f0ae commit d5ba1d9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
@@ -1,8 +1,9 @@
sudo: false
language: "node_js"
node_js:
- "4.2"
- "5.0"
node_js:
- "4"
- "6"
- "7"
script:
- npm install istanbul
- istanbul cover ./node_modules/.bin/_mocha --report lcovonly
Expand Down
8 changes: 4 additions & 4 deletions lib/git.js
Expand Up @@ -41,7 +41,7 @@ function Git (dir) {
'LANG': 'en_US'
}, process.env)

var gitcmd = module.exports.mockCmd ? [ 'node', module.exports.mockCmd ] : 'git'
var gitcmd = module.exports.mockCmd ? ['node', module.exports.mockCmd] : 'git'

/**
* Execute git with a list of cmd-line arguments in the working directory
Expand All @@ -60,7 +60,7 @@ function Git (dir) {
* Spawn git, keeping stdio connected to the parents stdio. The is needed for commands
* that need a tty to work
* @returns {*}
*/
*/
this.spawn = function spawnGit () {
debug(`Running in ${dir}`, gitcmd, _.toArray(arguments))
return cpp.spawn(gitcmd, _.toArray(arguments), {env: env, cwd: dir, stdio: 'inherit'})
Expand Down Expand Up @@ -188,8 +188,8 @@ function Git (dir) {
var targetBranch = (options && options.targetBranch) || 'master'
var thoughtful = process.argv[1]
/* istanbul ignore else
The default value for "thoughtful" is the current process. It
is hardly possible to use this default value in a unit-test */
The default value for "thoughtful" is the current process. It
is hardly possible to use this default value in a unit-test */
if (options && options.thoughtful) {
thoughtful = options.thoughtful
}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -22,10 +22,10 @@
"preferGlobal": true,
"license": "MIT",
"scripts": {
"pretest": "standard --version || npm -g install standard@5",
"pretest": "standard --version || npm -g install standard",
"test": "mocha && standard",
"preformat": "standard --version || npm -g install standard@5",
"format": "standard --format",
"preformat": "standard --version || npm -g install standard",
"format": "standard --fix",
"thought": "thought run -a",
"prethoughtcheck": "thought --version || npm -g install thought",
"thoughtcheck": "thought check-engines",
Expand Down

0 comments on commit d5ba1d9

Please sign in to comment.