Skip to content

Commit

Permalink
Add Travis CI support, minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Sannis committed Nov 14, 2011
1 parent f5e1406 commit c13bc1a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
@@ -0,0 +1,5 @@
language: node_js
node_js:
- 0.4
- 0.5
- 0.6
7 changes: 4 additions & 3 deletions Makefile
Expand Up @@ -23,8 +23,8 @@ all: build doc

build: stamp-build

stamp-build: jslint/jslint.js nodelint config.js
touch $@;
stamp-build: dependencies jslint/jslint.js nodelint config.js
touch stamp-build;
cp $^ $(BUILDDIR);
perl -pi -e 's{^\s*SCRIPT_DIRECTORY =.*?\n}{}ms' $(BUILDDIR)/nodelint
perl -pi -e 's{path\.join\(SCRIPT_DIRECTORY, '\''config.js'\''\)}{"$(ETCDIR)/nodelint.conf"}' $(BUILDDIR)/nodelint
Expand All @@ -50,8 +50,9 @@ dependencies: stamp-dependencies
stamp-dependencies:
touch stamp-dependencies;
npm install
git submodule update --init --recursive

devdependencies: stamp-devdependencies
devdependencies: dependencies stamp-devdependencies

stamp-devdependencies:
touch stamp-devdependencies;
Expand Down
18 changes: 11 additions & 7 deletions package.json
Expand Up @@ -21,24 +21,28 @@
"Nathan Landis (https://github.com/my8bird)",
"Clemens Akens (https://github.com/clebert)"
],
"bin": {
"nodelint": "./nodelint"
},
"directories": { "doc": "./doc", "man": "./man1" },
"repository": {
"type": "git",
"url": "git://github.com/tav/nodelint.git"
},
"bugs": { "url": "https://github.com/tav/nodelint/issues" },
"bin": {
"nodelint": "./nodelint"
},
"directories": { "doc": "./doc", "man": "./man1" },
"dependencies": {
"file": ">=0.1.1"
},
"devDependencies": {
"nodeunit": ">=0.6.2",
"ronn": ">=0.3.7"
},
"bugs": { "url": "https://github.com/tav/nodelint/issues" },
"engines": { "node": ">=0.4" },
"scripts": {
"test": "make test",
"prepublish" : "make doc"
},
"licenses": {
"type": "Public Domain"
},
"engines": { "node": ">=0.4" }
}
}
6 changes: 3 additions & 3 deletions test/test-lint-code.js
Expand Up @@ -17,10 +17,10 @@ var helper = require('./helper');
*/
exports.MakeLint = function (test) {
helper.testConsoleOutput(
'make',
['lint'],
'./nodelint',
['./nodelint', './config.js', './lib/', './test/'],
{
stdout: './nodelint ./nodelint ./config.js ./lib/ ./test/\n0 errors\n',
stdout: '0 errors\n',
stderr: '',
exitCode: 0
},
Expand Down

0 comments on commit c13bc1a

Please sign in to comment.