Merge pull request #8 from brendancboyle/dev

1.0.2

app/main.dev.js

@@ -10,8 +10,10 @@
  *
  * @flow
  */
-import { app, BrowserWindow, autoUpdater, dialog } from 'electron';
+import { app, BrowserWindow } from 'electron';
 import IsDev from 'electron-is-dev';
+import { autoUpdater } from 'electron-updater';
+import ElectronLog from 'electron-log';
 import MenuBuilder from './menu';
 
 let mainWindow = null;
@@ -85,33 +87,14 @@ app.on('ready', async () => {
   const menuBuilder = new MenuBuilder(mainWindow);
   menuBuilder.buildMenu();
 
-  if (!IsDev) {
-    const server = 'https://update.universalpresenterremote.com';
-    const feed = `${server}/update/${process.platform}/${app.getVersion()}`;
-
-    autoUpdater.setFeedURL(feed);
+  ElectronLog.transports.file.level = 'debug';
+  ElectronLog.info('App Started!');
 
+  if (!IsDev) {
+    autoUpdater.logger = ElectronLog;
+    autoUpdater.checkForUpdatesAndNotify();
     setInterval(() => {
-      autoUpdater.checkForUpdates();
+      autoUpdater.checkForUpdatesAndNotify();
     }, 60000);
-
-    autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
-      const dialogOpts = {
-        type: 'info',
-        buttons: ['Restart', 'Later'],
-        title: 'Application Update',
-        message: process.platform === 'win32' ? releaseNotes : releaseName,
-        detail: 'A new version has been downloaded. Restart the application to apply the updates.'
-      };
-
-      dialog.showMessageBox(dialogOpts, (response) => {
-        if (response === 0) autoUpdater.quitAndInstall();
-      });
-    });
-
-    autoUpdater.on('error', message => {
-      console.error('There was a problem updating the application');
-      console.error(message);
-    });
   }
 });

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "upr-desktop",
   "productName": "upr-desktop",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Control your presentations from any platform.",
   "main": "./main.prod.js",
   "author": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "upr-desktop",
   "productName": "Universal Presenter Remote",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Control your presentations from any platform.",
   "scripts": {
     "build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",
@@ -186,6 +186,8 @@
     "devtron": "^1.4.0",
     "electron-debug": "^1.5.0",
     "electron-is-dev": "^0.3.0",
+    "electron-log": "^2.2.14",
+    "electron-updater": "^2.20.1",
     "font-awesome": "^4.7.0",
     "history": "^4.7.2",
     "react": "^16.2.0",

release/latest.yml

@@ -1,9 +1,9 @@
-version: 1.0.1
+version: 1.0.2
 files:
-  - url: upr-desktop-setup-1.0.1.exe
-    sha512: azwc1hJhlitwQThzJSZxeWgPASHQ75ebFaiXewOgjv95CGbsPeYe6/9qmn2L0WOe8Dkk539M1uuL8BADwPPc0Q==
-    size: 39344372
-path: upr-desktop-setup-1.0.1.exe
-sha512: azwc1hJhlitwQThzJSZxeWgPASHQ75ebFaiXewOgjv95CGbsPeYe6/9qmn2L0WOe8Dkk539M1uuL8BADwPPc0Q==
-sha2: 4549c3af13a9ae982b888fdd72aadc49aeda90d5cb9214f9ab88ec1551eb76aa
-releaseDate: '2018-02-12T06:09:49.920Z'
+  - url: upr-desktop-setup-1.0.2.exe
+    sha512: DpyN3d956Hu/9jZfoNPQcfUqVAiNdPzABiv4GmwTQGT0VQbn5sSY4futgfJIgc5sdFgucBtRljKT9H60u2OzCA==
+    size: 39710011
+path: upr-desktop-setup-1.0.2.exe
+sha512: DpyN3d956Hu/9jZfoNPQcfUqVAiNdPzABiv4GmwTQGT0VQbn5sSY4futgfJIgc5sdFgucBtRljKT9H60u2OzCA==
+sha2: 89e6bd985f25840e717ad7cfd0185f257f4ce345cb4f7e4a9156a26e6126f869
+releaseDate: '2018-02-12T07:58:31.244Z'

yarn.lock

@@ -1678,7 +1678,7 @@ [email protected]:
     fs-extra-p "^4.5.0"
     sax "^1.2.4"
 
-builder-util-runtime@^4.0.3, builder-util-runtime@^4.0.5:
+builder-util-runtime@^4.0.3, builder-util-runtime@^4.0.5, builder-util-runtime@~4.0.3:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
   dependencies:
@@ -3135,6 +3135,10 @@ electron-localshortcut@^3.0.0:
     keyboardevent-from-electron-accelerator "^1.1.0"
     keyboardevents-areequal "^0.2.1"
 
+electron-log@^2.2.14:
+  version "2.2.14"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.14.tgz#2123319ccb8d70b0db07f0eda57d5823cb42b4b0"
+
 [email protected]:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz#f0b9fadded9e1e54ec35fa89877b5c6c34c7bc40"
@@ -3176,6 +3180,20 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
   version "1.3.32"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
 
+electron-updater@^2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.20.1.tgz#3d2714a3e472fbf198f6053daf8fd12209101aa2"
+  dependencies:
+    bluebird-lst "^1.0.5"
+    builder-util-runtime "~4.0.3"
+    electron-is-dev "^0.3.0"
+    fs-extra-p "^4.5.0"
+    js-yaml "^3.10.0"
+    lazy-val "^1.0.3"
+    lodash.isequal "^4.5.0"
+    semver "^5.5.0"
+    source-map-support "^0.5.2"
+
 electron@^1.7.11:
   version "1.7.12"
   resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e"
@@ -6075,6 +6093,10 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -8901,7 +8923,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.0, source-map-support@^0.5.1, source-map-support@^0.5.3:
+source-map-support@^0.5.0, source-map-support@^0.5.1, source-map-support@^0.5.2, source-map-support@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
   dependencies: