From 6f5bc856ed09a86a528d14d45e1b824d86506ad5 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Tue, 3 Jan 2017 21:37:15 -0500
Subject: [PATCH] Update gltf-pipeline and general project cleanup

---
 .gitignore   | 10 ++++++----
 .npmignore   |  3 ++-
 .travis.yml  |  7 ++++++-
 CHANGES.md   |  5 +++++
 gulpfile.js  |  2 +-
 package.json | 42 +++++++++++++++++++++++-------------------
 6 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad27f7b..b04cad6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,16 @@
 node_modules
 npm-debug.log
 
+# TypeScript definitions
+typings
+
 # WebStorm user-specific
 .idea/workspace.xml
 .idea/tasks.xml
 
-# TypeScript definitions
-typings
-
 # Generate data
-test
 coverage
+doc
+output
+test
 *.tgz
diff --git a/.npmignore b/.npmignore
index 1fe05bd..dec66d7 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,9 +1,10 @@
 /.idea
+/coverage
 /doc
+/output
 /specs
 /test
 /typings
-/coverage
 .jshintrc
 .npmignore
 .travis.yml
diff --git a/.travis.yml b/.travis.yml
index a73b51f..32c35f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 language: node_js
 node_js:
-  - 4
+  - "4"
+  - "6"
 script:
   - npm run jsHint -- --failTaskOnError
   - 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
diff --git a/CHANGES.md b/CHANGES.md
index 110fada..0584792 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
 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
 
 * Changed obj2gltf.js line endings from CRLF to LF in npm package.
diff --git a/gulpfile.js b/gulpfile.js
index f479227..66d574e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,7 @@ var environmentSeparator = process.platform === 'win32' ? ';' : ':';
 var nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
 process.env.PATH += environmentSeparator + nodeBinaries;
 
-var jsHintFiles = ['**/*.js', '!node_modules/**', '!coverage/**'];
+var jsHintFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**'];
 var specFiles = ['**/*.js', '!node_modules/**', '!coverage/**'];
 
 gulp.task('jsHint', function () {
diff --git a/package.json b/package.json
index 75a2b70..5a56146 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obj2gltf",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Convert OBJ model format to glTF",
   "license": "Apache-2.0",
   "contributors": [
@@ -26,33 +26,37 @@
     "node": ">=4.0.0"
   },
   "dependencies": {
-    "async": "2.1.2",
-    "bluebird": "3.4.6",
-    "byline": "5.0.0",
-    "cesium": "1.26.0",
-    "fs-extra": "0.30.0",
-    "gltf-pipeline": "0.1.0-alpha8",
-    "yargs": "6.3.0"
+    "async": "^2.1.4",
+    "bluebird": "^3.4.7",
+    "byline": "^5.0.0",
+    "cesium": "^1.29.0",
+    "fs-extra": "^1.0.0",
+    "gltf-pipeline": "^0.1.0-alpha9",
+    "yargs": "^6.6.0"
   },
   "devDependencies": {
-    "gulp": "3.9.1",
-    "gulp-jshint": "2.0.2",
-    "istanbul": "0.4.5",
-    "jasmine": "2.5.2",
-    "jasmine-spec-reporter": "2.7.0",
-    "jshint": "2.9.4",
-    "jshint-stylish": "2.2.1",
-    "open": "0.0.5",
-    "requirejs": "2.3.2",
-    "typings": "1.4.0"
+    "coveralls": "^2.11.15",
+    "gulp": "^3.9.1",
+    "gulp-jshint": "^2.0.4",
+    "istanbul": "^0.4.5",
+    "jasmine": "^2.5.2",
+    "jasmine-spec-reporter": "^3.0.0",
+    "jsdoc": "^3.4.3",
+    "jshint": "^2.9.4",
+    "jshint-stylish": "^2.2.1",
+    "open": "^0.0.5",
+    "requirejs": "^2.3.2",
+    "typings": "^2.1.0"
   },
   "scripts": {
     "prepublish": "typings install",
+    "jsdoc": "jsdoc ./lib -R ./README.md -d doc",
     "jsHint": "gulp jsHint",
     "jsHint-watch": "gulp jsHint-watch",
     "test": "gulp test",
     "test-watch": "gulp test-watch",
-    "coverage": "gulp coverage"
+    "coverage": "gulp coverage",
+    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
   },
   "bin": {
     "obj2gltf": "./bin/obj2gltf.js"