Permalink
Browse files

Update support files.

  • Loading branch information...
1 parent 0e631aa commit d5cd7d6eeb384309d0ce5d685abb3a2d360181ea @jaredhanson committed Mar 9, 2014
Showing with 49 additions and 49 deletions.
  1. +6 −6 .gitignore
  2. +0 −2 .jshintrc
  3. +8 −4 .npmignore
  4. +4 −4 .travis.yml
  5. +2 −2 LICENSE
  6. +12 −15 Makefile
  7. +8 −6 package.json
  8. +3 −8 support/mk/istanbul.mk
  9. +4 −1 support/mk/jshint.mk
  10. +2 −1 support/mk/mocha.mk
View
@@ -1,9 +1,9 @@
-build
-reports
-
-# Mac OS X
-.DS_Store
+build/
+reports/
# Node.js
-node_modules
+node_modules/
npm-debug.log
+
+# Mac OS X
+.DS_Store
View
@@ -1,6 +1,5 @@
{
"node": true,
-
"bitwise": true,
"camelcase": true,
"curly": true,
@@ -15,6 +14,5 @@
"undef": true,
"unused": true,
"trailing": true,
-
"laxcomma": true
}
View
@@ -1,19 +1,23 @@
-README.md
Makefile
+README.md
build/
docs/
examples/
reports/
support/
test/
-# Mac OS X
-.DS_Store
-
# Node.js
.npmignore
node_modules/
npm-debug.log
+# Mac OS X
+.DS_Store
+
# Git
.git*
+
+# Utilities
+.jshintrc
+.travis.yml
View
@@ -1,9 +1,9 @@
language: "node_js"
node_js:
- - "0.4"
- - "0.6"
- - "0.8"
- "0.10"
+ - "0.8"
+ - "0.6"
+ - "0.4"
before_install:
- "npm install istanbul -g"
@@ -12,4 +12,4 @@ before_install:
script: "make ci-travis"
after_success:
- - "make submit-coverage-to-coveralls"
+ - "make submit-cov-to-coveralls"
View
@@ -1,6 +1,6 @@
-(The MIT License)
+The MIT License (MIT)
-Copyright (c) 2011-2013 Jared Hanson
+Copyright (c) 2011-2014 Jared Hanson
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
View
@@ -1,41 +1,38 @@
-SOURCES = lib/*.js lib/**/*.js
+SOURCES ?= lib/*.js lib/**/*.js
TESTS ?= test/*.test.js
-lint: lint-jshint
test: test-mocha
test-cov: test-istanbul-mocha
view-cov: view-istanbul-report
+lint: lint-jshint
+lint-tests: lint-tests-jshint
# ==============================================================================
# Node.js
# ==============================================================================
include support/mk/node.mk
include support/mk/mocha.mk
-include support/mk/vows.mk
+include support/mk/istanbul.mk
# ==============================================================================
-# Browserify
+# Analysis
# ==============================================================================
-BROWSERIFY_MAIN = ./lib/index.js
-
-include support/mk/browserify.mk
-include support/mk/testling.mk
+include support/mk/notes.mk
+include support/mk/jshint.mk
# ==============================================================================
-# Code Quality
+# Reports
# ==============================================================================
-include support/mk/notes.mk
-include support/mk/jshint.mk
-include support/mk/istanbul.mk
+include support/mk/coveralls.mk
# ==============================================================================
# Continuous Integration
# ==============================================================================
-include support/mk/coveralls.mk
+submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls
+# Travis CI
ci-travis: test test-cov
-submit-coverage-to-coveralls: submit-istanbul-lcov-to-coveralls
# ==============================================================================
# Clean
@@ -47,4 +44,4 @@ clean:
clobber: clean clobber-node
-.PHONY: lint test test-cov view-cov ci-travis clean clobber
+.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber
View
@@ -10,18 +10,18 @@
"authentication",
"identity"
],
+ "author": {
+ "name": "Jared Hanson",
+ "email": "jaredhanson@gmail.com",
+ "url": "http://www.jaredhanson.net/"
+ },
"repository": {
"type": "git",
"url": "git://github.com/jaredhanson/passport-facebook.git"
},
"bugs": {
"url": "http://github.com/jaredhanson/passport-facebook/issues"
},
- "author": {
- "name": "Jared Hanson",
- "email": "jaredhanson@gmail.com",
- "url": "http://www.jaredhanson.net/"
- },
"licenses": [
{
"type": "MIT",
@@ -37,7 +37,9 @@
"chai": "1.x.x",
"chai-passport-strategy": "0.1.x"
},
- "engines": { "node": ">= 0.4.0" },
+ "engines": {
+ "node": ">= 0.4.0"
+ },
"scripts": {
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
}
@@ -1,8 +1,8 @@
ISTANBUL ?= istanbul
ISTANBUL_OUT ?= ./reports/coverage
ISTANBUL_REPORT ?= lcov
-ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html
ISTANBUL_LCOV_INFO_PATH ?= $(ISTANBUL_OUT)/lcov.info
+ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html
test-istanbul-mocha: node_modules
@@ -11,13 +11,8 @@ test-istanbul-mocha: node_modules
--dir $(ISTANBUL_OUT) --report $(ISTANBUL_REPORT) \
$(_MOCHA) -- \
--reporter $(MOCHA_REPORTER) \
- --require $(MOCHA_REQUIRE) $(TESTS)
-
-test-istanbul-vows: node_modules
- NODE_PATH=$(NODE_PATH_TEST) \
- $(ISTANBUL) cover \
- --dir $(ISTANBUL_OUT) --report $(ISTANBUL_REPORT) \
- $(VOWS) $(VOWS_REPORTER) $(TESTS)
+ --require $(MOCHA_REQUIRE) \
+ $(TESTS)
view-istanbul-report:
open $(ISTANBUL_HTML_REPORT_PATH)
@@ -3,5 +3,8 @@ JSHINT ?= jshint
lint-jshint:
$(JSHINT) $(SOURCES)
+lint-tests-jshint:
+ $(JSHINT) $(TESTS)
-.PHONY: lint-jshint
+
+.PHONY: lint-jshint lint-tests-jshint
View
@@ -7,7 +7,8 @@ test-mocha: node_modules
NODE_PATH=$(NODE_PATH_TEST) \
$(MOCHA) \
--reporter $(MOCHA_REPORTER) \
- --require $(MOCHA_REQUIRE) $(TESTS)
+ --require $(MOCHA_REQUIRE) \
+ $(TESTS)
.PHONY: test-mocha

0 comments on commit d5cd7d6

Please sign in to comment.