Skip to content

Commit

Permalink
Update support files.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredhanson committed Jan 30, 2016
1 parent b1da146 commit 84403a0
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 64 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
build/
docs/
reports/

# Node.js
node_modules/
npm-debug.log

# Mac OS X
.DS_Store

# Node.js
node_modules
npm-debug.log
15 changes: 0 additions & 15 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
Makefile
README.md
build/
docs/
examples/
reports/
support/
test/

# Node.js
.npmignore
node_modules/
npm-debug.log

# Mac OS X
.DS_Store

# Git
.git*

# Utilities
.jshintrc
.travis.yml
19 changes: 14 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
language: "node_js"
node_js:
- "5"
- "4"
- "3" # io.js
- "2" # io.js
- "1" # io.js
- "0.12"
- "0.10"
- "0.8"
- "iojs"
- "0.6"


before_install:
- "npm install istanbul -g"
- "npm install coveralls -g"
- "npm install [email protected] -g"
- "preinstall-compat"

script: "make ci-travis"
script:
- "make test-cov"

after_success:
- "make submit-cov-to-coveralls"
- "make report-cov"

sudo: false
50 changes: 14 additions & 36 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,47 +1,25 @@
SOURCES ?= lib/*.js lib/**/*.js
TESTS ?= test/*.test.js
include node_modules/make-node/main.mk

test: test-mocha
test-cov: test-istanbul-mocha
view-cov: view-istanbul-report
lint: lint-jshint
lint-tests: lint-tests-jshint

SOURCES = lib/*.js lib/**/*.js
TESTS = test/*.test.js

# ==============================================================================
# Node.js
# ==============================================================================
include support/mk/node.mk
include support/mk/mocha.mk
include support/mk/istanbul.mk
LCOVFILE = ./reports/coverage/lcov.info

# ==============================================================================
# Analysis
# ==============================================================================
include support/mk/notes.mk
include support/mk/jshint.mk
MOCHAFLAGS = --require ./test/bootstrap/node

# ==============================================================================
# Reports
# ==============================================================================
include support/mk/coveralls.mk

# ==============================================================================
# Continuous Integration
# ==============================================================================
submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls
view-docs:
open ./docs/index.html

# Travis CI
ci-travis: test test-cov
view-cov:
open ./reports/coverage/lcov-report/index.html

# ==============================================================================
# Clean
# ==============================================================================
clean:
rm -rf build
rm -rf reports
clean: clean-docs clean-cov
-rm -r $(REPORTSDIR)

clobber: clean clobber-node
clobber: clean
-rm -r node_modules


.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber
.PHONY: clean clobber
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,26 @@
"url": "http://github.com/jaredhanson/passport-facebook/issues"
},
"license": "MIT",
"licenses": [
{
"type": "MIT",
"url": "http://opensource.org/licenses/MIT"
}
],
"main": "./lib",
"dependencies": {
"passport-oauth2": "1.x.x"
},
"devDependencies": {
"make-node": "0.3.x",
"mocha": "1.x.x",
"chai": "1.x.x",
"chai-passport-strategy": "0.2.x"
"chai": "2.x.x",
"chai-passport-strategy": "1.x.x"
},
"engines": {
"node": ">= 0.4.0"
},
"scripts": {
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
"test": "node_modules/.bin/mocha --require test/bootstrap/node test/*.test.js"
}
}

0 comments on commit 84403a0

Please sign in to comment.