Skip to content

Commit 1fdd43a

Browse files
committed
Update support files.
1 parent b6c8ffe commit 1fdd43a

12 files changed

+48
-58
lines changed

Diff for: .gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
build
2-
reports
3-
4-
# Mac OS X
5-
.DS_Store
1+
build/
2+
reports/
63

74
# Node.js
8-
node_modules
5+
node_modules/
96
npm-debug.log
7+
8+
# Mac OS X
9+
.DS_Store

Diff for: .jshintrc

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"node": true,
3-
43
"bitwise": true,
54
"camelcase": true,
65
"curly": true,
@@ -15,6 +14,5 @@
1514
"undef": true,
1615
"unused": true,
1716
"trailing": true,
18-
1917
"laxcomma": true
2018
}

Diff for: .npmignore

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
README.md
21
Makefile
2+
README.md
33
build/
44
docs/
55
examples/
66
reports/
77
support/
88
test/
99

10-
# Mac OS X
11-
.DS_Store
12-
1310
# Node.js
1411
.npmignore
1512
node_modules/
1613
npm-debug.log
1714

15+
# Mac OS X
16+
.DS_Store
17+
1818
# Git
1919
.git*
20+
21+
# Utilities
22+
.jshintrc
23+
.travis.yml

Diff for: .travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: "node_js"
22
node_js:
3-
- "0.4"
4-
# - "0.6"
5-
- "0.8"
63
- "0.10"
4+
- "0.8"
5+
# - "0.6"
6+
- "0.4"
77

88
before_install:
99
- "npm install istanbul -g"
@@ -12,4 +12,4 @@ before_install:
1212
script: "make ci-travis"
1313

1414
after_success:
15-
- "make submit-coverage-to-coveralls"
15+
- "make submit-cov-to-coveralls"

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(The MIT License)
22

3-
Copyright (c) 2011-2013 Jared Hanson
3+
Copyright (c) 2011-2014 Jared Hanson
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

Diff for: Makefile

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
11
SOURCES = lib/*.js lib/**/*.js
22
TESTS ?= test/*.test.js test/**/*.test.js
33

4-
lint: lint-jshint
54
test: test-mocha
65
test-cov: test-istanbul-mocha
76
view-cov: view-istanbul-report
7+
lint: lint-jshint
8+
lint-tests: lint-tests-jshint
89

910

1011
# ==============================================================================
1112
# Node.js
1213
# ==============================================================================
1314
include support/mk/node.mk
1415
include support/mk/mocha.mk
16+
include support/mk/istanbul.mk
1517

1618
# ==============================================================================
17-
# Browserify
19+
# Analysis
1820
# ==============================================================================
19-
BROWSERIFY_MAIN = ./lib/index.js
20-
21-
include support/mk/browserify.mk
22-
include support/mk/testling.mk
21+
include support/mk/notes.mk
22+
include support/mk/jshint.mk
2323

2424
# ==============================================================================
25-
# Code Quality
25+
# Reports
2626
# ==============================================================================
27-
include support/mk/notes.mk
28-
include support/mk/jshint.mk
29-
include support/mk/istanbul.mk
27+
include support/mk/coveralls.mk
3028

3129
# ==============================================================================
3230
# Continuous Integration
3331
# ==============================================================================
34-
include support/mk/coveralls.mk
32+
submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls
3533

34+
# Travis CI
3635
ci-travis: test test-cov
37-
submit-coverage-to-coveralls: submit-istanbul-lcov-to-coveralls
3836

3937
# ==============================================================================
4038
# Clean
@@ -46,4 +44,4 @@ clean:
4644
clobber: clean clobber-node
4745

4846

49-
.PHONY: lint test test-cov view-cov ci-travis clean clobber
47+
.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ application:
8888

8989
[The MIT License](http://opensource.org/licenses/MIT)
9090

91-
Copyright (c) 2011-2013 Jared Hanson <[http://jaredhanson.net/](http://jaredhanson.net/)>
91+
Copyright (c) 2011-2014 Jared Hanson <[http://jaredhanson.net/](http://jaredhanson.net/)>

Diff for: package.json

+8-17
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
"oauth",
1313
"oauth2"
1414
],
15+
"author": {
16+
"name": "Jared Hanson",
17+
"email": "[email protected]",
18+
"url": "http://www.jaredhanson.net/"
19+
},
1520
"repository": {
1621
"type": "git",
1722
"url": "git://github.com/jaredhanson/passport-oauth2.git"
1823
},
1924
"bugs": {
2025
"url": "http://github.com/jaredhanson/passport-oauth2/issues"
2126
},
22-
"author": {
23-
"name": "Jared Hanson",
24-
"email": "[email protected]",
25-
"url": "http://www.jaredhanson.net/"
26-
},
2727
"licenses": [
2828
{
2929
"type": "MIT",
@@ -41,19 +41,10 @@
4141
"chai": "1.x.x",
4242
"chai-passport-strategy": "0.2.x"
4343
},
44-
"engines": { "node": ">= 0.4.0" },
44+
"engines": {
45+
"node": ">= 0.4.0"
46+
},
4547
"scripts": {
4648
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js test/**/*.test.js"
47-
},
48-
"testling": {
49-
"browsers": [
50-
"chrome/latest"
51-
],
52-
"harness" : "mocha",
53-
"files": [
54-
"test/bootstrap/testling.js",
55-
"test/*.test.js",
56-
"test/**/*.test.js"
57-
]
5849
}
5950
}

Diff for: support/mk/istanbul.mk

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ISTANBUL ?= istanbul
22
ISTANBUL_OUT ?= ./reports/coverage
33
ISTANBUL_REPORT ?= lcov
4-
ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html
54
ISTANBUL_LCOV_INFO_PATH ?= $(ISTANBUL_OUT)/lcov.info
5+
ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html
66

77

88
test-istanbul-mocha: node_modules
@@ -11,13 +11,8 @@ test-istanbul-mocha: node_modules
1111
--dir $(ISTANBUL_OUT) --report $(ISTANBUL_REPORT) \
1212
$(_MOCHA) -- \
1313
--reporter $(MOCHA_REPORTER) \
14-
--require $(MOCHA_REQUIRE) $(TESTS)
15-
16-
test-istanbul-vows: node_modules
17-
NODE_PATH=$(NODE_PATH_TEST) \
18-
$(ISTANBUL) cover \
19-
--dir $(ISTANBUL_OUT) --report $(ISTANBUL_REPORT) \
20-
$(VOWS) $(VOWS_REPORTER) $(TESTS)
14+
--require $(MOCHA_REQUIRE) \
15+
$(TESTS)
2116

2217
view-istanbul-report:
2318
open $(ISTANBUL_HTML_REPORT_PATH)

Diff for: support/mk/jshint.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ JSHINT ?= jshint
33
lint-jshint:
44
$(JSHINT) $(SOURCES)
55

6+
lint-tests-jshint:
7+
$(JSHINT) $(TESTS)
68

7-
.PHONY: lint-jshint
9+
10+
.PHONY: lint-jshint lint-tests-jshint

Diff for: support/mk/mocha.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ test-mocha: node_modules
77
NODE_PATH=$(NODE_PATH_TEST) \
88
$(MOCHA) \
99
--reporter $(MOCHA_REPORTER) \
10-
--require $(MOCHA_REQUIRE) $(TESTS)
10+
--require $(MOCHA_REQUIRE) \
11+
$(TESTS)
1112

1213

1314
.PHONY: test-mocha
File renamed without changes.

0 commit comments

Comments
 (0)