Merge pull request node-usb#138 from tessel/tcr-update

Updates travis, appveyor.

Author: tcr

.travis.yml

@@ -1,16 +1,16 @@
+branches:
+  only:
+    - master
+    - /^v?[0-9]/
+
 language: objective-c
+
 env:
   matrix:
-  - NODE_VERSION="0.12.7"
-  - NODE_VERSION="iojs-1.0.4"
-  - NODE_VERSION="iojs-1.8.4"
-  - NODE_VERSION="iojs-2.5.0"
-  - NODE_VERSION="iojs-3.3.1"
-  - NODE_VERSION="4.1"
-  - NODE_VERSION="4.2"
-  - NODE_VERSION="5.0"
-  global:
-    secure: VwwHS3ZYxu5WudTcWRw588aekYZrTHMDvziNWLhPnadVs+ami6EF7CMHFZenkvSehmmaunKaH0vcNuxDXqLjrZN8Qt6aOuVVq9o/N6+8OG6/E2D0lDRFF9OZdAKetzS7EtoZfVJpqe009leg9V5mjx3uo1WRlc6SqmeKynaUDaY=
+  - NODE_VERSION="0.12"
+  - NODE_VERSION="4"
+  - NODE_VERSION="5"
+  - NODE_VERSION="6"
 
 before_install:
 - brew update
@@ -21,20 +21,17 @@ before_install:
 - nvm install $NODE_VERSION
 - node --version
 - npm --version
-- npm install pangyp -g
-- pangyp -v
-- npm update -g npm
-- npm --version
 
 install:
 - export PATH=./node_modules/.bin/:$PATH
+- npm install -g node-pre-gyp-github
 
 script:
 - npm install --build-from-source --node-gyp=$(which pangyp)
 - "./node_modules/.bin/node-pre-gyp package"
 - echo $TRAVIS_TAG
 - echo $TRAVIS_PULL_REQUEST
-- > 
-    ([[ "$TRAVIS_TAG" =~ ^v[0-9] ]] &&
+- >
+    ([[ "$TRAVIS_TAG" =~ ^v?[0-9] ]] &&
     test "$TRAVIS_PULL_REQUEST" = false &&
-    ./node_modules/.bin/node-pre-gyp publish) || true
+    node-pre-gyp-github publish) || true

appveyor.yml

@@ -1,36 +1,40 @@
+branches:
+  only:
+    - master
+    - /^v?[0-9]/
+
 environment:
   GYP_MSVS_VERSION: 2013
 
-  node_pre_gyp_accessKeyId:
-    secure: lYXAEyCIM03tC8M9oS4U1JXWbo+g9u+AnayYjekgqBQ=
-  node_pre_gyp_secretAccessKey:
-    secure: yRw0LuKh8Q/BORVLbBMaZXyGIvpIYuxYzGSherheoYTEMONUYfgj49x8b/FUm4s1
-
   matrix:
-    - node_version: '0.12.7'
-    - node_version: '1.0'
-    - node_version: '1.8'
-    - node_version: '2.5'
-    - node_version: '3.3'
-    - node_version: '4.1'
-    - node_version: '5.0'
+    - node_version: '0.12'
+    - node_version: '4'
+    - node_version: '5'
+    - node_version: '6'
 
 install:
   - ps: Install-Product node $env:node_version $env:platform
-  - ps: npm install -g node-gyp
-  - ps: $publish_binary=0
-  - ps: if ($env:appveyor_repo_tag -match "true" -and $env:appveyor_repo_tag_name -match '^v[0-9]') { $publish_binary=1; }
+  - ps: npm install -g node-gyp node-pre-gyp-github
+  # This fixes an issue with Node 4.x on x86. If it builds without this line
+  # needing to be set, we can remove it.
+  - ps: npm config -g set node-gyp "$(npm config -g get prefix)\node_modules\node-gyp\bin\node-gyp.js"
+
+  - ps: if ($env:appveyor_repo_tag -match "true" -and $env:appveyor_repo_tag_name -match '^v?[0-9]') { $publish_binary=1; }
 
 build_script:
   - ps: echo $publish_binary
-  - ps: >
-      & {      
-        $ErrorActionPreference = 'SilentlyContinue'
-        git submodule update --init 2>&1 | write-host
-        npm install --build-from-source 2>&1 | write-host
-        ./node_modules/.bin/node-pre-gyp package 2>&1 | write-host
-        if ($publish_binary) { ./node_modules/.bin/node-pre-gyp publish 2>&1 | write-host; }
+  - ps: |
+      $ErrorActionPreference = 'Continue'
+      git submodule update --init 2>&1 | write-host
+      npm install --build-from-source 2>&1 | write-host
+      ./node_modules/.bin/node-pre-gyp package 2>&1 | write-host
+      if ($publish_binary -Eq "1") {
+        node-pre-gyp-github publish 2>&1 | write-host
+        if (-Not ($?)) {
+          throw "Failed publishing";
+        }
       }
+      echo "done."
 
 platform:
   - x86

package.json

@@ -1,14 +1,14 @@
 {
   "name": "usb",
   "description": "Library to access USB devices",
+  "version": "1.2.0",
+  "engines": {
+    "node": ">=0.12.x"
+  },
   "keywords": [
     "usb",
     "hardware"
   ],
-  "author": {
-    "name": "Nonolith Labs",
-    "url": "http://www.nonolithlabs.com"
-  },
   "contributors": [
     {
       "name": "Kevin Mehall",
@@ -24,14 +24,10 @@
       "name": "Christopher Klein"
     }
   ],
-  "version": "1.1.2",
-  "engines": {
-    "node": ">=0.12.x"
-  },
   "main": "./usb",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nonolith/node-usb.git"
+    "url": "https://github.com/tessel/node-usb.git"
   },
   "scripts": {
     "install": "node-pre-gyp install --fallback-to-build",
@@ -42,12 +38,12 @@
   "binary": {
     "module_name": "usb_bindings",
     "module_path": "./src/binding",
-    "host": "https://tessel-builds.s3-us-west-2.amazonaws.com",
-    "remote_path": "./pre-gyp/{name}/v{version}"
+    "host": "https://github.com/tessel/node-usb/releases/download/",
+    "remote_path": "{version}"
   },
   "dependencies": {
-    "nan": "^2.1.0",
-    "node-pre-gyp": "^0.6.13"
+    "nan": "^2.4.0",
+    "node-pre-gyp": "^0.6.30"
   },
   "bundledDependencies": [
     "node-pre-gyp"