Update gltf-pipeline and general project cleanup

This commit is contained in:
Sean Lilley 2017-01-03 21:37:15 -05:00
parent aaa64b9e1a
commit 6f5bc856ed
6 changed files with 43 additions and 26 deletions

10
.gitignore vendored
View File

@ -2,14 +2,16 @@
node_modules node_modules
npm-debug.log npm-debug.log
# TypeScript definitions
typings
# WebStorm user-specific # WebStorm user-specific
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml .idea/tasks.xml
# TypeScript definitions
typings
# Generate data # Generate data
test
coverage coverage
doc
output
test
*.tgz *.tgz

View File

@ -1,9 +1,10 @@
/.idea /.idea
/coverage
/doc /doc
/output
/specs /specs
/test /test
/typings /typings
/coverage
.jshintrc .jshintrc
.npmignore .npmignore
.travis.yml .travis.yml

View File

@ -1,6 +1,11 @@
language: node_js language: node_js
node_js: node_js:
- 4 - "4"
- "6"
script: script:
- npm run jsHint -- --failTaskOnError - npm run jsHint -- --failTaskOnError
- npm run test -- --failTaskOnError --suppressPassed - npm run test -- --failTaskOnError --suppressPassed
after_success:
## We only need to run coveralls for one node version (doesn't matter which one).
## We also ignore publishing failures, since restarting an existing travis build would otherwise break.
- if node --version | grep -q ^v6 ; npm run coveralls ; fi

View File

@ -1,6 +1,11 @@
Change Log Change Log
========== ==========
### 0.1.7 2017-01-03
* Update gltf-pipeline to 0.1.0-alpha9
* Added command to generate documentation (npm run jsdoc)
### 0.1.6 2016-09-07 ### 0.1.6 2016-09-07
* Changed obj2gltf.js line endings from CRLF to LF in npm package. * Changed obj2gltf.js line endings from CRLF to LF in npm package.

View File

@ -20,7 +20,7 @@ var environmentSeparator = process.platform === 'win32' ? ';' : ':';
var nodeBinaries = path.join(__dirname, 'node_modules', '.bin'); var nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
process.env.PATH += environmentSeparator + nodeBinaries; process.env.PATH += environmentSeparator + nodeBinaries;
var jsHintFiles = ['**/*.js', '!node_modules/**', '!coverage/**']; var jsHintFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**'];
var specFiles = ['**/*.js', '!node_modules/**', '!coverage/**']; var specFiles = ['**/*.js', '!node_modules/**', '!coverage/**'];
gulp.task('jsHint', function () { gulp.task('jsHint', function () {

View File

@ -1,6 +1,6 @@
{ {
"name": "obj2gltf", "name": "obj2gltf",
"version": "0.1.6", "version": "0.1.7",
"description": "Convert OBJ model format to glTF", "description": "Convert OBJ model format to glTF",
"license": "Apache-2.0", "license": "Apache-2.0",
"contributors": [ "contributors": [
@ -26,33 +26,37 @@
"node": ">=4.0.0" "node": ">=4.0.0"
}, },
"dependencies": { "dependencies": {
"async": "2.1.2", "async": "^2.1.4",
"bluebird": "3.4.6", "bluebird": "^3.4.7",
"byline": "5.0.0", "byline": "^5.0.0",
"cesium": "1.26.0", "cesium": "^1.29.0",
"fs-extra": "0.30.0", "fs-extra": "^1.0.0",
"gltf-pipeline": "0.1.0-alpha8", "gltf-pipeline": "^0.1.0-alpha9",
"yargs": "6.3.0" "yargs": "^6.6.0"
}, },
"devDependencies": { "devDependencies": {
"gulp": "3.9.1", "coveralls": "^2.11.15",
"gulp-jshint": "2.0.2", "gulp": "^3.9.1",
"istanbul": "0.4.5", "gulp-jshint": "^2.0.4",
"jasmine": "2.5.2", "istanbul": "^0.4.5",
"jasmine-spec-reporter": "2.7.0", "jasmine": "^2.5.2",
"jshint": "2.9.4", "jasmine-spec-reporter": "^3.0.0",
"jshint-stylish": "2.2.1", "jsdoc": "^3.4.3",
"open": "0.0.5", "jshint": "^2.9.4",
"requirejs": "2.3.2", "jshint-stylish": "^2.2.1",
"typings": "1.4.0" "open": "^0.0.5",
"requirejs": "^2.3.2",
"typings": "^2.1.0"
}, },
"scripts": { "scripts": {
"prepublish": "typings install", "prepublish": "typings install",
"jsdoc": "jsdoc ./lib -R ./README.md -d doc",
"jsHint": "gulp jsHint", "jsHint": "gulp jsHint",
"jsHint-watch": "gulp jsHint-watch", "jsHint-watch": "gulp jsHint-watch",
"test": "gulp test", "test": "gulp test",
"test-watch": "gulp test-watch", "test-watch": "gulp test-watch",
"coverage": "gulp coverage" "coverage": "gulp coverage",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
}, },
"bin": { "bin": {
"obj2gltf": "./bin/obj2gltf.js" "obj2gltf": "./bin/obj2gltf.js"