Migrated from electron-packager to electron-builder

Author: desertkun

assets/icons/icon.hqx build/icons/icon.hqxassets/icons/icon.hqx renamed to build/icons/icon.hqx

@@ -1,20 +1,64 @@
 {
   "name": "hiera-editor",
-  "version": "0.1.1",
-  "description": "Hiera editor",
+  "version": "0.1.2",
+  "description": "A GUI tool to manage your Puppet/Hiera for you",
   "main": "dist/main.js",
   "scripts": {
     "start": "electron .",
-    "postinstall": "npx npmpd && npx run-script-os",
+    "postinstall": "npx run-script-os && npx electron-builder install-app-deps",
     "install:darwin": "./node_modules/rubyjs-darwin/bin/gem install bundler && BUNDLE_GEMFILE=./ruby/Gemfile ./node_modules/rubyjs-darwin/bin/bundle install",
     "install:linux": "./node_modules/rubyjs-linux/bin/gem install -f bundler && BUNDLE_GEMFILE=./ruby/Gemfile ./node_modules/rubyjs-linux/bin/bundle install",
     "install:win32": "cmd /C \"set BUNDLE_GEMFILE=ruby\\Gemfile && node_modules\\rubyjs-win32\\bin\\gem install bundler && node_modules\\rubyjs-win32\\bin\\bundle install\"",
     "test": "mocha --timeout 15000 dist/tests/**/*.js",
-    "package-mac": "npx electron-packager . --no-prune --overwrite --platform=darwin --arch=x64 --icon=assets/icons/icon.icns --out=release-builds",
-    "package-win": "npx electron-packager . hiera-editor --no-prune --overwrite --platform=win32 --arch=ia32 --icon=assets/icons/icon.ico --out=release-builds --version-string.ProductName=\"Hiera Editor\"",
-    "package-linux": "npx electron-packager . hiera-editor --no-prune --overwrite --platform=linux --arch=x64 --icon=assets/icons/icon.png --out=release-builds"
+    "compile": "tsc",
+    "dist": "npm run compile && npx electron-builder",
+    "publish": "npm run compile && npx electron-builder -p onTagOrDraft"
   },
   "repository": "https://github.com/desertkun/hiera-editor",
+  "build": {
+    "appId": "com.desertkun.hiera-editor",
+    "productName": "Hiera Editor",
+    "files": [
+      "./build/**/*",
+      "./dist/**/*",
+      "./html/**/*",
+      "./css/**/*",
+      "./js/**/*",
+      "./images/**/*",
+      "./fonts/**/*"
+    ],
+    "directories": {
+      "output": "release-builds"
+    },
+    "nsis": {
+      "createDesktopShortcut": true
+    },
+    "mac": {
+      "asar": true,
+      "asarUnpack": [
+        "**/app/node_modules/rubyjs-darwin/*"
+      ],
+      "icon": "build/icons/icon.icns",
+      "target": [
+        "zip",
+        "dmg"
+      ]
+    },
+    "win": {
+      "asar": true,
+      "asarUnpack": [
+        "**/app/node_modules/rubyjs-win32/*"
+      ],
+      "icon": "build/icons/icon.ico"
+    },
+    "linux": {
+      "asar": true,
+      "asarUnpack": [
+        "**/app/node_modules/rubyjs-linux/*"
+      ],
+      "icon": "build/icons/icon.png"
+    }
+  },
   "keywords": [
     "Electron",
     "Puppet",
@@ -26,12 +70,14 @@
     "@types/chai-as-promised": "^7.1.0",
     "@types/mocha": "^5.2.5",
     "@types/tmp": "0.0.33",
+    "@types/chai": "^4.1.6",
+    "@types/fs-extra": "^5.0.4",
+    "@types/yaml": "^1.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "electron": "^3.0.0",
-    "electron-packager": "^12.2.0",
+    "electron-builder": "^20.38.4",
     "mocha": "^5.2.0",
-    "npm-platform-dependencies": "git+https://github.com/desertkun/npm-platform-dependencies.git",
     "rimraf": "^2.6.2",
     "run-script-os": "^1.0.3",
     "tmp": "0.0.33",
@@ -40,13 +86,11 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.3.1",
-    "@types/chai": "^4.1.6",
-    "@types/fs-extra": "^5.0.4",
-    "@types/yaml": "^1.0.0",
     "app-root-path": "^2.0.1",
     "dialogs": "^1.1.20",
     "electron-ipc-tunnel": "^3.1.0",
     "electron-json-storage": "^4.1.3",
+    "electron-updater": "^4.0.6",
     "electron-window-state": "^4.1.1",
     "es6-promise-pool": "^2.5.0",
     "extract-zip": "^1.6.7",
@@ -59,13 +103,9 @@
     "text-ellipsis": "^1.0.3",
     "yaml": "^1.0.1"
   },
-  "darwinDependencies": {
-    "rubyjs-darwin": "latest"
-  },
-  "win32Dependencies": {
-    "rubyjs-win32": "latest"
-  },
-  "linuxDependencies": {
+  "optionalDependencies": {
+    "rubyjs-darwin": "latest",
+    "rubyjs-win32": "latest",
     "rubyjs-linux": "latest"
   }
 }

assets/icons/icon.icns build/icons/icon.icnsassets/icons/icon.icns renamed to build/icons/icon.icns

@@ -4,14 +4,14 @@ import * as path from "path";
 import * as url from "url";
 import { puppet } from "./puppet";
 import "./ipc/server";
-
 import { ProjectsModel } from "./projects"
 import { init, projects_window } from "./global"
+const { autoUpdater } = require("electron-updater")
 
 function initialize() 
 {
+    autoUpdater.checkForUpdatesAndNotify();
     init();
-
     projects_window.show();
 }
 

assets/icons/icon.ico build/icons/icon.icoassets/icons/icon.ico renamed to build/icons/icon.ico

@@ -22,7 +22,7 @@ export module puppet
 
     export class Ruby
     {
-        public static Path(): RubyPath
+        private static Path_(): RubyPath
         {
             if (process.platform == "win32")
             {
@@ -39,12 +39,25 @@ export module puppet
 
             return null;
         }
+        
+        public static Path(): RubyPath
+        {
+            const path_ = Ruby.Path_();
+
+            return {
+                path: path_.path.replace('app.asar', 'app.asar.unpacked'),
+                rubyPath: path_.rubyPath.replace('app.asar', 'app.asar.unpacked'),
+                gemPath: path_.gemPath.replace('app.asar', 'app.asar.unpacked'),
+            };
+        }
 
         public static async CallBin(script: string, args: string[], cwd: string, env_: any, cb?: async.ExecFileLineCallback): Promise<void>
         {
+            const ruby = Ruby.Path();
+
             const argsTotal = [
-                Ruby.Path().rubyPath,
-                path.join(Ruby.Path().path, script)
+                ruby.rubyPath,
+                path.join(ruby.path, script)
             ];
 
             for (let arg of args)
@@ -56,13 +69,14 @@ export module puppet
             Object.assign(env, env_);
 
             env["SSL_CERT_FILE"] = require('app-root-path').resolve("ruby/cacert.pem");
-            env["PATH"] = Ruby.Path().path + path.delimiter + process.env["PATH"];
+            env["PATH"] = ruby.path + path.delimiter + process.env["PATH"];
 
             await async.execFileReadIn("\"" + argsTotal.join("\" \"") + "\"", cwd, env, cb);
         }
 
         public static async Call(script: string, args: Array<string>, cwd: string): Promise<boolean>
         {
+            const ruby = Ruby.Path();
             const rubyScript = require('app-root-path').resolve(path.join("ruby", script));
 
             const argsTotal = [];
@@ -76,7 +90,7 @@ export module puppet
 
             try
             {
-                await async.execFile(Ruby.Path().rubyPath, argsTotal, cwd);
+                await async.execFile(ruby.rubyPath, argsTotal, cwd);
                 return true;
             }
             catch (e)