Skip to content

Commit

Permalink
Merge pull request #215 from conveyal/dev
Browse files Browse the repository at this point in the history
v3.9.3
  • Loading branch information
trevorgerhardt authored May 15, 2017
2 parents 03d868c + 02f30b7 commit 5a5487a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion __tests__/bin/mastarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe('mastarm cli', () => {
})

it('should run lint on a project', done => {
exec(`node ${mastarm} lint`, (err, stdout, stderr) => {
exec(`node ${mastarm}-lint`, (err, stdout, stderr) => {
expect(err).toBeNull()
expect(stdout).toBe('')
expect(stderr).toBe('')
Expand Down
2 changes: 1 addition & 1 deletion bin/mastarm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ commander
.command('build [entries...]', 'Bundle JavaScript & CSS')
.command('commit', 'Force intelligent commit messages.')
.command('deploy', 'Bundle & Deploy JavaScript & CSS')
.command('flow [command]', 'Run flow on the current directory.')
.command('flow', 'Run flow on the current directory.')
.command('format [entries...]', 'Format JavaScript')
.command('lint', 'Lint JavaScript')
.command(
Expand Down
11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@
"npm": "3"
},
"bin": {
"mastarm": "bin/mastarm"
"mastarm": "bin/mastarm",
"mastarm-build": "bin/mastarm-build",
"mastarm-commit": "bin/mastarm-commit",
"mastarm-deploy": "bin/mastarm-deploy",
"mastarm-flow": "bin/mastarm-flow",
"mastarm-format": "bin/mastarm-format",
"mastarm-lint": "bin/mastarm-lint",
"mastarm-lint-messages": "bin/mastarm-lint-messages",
"mastarm-prepublish": "bin/mastarm-prepublish",
"mastarm-test": "bin/mastarm-test"
},
"scripts": {
"cover": "bin/mastarm test --env test --test-environment node --coverage --coverage-paths bin",
Expand Down

0 comments on commit 5a5487a

Please sign in to comment.