From 416cc7bb844fcee364d3db435954cea203a54e25 Mon Sep 17 00:00:00 2001 From: Jared Hanson Date: Fri, 17 Jan 2014 10:36:30 -0800 Subject: [PATCH] Update support files. --- .gitignore | 12 ++++++------ .jshintrc | 2 -- .npmignore | 12 ++++++++---- .travis.yml | 8 ++++---- LICENSE | 4 ++-- Makefile | 27 ++++++++++++--------------- package.json | 10 +++++----- support/mk/istanbul.mk | 11 +++-------- support/mk/jshint.mk | 5 ++++- support/mk/mocha.mk | 3 ++- 10 files changed, 46 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index f0305cb6..907aa01e 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/.jshintrc b/.jshintrc index a07354b1..f1149ee7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,6 +1,5 @@ { "node": true, - "bitwise": true, "camelcase": true, "curly": true, @@ -15,6 +14,5 @@ "undef": true, "unused": true, "trailing": true, - "laxcomma": true } diff --git a/.npmignore b/.npmignore index 3286d949..5a8a0d03 100644 --- a/.npmignore +++ b/.npmignore @@ -1,5 +1,5 @@ -README.md Makefile +README.md build/ docs/ examples/ @@ -7,13 +7,17 @@ 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 diff --git a/.travis.yml b/.travis.yml index ce3f3cd8..e0db184b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/LICENSE b/LICENSE index d61567a2..ce7d0822 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -(The MIT License) +The MIT License (MIT) -Copyright (c) 2012-2013 Jared Hanson +Copyright (c) 2012-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 diff --git a/Makefile b/Makefile index b9d00421..4d14dc6e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ -SOURCES = lib/*.js lib/**/*.js +SOURCES ?= lib/*.js lib/**/*.js TESTS ?= test/*.test.js 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 # ============================================================================== @@ -12,30 +13,26 @@ view-cov: view-istanbul-report # ============================================================================== 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 diff --git a/package.json b/package.json index a8bf39f4..bfcd18d7 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,11 @@ "passport", "middleware" ], + "author": { + "name": "Jared Hanson", + "email": "jaredhanson@gmail.com", + "url": "http://www.jaredhanson.net/" + }, "repository": { "type": "git", "url": "git://github.com/jaredhanson/oauth2orize.git" @@ -20,11 +25,6 @@ "bugs": { "url": "http://github.com/jaredhanson/oauth2orize/issues" }, - "author": { - "name": "Jared Hanson", - "email": "jaredhanson@gmail.com", - "url": "http://www.jaredhanson.net/" - }, "licenses": [ { "type": "MIT", diff --git a/support/mk/istanbul.mk b/support/mk/istanbul.mk index 769c5a99..618c202d 100644 --- a/support/mk/istanbul.mk +++ b/support/mk/istanbul.mk @@ -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) diff --git a/support/mk/jshint.mk b/support/mk/jshint.mk index 695d8625..d144983d 100644 --- a/support/mk/jshint.mk +++ b/support/mk/jshint.mk @@ -3,5 +3,8 @@ JSHINT ?= jshint lint-jshint: $(JSHINT) $(SOURCES) +lint-tests-jshint: + $(JSHINT) $(TESTS) -.PHONY: lint-jshint + +.PHONY: lint-jshint lint-tests-jshint diff --git a/support/mk/mocha.mk b/support/mk/mocha.mk index aa9a9de5..d568cadd 100644 --- a/support/mk/mocha.mk +++ b/support/mk/mocha.mk @@ -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