Merge branch 'release/v0.10.3'

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.
@@ -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.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/).

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(`http://squirrel.negativeapp.com/update/darwin?version=${appVersion}`);
+		autoUpdater.setFeedURL(`https://negative.now.sh/update/darwin/${appVersion}`);
 
 		if (shouldAutoUpdate) {
 			const now       = Date.now();

package.json

@@ -1,21 +1,20 @@
 {
   "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",
   "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",
+    "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": "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 <atdrago+negative@gmail.com>",
@@ -31,9 +30,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",

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