From 212f46c7f6485654469c581db705f66dd83894af Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 29 Oct 2017 08:45:00 -0700 Subject: [PATCH 1/7] Update scripts to use .bin paths --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 701e1d3..d6d388e 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "repository": "https://github.com/atdrago/negative.git", "license": "MIT", "scripts": { - "start": "export NODE_ENV=development && export ELECTRON_ENABLE_LOGGING=true && export ELECTRON_ENABLE_STACK_DUMPING=true && export NEGATIVE_VERBOSE=false && electron .", + "start": "export NODE_ENV=development && export ELECTRON_ENABLE_LOGGING=true && export ELECTRON_ENABLE_STACK_DUMPING=true && export NEGATIVE_VERBOSE=false && ./node_modules/.bin/electron .", "prebuild": "rm -rf dist", - "build": "gulp release && mkdir -p ./release/node_modules && npm install --production --prefix ./release/ && gulp build", + "build": "./node_modules/.bin/gulp release && mkdir -p ./release/node_modules && npm install --production --prefix ./release/ && ./node_modules/.bin/gulp build", "build-sign": "npm run build && ./scripts/sign-osx.sh", "open": "open ./dist/Negative-darwin-x64/Negative.app", "predmg": "npm run build-sign", "dmg": "./scripts/dmg.sh", "postinstall": "./node_modules/.bin/electron-rebuild", - "lint": "gulp js:lint", - "test": "mocha --recursive", + "lint": "./node_modules/.bin/gulp js:lint", + "test": "./node_modules/.bin/mocha --recursive", "travis": "npm run build-sign && npm test" }, "author": "Adam Drago ", From c8964924698c257d344f8b4485125ab0b53adc98 Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 29 Oct 2017 08:46:52 -0700 Subject: [PATCH 2/7] Update autoUpdater url to use Hazel --- lib/negative.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/negative.js b/lib/negative.js index 3354bd8..28535af 100644 --- a/lib/negative.js +++ b/lib/negative.js @@ -113,7 +113,7 @@ module.exports = { const appVersion = require('../package.json').version; const nextAutoUpdate = this.negativeSettings.get('nextAutoUpdate'); - autoUpdater.setFeedURL(`http://squirrel.negativeapp.com/update/darwin?version=${appVersion}`); + autoUpdater.setFeedURL(`https://hazel-pguxkhdcxq.now.sh/update/darwin?version=${appVersion}`); if (shouldAutoUpdate) { const now = Date.now(); From 436a6db4844bfc21158c50ec58453603b2fc0287 Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 5 Nov 2017 08:45:56 -0800 Subject: [PATCH 3/7] Update feed updates URL to aliased negative.now.sh --- lib/negative.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/negative.js b/lib/negative.js index 28535af..de4818c 100644 --- a/lib/negative.js +++ b/lib/negative.js @@ -110,10 +110,10 @@ module.exports = { }, initAutoUpdater() { - const appVersion = require('../package.json').version; + const appVersion = require('../package.json').version; const nextAutoUpdate = this.negativeSettings.get('nextAutoUpdate'); - autoUpdater.setFeedURL(`https://hazel-pguxkhdcxq.now.sh/update/darwin?version=${appVersion}`); + autoUpdater.setFeedURL(`https://negative.now.sh/update/darwin/${appVersion}`); if (shouldAutoUpdate) { const now = Date.now(); From 47ea839ad2cf71fc6733bfa0c494feaf650f97f3 Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 5 Nov 2017 08:58:26 -0800 Subject: [PATCH 4/7] Update electron, electron-packager, and electron-rebuild --- package-lock.json | 117 ++++++++++++++++++++++++++++++++++++++++------ package.json | 8 ++-- 2 files changed, 108 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 937f56b..73803b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Negative", - "version": "0.10.1", + "version": "0.10.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -423,6 +423,12 @@ "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=", "dev": true }, + "author-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", + "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", + "dev": true + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -665,6 +671,12 @@ "map-obj": "1.0.1" } }, + "camelize": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", + "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=", + "dev": true + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -1450,20 +1462,24 @@ } }, "electron-packager": { - "version": "8.7.2", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-8.7.2.tgz", - "integrity": "sha1-RX078kvJYHwGrUsettqkrMrcIQg=", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-9.1.0.tgz", + "integrity": "sha1-Sy75+DQ/XeQxGC2Ckp2cBsDVGh0=", "dev": true, "requires": { "asar": "0.13.0", - "debug": "2.6.9", + "camelize": "1.0.0", + "debug": "3.1.0", "electron-download": "4.1.0", "electron-osx-sign": "0.4.7", "extract-zip": "1.6.5", - "fs-extra": "3.0.1", + "fs-extra": "4.0.2", "get-package-info": "1.0.0", "minimist": "1.2.0", + "parse-author": "2.0.0", + "pify": "3.0.0", "plist": "2.1.0", + "pruner": "0.0.7", "rcedit": "0.9.0", "resolve": "1.5.0", "run-series": "1.1.4", @@ -1471,6 +1487,15 @@ "semver": "5.4.1" }, "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "electron-download": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz", @@ -1488,6 +1513,15 @@ "sumchecker": "2.0.2" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "fs-extra": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", @@ -1501,20 +1535,20 @@ } }, "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", + "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", "dev": true, "requires": { "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", + "jsonfile": "4.0.0", "universalify": "0.1.1" }, "dependencies": { "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { "graceful-fs": "4.1.11" @@ -1528,6 +1562,12 @@ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, "sumchecker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", @@ -1535,6 +1575,17 @@ "dev": true, "requires": { "debug": "2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } } } @@ -5661,6 +5712,15 @@ "p-limit": "1.1.0" } }, + "parse-author": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", + "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", + "dev": true, + "requires": { + "author-regex": "1.0.0" + } + }, "parse-filepath": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", @@ -5863,6 +5923,37 @@ "through2": "0.2.3" } }, + "pruner": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz", + "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=", + "dev": true, + "requires": { + "fs-extra": "4.0.2" + }, + "dependencies": { + "fs-extra": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", + "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", diff --git a/package.json b/package.json index d6d388e..eab8904 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "chai": "^3.5.0", "del": "^2.2.0", "devtron": "^1.1.2", - "electron": "^1.6.11", - "electron-packager": "^8.7.0", - "electron-rebuild": "^1.5.11", + "electron": "^1.7.9", + "electron-packager": "^9.1.0", + "electron-rebuild": "^1.6.0", "gulp": "^3.9.1", "gulp-changed": "^1.3.0", "gulp-clean-css": "^2.0.6", @@ -53,4 +53,4 @@ "os": [ "darwin" ] -} \ No newline at end of file +} From 5edc06cdc22c297167c47d2aeb686951a91ce97f Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 5 Nov 2017 13:10:35 -0800 Subject: [PATCH 5/7] Replace `dmg` and `predmg` with `build-artifacts`. Create ZIP. --- package.json | 3 +-- scripts/artifacts.sh | 19 +++++++++++++++++++ scripts/dmg.sh | 8 -------- 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100755 scripts/artifacts.sh delete mode 100755 scripts/dmg.sh diff --git a/package.json b/package.json index eab8904..fecaafc 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,8 @@ "prebuild": "rm -rf dist", "build": "./node_modules/.bin/gulp release && mkdir -p ./release/node_modules && npm install --production --prefix ./release/ && ./node_modules/.bin/gulp build", "build-sign": "npm run build && ./scripts/sign-osx.sh", + "build-artifacts": "npm run build-sign && ./scripts/artifacts.sh", "open": "open ./dist/Negative-darwin-x64/Negative.app", - "predmg": "npm run build-sign", - "dmg": "./scripts/dmg.sh", "postinstall": "./node_modules/.bin/electron-rebuild", "lint": "./node_modules/.bin/gulp js:lint", "test": "./node_modules/.bin/mocha --recursive", diff --git a/scripts/artifacts.sh b/scripts/artifacts.sh new file mode 100755 index 0000000..f443c42 --- /dev/null +++ b/scripts/artifacts.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Setup some generic variables +NEGATIVE_VERSION=$(node -p -e "require('./package.json').version") +DIST_PATH="./dist/Negative-darwin-x64" + +# Create DMG +DMG_CONFIG="./resources-osx/appdmg.json" +DMG_PATH="$DIST_PATH/Negative-v$NEGATIVE_VERSION.dmg" + +appdmg $DMG_CONFIG $DMG_PATH + +# Create ZIP +APP_PATH="Negative.app" +ZIP_PATH="Negative-v$NEGATIVE_VERSION-mac.zip" + +## We `cd` first so we don't get "./dist/Negative-darwin-x64" included in our ZIP +cd $DIST_PATH +zip -r $ZIP_PATH $APP_PATH diff --git a/scripts/dmg.sh b/scripts/dmg.sh deleted file mode 100755 index d94e212..0000000 --- a/scripts/dmg.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -NEGATIVE_VERSION=$(node -p -e "require('./package.json').version") -APPDMG_JSON="./resources-osx/appdmg.json" -RESULT_PATH="./dist/Negative-darwin-x64/Negative-v$NEGATIVE_VERSION.dmg" - -appdmg $APPDMG_JSON $RESULT_PATH -open $RESULT_PATH From 4caa64a53ab8a4bcba706c7fed5117d7abf9a80f Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 5 Nov 2017 13:10:56 -0800 Subject: [PATCH 6/7] Update README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c5d6036..1bc2c1d 100644 --- a/README.md +++ b/README.md @@ -55,10 +55,10 @@ Currently only Mac OS X is supported. 1. Run `build` 2. Run `test` - `npm run open` - Starts the app from `dist/Negative-darwin-x64/Negative.app` -- `npm run dmg` - 1. Run `build` - 2. Move `dist/Negative-darwin-x64/Negative.app` to `dist/release/Negative.app` - 3. Create `dist/release/Negative.dmg` +- `npm run build-artifacts` + 1. Run `build-sign` + 2. Create `dist/Negative-darwin-x64/Negative-v0.10.2.dmg` + 3. Create `dist/Negative-darwin-x64/Negative-v0.10.2-mac.zip` ## About Created by [Adam Drago](http://adamdrago.com). Built on [Electron](http://electron.atom.io/). From 807041e3ebbe6736f448abc091ef5e6af307d954 Mon Sep 17 00:00:00 2001 From: Adam Drago Date: Sun, 5 Nov 2017 14:20:43 -0800 Subject: [PATCH 7/7] Bump version to 0.10.3 --- README.md | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1bc2c1d..a5b526a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Follow [@NegativeJS](https://twitter.com/negativejs) on Twitter for important updates. ## Download -- [Negative v0.10.2 for Mac OS X](https://github.com/atdrago/negative/releases/download/v0.10.2/Negative-v0.10.2.dmg) +- [Negative v0.10.3 for Mac OS X](https://github.com/atdrago/negative/releases/download/v0.10.3/Negative-v0.10.3.dmg) ## User Documentation Please check [negative/releases](https://github.com/atdrago/negative/releases) for details on changes between versions. @@ -57,8 +57,8 @@ Currently only Mac OS X is supported. - `npm run open` - Starts the app from `dist/Negative-darwin-x64/Negative.app` - `npm run build-artifacts` 1. Run `build-sign` - 2. Create `dist/Negative-darwin-x64/Negative-v0.10.2.dmg` - 3. Create `dist/Negative-darwin-x64/Negative-v0.10.2-mac.zip` + 2. Create `dist/Negative-darwin-x64/Negative-v0.10.3.dmg` + 3. Create `dist/Negative-darwin-x64/Negative-v0.10.3-mac.zip` ## About Created by [Adam Drago](http://adamdrago.com). Built on [Electron](http://electron.atom.io/). diff --git a/package.json b/package.json index fecaafc..da9be20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Negative", - "version": "0.10.2", + "version": "0.10.3", "description": "An app for making visual comparisons.", "main": "lib/main.js", "repository": "https://github.com/atdrago/negative.git", @@ -52,4 +52,4 @@ "os": [ "darwin" ] -} +} \ No newline at end of file