Make publishers work and add specs

package.json

@@ -4,9 +4,10 @@
   "bolt": {
     "workspaces": [
       "packages/api/*",
+      "packages/installer/*",
       "packages/maker/*",
       "packages/publisher/*",
-      "packages/installer/*"
+      "packages/utils/*"
     ]
   },
   "config": {

packages/api/cli/package.json

@@ -19,6 +19,7 @@
     "mocha": "^5.0.0"
   },
   "dependencies": {
+    "@electron-forge/async-ora": "^6.0.0-beta.0",
     "@electron-forge/core": "^6.0.0-beta.0",
     "colors": "^1.1.2",
     "commander": "^2.9.0",

packages/api/cli/src/electron-forge.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import program from 'commander';
 import tabtab from 'tabtab';
-// FIXME: Deep imports like this are a bad idea
-import asyncOra from '@electron-forge/core/dist/util/ora-handler';
 
 import './util/terminate';
 

packages/api/cli/test/check-system_spec.js

@@ -1,6 +1,5 @@
+import { fakeOra } from '@electron-forge/async-ora';
 import { expect } from 'chai';
-// FIXME: Deep imports like this are a bad idea
-import { fakeOra } from '@electron-forge/core/dist/util/ora';
 
 import checkSystem, { validPackageManagerVersion } from '../src/util/check-system';
 

packages/api/core/package.json

@@ -32,12 +32,12 @@
     "sinon": "^4.1.2"
   },
   "dependencies": {
+    "@electron-forge/async-ora": "^6.0.0-beta.0",
     "@electron-forge/installer-deb": "^6.0.0-beta.0",
     "@electron-forge/installer-dmg": "^6.0.0-beta.0",
     "@electron-forge/installer-exe": "^6.0.0-beta.0",
     "@electron-forge/installer-rpm": "^6.0.0-beta.0",
     "@electron-forge/installer-zip": "^6.0.0-beta.0",
-    "@octokit/rest": "^14.0.4",
     "colors": "^1.1.2",
     "cross-spawn-promise": "^0.10.1",
     "debug": "^3.0.0",
@@ -50,7 +50,6 @@
     "log-symbols": "^2.0.0",
     "node-fetch": "^2.0.0",
     "nugget": "^2.0.1",
-    "ora": "^1.1.0",
     "pify": "^3.0.0",
     "resolve-package": "^1.0.1",
     "semver": "^5.3.0",

packages/api/core/src/api/import.js

@@ -1,3 +1,4 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import path from 'path';
@@ -6,7 +7,6 @@ import initGit from './init-scripts/init-git';
 import { deps, devDeps, exactDevDeps } from './init-scripts/init-npm';
 
 import { setInitialForgeConfig } from '../util/forge-config';
-import asyncOra from '../util/ora-handler';
 import { info, warn } from '../util/messages';
 import installDepList from '../util/install-dependencies';
 import readPackageJSON from '../util/read-package-json';

packages/api/core/src/api/init-scripts/init-custom.js

@@ -1,13 +1,12 @@
+import { asyncOra, ora } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import glob from 'glob';
 import resolvePackage from 'resolve-package';
 import path from 'path';
 
 import { copy } from './init-starter-files';
-import asyncOra from '../../util/ora-handler';
 import installDepList from '../../util/install-dependencies';
-import ora from '../../util/ora';
 
 const d = debug('electron-forge:init:custom');
 

packages/api/core/src/api/init-scripts/init-directory.js

@@ -1,9 +1,8 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import logSymbols from 'log-symbols';
 
-import asyncOra from '../../util/ora-handler';
-
 const d = debug('electron-forge:init:directory');
 
 export default async (dir) => {

packages/api/core/src/api/init-scripts/init-git.js

@@ -1,10 +1,9 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import { exec } from 'child_process';
 import debug from 'debug';
 import fs from 'fs-extra';
 import path from 'path';
 
-import asyncOra from '../../util/ora-handler';
-
 const d = debug('electron-forge:init:git');
 
 export default async (dir) => {

packages/api/core/src/api/init-scripts/init-npm.js

@@ -1,3 +1,4 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import path from 'path';
@@ -6,7 +7,6 @@ import username from 'username';
 import { setInitialForgeConfig } from '../../util/forge-config';
 import installDepList from '../../util/install-dependencies';
 import readPackageJSON from '../../util/read-package-json';
-import asyncOra from '../../util/ora-handler';
 
 const d = debug('electron-forge:init:npm');
 

packages/api/core/src/api/init-scripts/init-starter-files.js

@@ -1,9 +1,8 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import path from 'path';
 
-import asyncOra from '../../util/ora-handler';
-
 const d = debug('electron-forge:init:starter-files');
 
 export const copy = async (source, target) => {

packages/api/core/src/api/init.js

@@ -1,3 +1,4 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 
 import initCustom from './init-scripts/init-custom';
@@ -6,8 +7,6 @@ import initGit from './init-scripts/init-git';
 import initNPM from './init-scripts/init-npm';
 import initStarter from './init-scripts/init-starter-files';
 
-import asyncOra from '../util/ora-handler';
-
 const d = debug('electron-forge:init');
 
 /**

packages/api/core/src/api/install.js

@@ -1,4 +1,5 @@
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fetch from 'node-fetch';
 import fs from 'fs-extra';
@@ -14,7 +15,6 @@ import DebInstaller from '@electron-forge/installer-deb';
 import RPMInstaller from '@electron-forge/installer-rpm';
 import ExeInstaller from '@electron-forge/installer-exe';
 
-import asyncOra from '../util/ora-handler';
 import { info } from '../util/messages';
 
 const d = debug('electron-forge:install');

packages/api/core/src/api/lint.js

@@ -1,8 +1,8 @@
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import { yarnOrNpmSpawn } from '../util/yarn-or-npm';
 
-import asyncOra from '../util/ora-handler';
 import resolveDir from '../util/resolve-dir';
 
 const d = debug('electron-forge:lint');

packages/api/core/src/api/make.js

@@ -1,9 +1,9 @@
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import fs from 'fs-extra';
 import path from 'path';
 import { hostArch } from 'electron-packager/targets';
 
-import asyncOra from '../util/ora-handler';
 import getForgeConfig from '../util/forge-config';
 import runHook from '../util/hook';
 import { info, warn } from '../util/messages';

packages/api/core/src/api/package.js

@@ -1,4 +1,5 @@
 import 'colors';
+import { ora as realOra, fakeOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import glob from 'glob';
@@ -10,7 +11,6 @@ import { hostArch } from 'electron-packager/targets';
 import getForgeConfig from '../util/forge-config';
 import runHook from '../util/hook';
 import { warn } from '../util/messages';
-import realOra, { fakeOra } from '../util/ora';
 import readPackageJSON from '../util/read-package-json';
 import rebuildHook from '../util/rebuild';
 import requireSearch from '../util/require-search';

packages/api/core/src/api/publish.js

@@ -1,12 +1,11 @@
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 import fs from 'fs-extra';
 import path from 'path';
 
-import asyncOra from '../util/ora-handler';
 import getForgeConfig from '../util/forge-config';
 import readPackageJSON from '../util/read-package-json';
-import requireSearch from '../util/require-search';
 import resolveDir from '../util/resolve-dir';
 import PublishState from '../util/publish-state';
 import getCurrentOutDir from '../util/out-dir';
@@ -15,13 +14,19 @@ import make from './make';
 
 const d = debug('electron-forge:publish');
 
+/**
+ * @typedef {Object} PublishTarget
+ * @property {string} [name]
+ * @property {Array<string>} [platforms=[process.platform]]
+ * @property {Object} [config={}]
+ */
+
 /**
  * @typedef {Object} PublishOptions
  * @property {string} [dir=process.cwd()] The path to the app to be published
  * @property {boolean} [interactive=false] Whether to use sensible defaults or prompt the user visually
- * @property {string} [authToken] An authentication token to use when publishing
  * @property {string} [tag=packageJSON.version] The string to tag this release with
- * @property {Array<string>} [publishTargets=[github]] The publish targets
+ * @property {Array<PublishTarget>} [publishTargets=[]] The publish targets
  * @property {MakeOptions} [makeOptions] Options object to passed through to make()
  * @property {string} [outDir=`${dir}/out`] The path to the directory containing generated distributables
  * @property {boolean} [dryRun=false] Whether to generate dry run meta data but not actually publish
@@ -120,31 +125,36 @@ const publish = async (providedOptions = {}) => {
     return accum;
   }, []);
 
+  const testPlatform = makeOptions.platform || process.platform;
   if (publishTargets === null) {
-    publishTargets = forgeConfig.publish_targets[makeOptions.platform || process.platform];
+    publishTargets = (forgeConfig.publishers || [])
+      .filter(publisher => publisher.platforms ? publisher.platforms.indexOf(testPlatform !== -1) : true);
   }
+  publishTargets = publishTargets.map((target) => {
+    if (typeof target === 'string') return { name: target };
+    return target;
+  });
 
   for (const publishTarget of publishTargets) {
-    let publisher;
-    await asyncOra(`Resolving publish target: ${`${publishTarget}`.cyan}`, async () => { // eslint-disable-line no-loop-func
-      publisher = requireSearch(__dirname, [
-        `../publishers/${publishTarget}.js`,
-        `electron-forge-publisher-${publishTarget}`,
-        publishTarget,
-        path.resolve(dir, publishTarget),
-        path.resolve(dir, 'node_modules', publishTarget),
-      ]);
-      if (!publisher) {
-        throw `Could not find a publish target with the name: ${publishTarget}`;
+    let publisherModule;
+    await asyncOra(`Resolving publish target: ${`${publishTarget.name}`.cyan}`, async () => { // eslint-disable-line no-loop-func
+      try {
+        publisherModule = require(publishTarget.name);
+      } catch (err) {
+        console.error(err);
+        throw `Could not find a publish target with the name: ${publishTarget.name}`;
       }
     });
 
-    await publisher({
+    const PublisherClass = publisherModule.default || publisherModule;
+    const publisher = new PublisherClass();
+
+    await publisher.publish({
       dir,
       artifacts,
       packageJSON,
+      config: publishTarget.config || {},
       forgeConfig,
-      authToken,
       tag,
       platform: makeOptions.platform || process.platform,
       arch: makeOptions.arch || process.arch,

packages/api/core/src/api/start.js

@@ -1,8 +1,8 @@
 import 'colors';
+import { asyncOra } from '@electron-forge/async-ora';
 import { spawn } from 'child_process';
 import path from 'path';
 
-import asyncOra from '../util/ora-handler';
 import readPackageJSON from '../util/read-package-json';
 import rebuild from '../util/rebuild';
 import resolveDir from '../util/resolve-dir';

packages/api/core/src/util/plugin-interface.js

@@ -1,7 +1,6 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import debug from 'debug';
 
-import asyncOra from './ora-handler';
-
 const d = debug('electron-forge:plugins');
 
 export default class PluginInterface {

packages/api/core/src/util/rebuild.js

@@ -1,7 +1,6 @@
+import { asyncOra } from '@electron-forge/async-ora';
 import rebuild from 'electron-rebuild';
 
-import asyncOra from '../util/ora-handler';
-
 export default async (buildPath, electronVersion, platform, arch, config = {}) => {
   await asyncOra('Preparing native dependencies', async (rebuildSpinner) => {
     const rebuilder = rebuild(Object.assign({}, config, {