Skip to content

Commit bd51161

Browse files
JamesMessingerJamesMessinger
committed
- Upgraded dependencies
- Refactored build/test/CI scripts
1 parent 047b4f6 commit bd51161

56 files changed

Lines changed: 48156 additions & 17706 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bowerrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "tests/bower_components"
3+
}

‎.codeclimate.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ exclude_paths:
66
- "tests/*"
77
- "coverage/*"
88
- "karma.conf.js"
9+
- "www/*"

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
**/.DS_Store
77
npm-debug.log
88
/.idea
9-
/bower_components
109
/coverage
11-
/dist/json-schema-ref-parser.cover.js
10+
/dist/*.test.js
1211
/node_modules

‎.jscsrc‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"excludeFiles": [
33
"coverage/**",
4+
"tests/**",
45
"dist/**",
6+
"www/**",
57
"node_modules/**"
68
],
79
"requireCurlyBraces": [
@@ -65,5 +67,22 @@
6567
"disallowSpacesInsideParentheses": true,
6668

6769
"disallowMultipleLineBreaks": true,
68-
"disallowNewlineBeforeBlockStatements": true
70+
"disallowNewlineBeforeBlockStatements": true,
71+
"disallowSpaceBeforeComma": true,
72+
"disallowSpaceBeforeSemicolon": true,
73+
74+
"jsDoc": {
75+
"checkAnnotations": true,
76+
"checkParamNames": true,
77+
"requireParamTypes": true,
78+
"checkRedundantParams": true,
79+
"checkReturnTypes": true,
80+
"checkRedundantReturns": true,
81+
"requireReturnTypes": true,
82+
"checkTypes": true,
83+
"checkRedundantAccess": "enforceLeadingUnderscore",
84+
"leadingUnderscoreAccess": true,
85+
"requireHyphenBeforeDescription": true,
86+
"requireNewlineAfterDescription": true
87+
}
6988
}

‎.jshintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/coverage
22
/dist
3+
/www
34
/node_modules
45
/tests

‎.nojekyll‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This file disables Jekyll on Github Pages
2+
https://github.com/blog/572-bypassing-jekyll-on-github-pages

‎.npmignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
**/.DS_Store
44
npm-debug.log
55
/.idea
6-
/bower_components
76
/coverage
8-
/dist/json-schema-ref-parser.cover.js
7+
/dist/*.test.js
8+
karma.conf.js
99
/tests
10+
/www
11+
bower.json
12+
index.html
1013
/.*

‎.travis.yml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,43 @@
33

44
sudo: false
55
language: node_js
6-
node_js:
7-
- '0.10'
8-
- '0.11'
9-
- '0.12'
10-
- 'iojs'
6+
matrix:
7+
include:
8+
# IO.js
9+
- node_js: iojs
10+
env: KARMA=false
11+
12+
# Node
13+
- node_js: 0.10
14+
env: KARMA=false
15+
- node_js: 0.11
16+
env: KARMA=false
17+
- node_js: 0.12
18+
env: KARMA=false
19+
20+
# Local Browsers
21+
- node_js: 0.12
22+
env: KARMA_COVERAGE=true KARMA_SAUCE=false
23+
24+
# Sauce Labs
25+
- node_js: 0.12
26+
env: KARMA_SAUCE=true KARMA_COVERAGE=false
27+
28+
fast_finish: true
29+
allow_failures:
30+
- node_js: 0.12
31+
env: KARMA_SAUCE=true KARMA_COVERAGE=false
32+
1133
before_script:
1234
- export DISPLAY=:99.0
1335
- sh -e /etc/init.d/xvfb start
36+
- npm update -g npm
37+
branches:
38+
only:
39+
- master # only run CI on the master branch
40+
- /^PR / # also build pull requests
1441
after_success:
15-
- cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js
42+
- cat coverage/*/lcov.info > coveralls.txt # concatenate all code-coverage data into a single file
43+
- cat coveralls.txt # output the file contents (for debugging)
44+
- ls -R1 coverage/*/lcov.info # list the files (for debugging)
45+
- cat coveralls.txt | node_modules/coveralls/bin/coveralls.js # send code-coverage data to Coveralls

‎README.md‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ JSON Schema $Ref Parser
1313
[![Bower](http://img.shields.io/bower/v/json-schema-ref-parser.svg)](#bower)
1414
[![License](https://img.shields.io/npm/l/json-schema-ref-parser.svg)](LICENSE)
1515

16+
[![Browser Compatibility](https://saucelabs.com/browser-matrix/json-schema-ref-parser.svg)](https://saucelabs.com/u/json-schema-ref-parser)
17+
1618

1719
The Problem:
1820
--------------------------
@@ -73,16 +75,16 @@ Sample Usage
7375
--------------------------
7476

7577
```javascript
76-
//
77-
//
78-
//
78+
//
79+
//
80+
//
7981
// !!! Coming Soon !!!
8082
//
8183
// NOTE: This project is still in alpha. The API and syntax may change before release
82-
//
83-
//
84-
//
85-
//
84+
//
85+
//
86+
//
87+
//
8688
```
8789

8890

‎bower.json‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,19 @@
1717
},
1818
"ignore": [
1919
"/bower_components",
20-
"/tests",
2120
"/lib",
22-
"/.*"
21+
"/www",
22+
"/dist/*.test.js",
23+
"/tests",
24+
"/karma.conf.js",
25+
"/.*",
26+
"/index.html",
27+
"/package.json"
2328
],
24-
"dependencies": {}
29+
"dependencies": {},
30+
"devDependencies": {
31+
"chai": "*",
32+
"mocha": "*",
33+
"sinon-js": "*"
34+
}
2535
}

0 commit comments

Comments
 (0)