From b8e8ff68e5a4620a218899d0eccb5dfa76897506 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 09:32:21 -0700 Subject: [PATCH 01/12] Build on node 0.10 and 0.12 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e076df293..bd38d197f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ os: osx_image: xcode7.3 language: node_js node_js: +- '0.10' +- '0.12' - '4' - '5' - '6' From c3ead388ee17915a8f9e26934c10cd8d088e98a9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 10:36:21 -0700 Subject: [PATCH 02/12] Add babel dev dependency --- .gitignore | 3 ++- package.json | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 28f1ba756..df30fcb59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -.DS_Store \ No newline at end of file +.DS_Store +build diff --git a/package.json b/package.json index df5b78646..7b9abd314 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,8 @@ "sumchecker": "^1.1.0" }, "devDependencies": { + "babel-cli": "^6.14.0", + "babel-preset-es2015": "^6.14.0", "eslint": "^3.2.0", "eslint-config-standard": "^5.2.0", "eslint-plugin-promise": "^2.0.0", From 6d2cee56f7120ed2cf2decaa2a1375d7b9cf9590 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 10:57:00 -0700 Subject: [PATCH 03/12] Test and publish using babel --- .npmignore | 1 + cli.js => lib/cli.js | 0 index.js => lib/index.js | 0 package.json | 14 +++++++++++--- 4 files changed, 12 insertions(+), 3 deletions(-) rename cli.js => lib/cli.js (100%) rename index.js => lib/index.js (100%) diff --git a/.npmignore b/.npmignore index 88746ae67..9593ce479 100644 --- a/.npmignore +++ b/.npmignore @@ -2,3 +2,4 @@ .travis.yml appveyor.yml test +lib diff --git a/cli.js b/lib/cli.js similarity index 100% rename from cli.js rename to lib/cli.js diff --git a/index.js b/lib/index.js similarity index 100% rename from index.js rename to lib/index.js diff --git a/package.json b/package.json index 7b9abd314..15773c644 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,14 @@ "name": "electron-download", "version": "2.2.0", "description": "download electron prebuilt binary zips from github releases", - "main": "index.js", + "main": "build/index.js", "bin": { - "electron-download": "cli.js" + "electron-download": "build/cli.js" }, "scripts": { - "test": "tape test/*.js && eslint ." + "build": "babel --out-dir build lib", + "prepublish": "npm run build", + "test": "tape -r babel-register test/*.js && eslint lib test" }, "repository": { "type": "git", @@ -33,6 +35,7 @@ "devDependencies": { "babel-cli": "^6.14.0", "babel-preset-es2015": "^6.14.0", + "babel-register": "^6.14.0", "eslint": "^3.2.0", "eslint-config-standard": "^5.2.0", "eslint-plugin-promise": "^2.0.0", @@ -50,5 +53,10 @@ ] } }, + "babel": { + "presets": [ + "es2015" + ] + }, "keywords": [] } From 63bde10f65bbb6e3d04d05ca15d75ec384e353ee Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 11:00:09 -0700 Subject: [PATCH 04/12] Simply run scripts --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 15773c644..8d08cf75b 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "electron-download": "build/cli.js" }, "scripts": { - "build": "babel --out-dir build lib", - "prepublish": "npm run build", + "prepublish": "babel --out-dir build lib", "test": "tape -r babel-register test/*.js && eslint lib test" }, "repository": { From 36235947d8f7cad9247a6f2e844e1649ed9a9ffe Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 11:07:46 -0700 Subject: [PATCH 05/12] git/npm ignore npm-debug.log --- .gitignore | 1 + .npmignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index df30fcb59..d25344b07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules .DS_Store build +npm-debug.log diff --git a/.npmignore b/.npmignore index 9593ce479..644963b96 100644 --- a/.npmignore +++ b/.npmignore @@ -3,3 +3,4 @@ appveyor.yml test lib +npm-debug.log From 3e0733029fe50fea82146d481e028336d072b93c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 11:12:30 -0700 Subject: [PATCH 06/12] Use path-exists that works on node 0.10/0.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d08cf75b..cb40ccac8 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "home-path": "^1.0.1", "minimist": "^1.2.0", "nugget": "^2.0.0", - "path-exists": "^3.0.0", + "path-exists": "^2.1.0", "rc": "^1.1.2", "semver": "^5.3.0", "sumchecker": "^1.1.0" From a414befa255e611bce03b14b243dc39a769a2a20 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 11:54:16 -0700 Subject: [PATCH 07/12] Lint using newer node version on CI --- .travis.yml | 5 +++++ package.json | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd38d197f..7b92cf25b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,3 +16,8 @@ cache: branches: only: - master +before_script: + - nvm install stable + - npm run lint + - nvm use $TRAVIS_NODE_VERSION + - npm run unit-tests diff --git a/package.json b/package.json index cb40ccac8..178f72a81 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ }, "scripts": { "prepublish": "babel --out-dir build lib", - "test": "tape -r babel-register test/*.js && eslint lib test" + "lint": "eslint lib test", + "unit-tests": "tape -r babel-register test/*.js", + "test": "npm run unit-tests && npm run lint" }, "repository": { "type": "git", From eb386b8d881d572cbcd461053dc49a8c1e445f7a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 12 Sep 2016 11:58:56 -0700 Subject: [PATCH 08/12] Use full path to index requires --- test/test.js | 2 +- test/test_404.js | 2 +- test/test_symbols.js | 2 +- test/test_with_checksum.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test.js b/test/test.js index ccaf6f397..1cd7979e8 100644 --- a/test/test.js +++ b/test/test.js @@ -1,6 +1,6 @@ 'use strict' -const download = require('..') +const download = require('../lib/index') const test = require('tape') const verifyDownloadedZip = require('./helpers').verifyDownloadedZip diff --git a/test/test_404.js b/test/test_404.js index 28e1dba3a..0f2a43285 100644 --- a/test/test_404.js +++ b/test/test_404.js @@ -1,6 +1,6 @@ 'use strict' -const download = require('..') +const download = require('../lib/index') const fs = require('fs') const test = require('tape') diff --git a/test/test_symbols.js b/test/test_symbols.js index 9f43770ac..f5919d9c8 100644 --- a/test/test_symbols.js +++ b/test/test_symbols.js @@ -1,6 +1,6 @@ 'use strict' -const download = require('..') +const download = require('../lib/index') const test = require('tape') const verifyDownloadedZip = require('./helpers').verifyDownloadedZip diff --git a/test/test_with_checksum.js b/test/test_with_checksum.js index 9c5a042d8..84ceaa170 100644 --- a/test/test_with_checksum.js +++ b/test/test_with_checksum.js @@ -1,6 +1,6 @@ 'use strict' -const download = require('..') +const download = require('../lib/index') const test = require('tape') const verifyDownloadedZip = require('./helpers').verifyDownloadedZip From 539789a83d85e1b644cbf6f0178c36f65262695c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 16 Sep 2016 13:27:52 -0700 Subject: [PATCH 09/12] Lint and test in script block --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b92cf25b..27e689a34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,9 @@ cache: branches: only: - master -before_script: +before_install: - nvm install stable +script: - npm run lint - nvm use $TRAVIS_NODE_VERSION - npm run unit-tests From d91d74e64727a84f0b59c0718c97c669b6f4824d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 16 Sep 2016 13:39:31 -0700 Subject: [PATCH 10/12] Run windows build against multiple node versions --- appveyor.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0e64c7dfa..abe461df8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,10 +4,18 @@ branches: only: - master +environment: + matrix: + - nodejs_version: "0.10" + - nodejs_version: "0.12" + - nodejs_version: "4" + - nodejs_version: "5" + - nodejs_version: "6" + skip_tags: true install: - - ps: Install-Product node LTS + - ps: Install-Product node $env:nodejs_version - npm install npm - .\node_modules\.bin\npm install From e0c59668079481acb5cc78b6008cc491eb0c49ef Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Thu, 15 Sep 2016 21:17:44 -0700 Subject: [PATCH 11/12] Upgrade sumchecker to an old-Node-compatible version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 178f72a81..30b48bc30 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "path-exists": "^2.1.0", "rc": "^1.1.2", "semver": "^5.3.0", - "sumchecker": "^1.1.0" + "sumchecker": "^1.2.0" }, "devDependencies": { "babel-cli": "^6.14.0", From f1e45ca8a3ea57b91fce40125d8f3e17cbe08780 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 16 Sep 2016 13:56:00 -0700 Subject: [PATCH 12/12] Run unit tests directly on AppVeyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index abe461df8..b35382558 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,4 +22,4 @@ install: test_script: - node --version - .\node_modules\.bin\npm --version - - .\node_modules\.bin\npm test + - .\node_modules\.bin\npm run unit-tests