fix(deployment): check for errors

Author: develar

.babelrc

@@ -19,6 +19,7 @@
             excludeModules: ["path"]
           }
         ],
+        "./packages/babel-plugin-version-transform.js",
       ],
     },
     test: {

package.json

@@ -27,7 +27,7 @@
   "repository": "electron-userland/electron-builder",
   "///": "all dependencies for all packages (hoisted)",
   "dependencies": {
-    "7zip-bin": "^2.0.4",
+    "7zip-bin": "^2.1.0",
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.1.0",
     "archiver": "^1.3.0",

packages/babel-plugin-version-transform.js

@@ -0,0 +1,18 @@
+const path = require("path")
+const version = require(path.join(__dirname, "electron-builder/package.json")).version
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = function versionTransform() {
+  return {
+    visitor: {
+      Identifier(path) {
+        if (path.node.name === 'PACKAGE_VERSION') {
+          path.replaceWithSourceString('"' + version + '"');
+        }
+      },
+    },
+  };
+};
+

packages/electron-builder-util/package.json

@@ -20,7 +20,7 @@
     "node-emoji": "^1.5.1",
     "electron-builder-http": "~0.0.0-semantic-release",
     "source-map-support": "^0.4.15",
-    "7zip-bin": "^2.0.4",
+    "7zip-bin": "^2.1.0",
     "ini": "^1.3.4",
     "tunnel-agent": "^0.6.0"
   },

packages/electron-builder-util/src/nodeHttpExecutor.ts

@@ -9,6 +9,7 @@ import { parse as parseIni } from "ini"
 import { homedir } from "os"
 import * as path from "path"
 import { parse as parseUrl } from "url"
+import { safeStringifyJson } from "./util"
 
 const debug = _debug("electron-builder")
 
@@ -45,7 +46,7 @@ export class NodeHttpExecutor extends HttpExecutor<ClientRequest> {
 
   doApiRequest<T>(options: RequestOptions, cancellationToken: CancellationToken, requestProcessor: (request: ClientRequest, reject: (error: Error) => void) => void, redirectCount: number = 0): Promise<T> {
     if (debug.enabled) {
-      debug(`HTTPS request: ${JSON.stringify(options, null, 2)}`)
+      debug(`HTTPS request: ${safeStringifyJson(options)}`)
     }
 
     return cancellationToken.createPromise((resolve, reject, onCancel) => {

packages/electron-builder/package.json

@@ -44,7 +44,7 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
-    "7zip-bin": "^2.0.4",
+    "7zip-bin": "^2.1.0",
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.1.0",
     "bluebird-lst": "^1.0.2",

packages/electron-builder/src/packager.ts

@@ -26,6 +26,8 @@ function addHandler(emitter: EventEmitter, event: string, handler: Function) {
   emitter.on(event, handler)
 }
 
+declare const PACKAGE_VERSION: string
+
 export class Packager implements BuildInfo {
   readonly projectDir: string
   appDir: string
@@ -72,6 +74,8 @@ export class Packager implements BuildInfo {
     this.projectDir = options.projectDir == null ? process.cwd() : path.resolve(options.projectDir)
 
     this.prepackaged = options.prepackaged == null ? null : path.resolve(this.projectDir, options.prepackaged)
+
+    log("electron-builder " + PACKAGE_VERSION)
   }
 
   addAfterPackHandler(handler: (context: AfterPackContext) => Promise<any> | null) {
@@ -155,8 +159,11 @@ export class Packager implements BuildInfo {
     }
 
     this.checkMetadata(appPackageFile, devPackageFile)
-    
-    debug(`Effective config: ${safeStringifyJson(this.config)}`)
+
+    if (debug.enabled) {
+      debug(`Effective config: ${safeStringifyJson(this.config)}`)
+    }
+
     checkConflictingOptions(this.config)
 
     this.electronVersion = await getElectronVersion(this.config, projectDir, this.isPrepackedAppAsar ? this.metadata : null)

packages/electron-builder/src/publish/PublishManager.ts

@@ -156,7 +156,10 @@ export class PublishManager implements PublishContext {
     }
 
     this.publishTasks.push(promise
-      .catch(it => this.errors.push(it)))
+      .catch(it => {
+        debug(`Publish error: ${it.toString()}`)
+        this.errors.push(it)
+      }))
   }
 
   private getOrCreatePublisher(publishConfig: PublishConfiguration, buildInfo: BuildInfo): Publisher | null {
@@ -180,17 +183,22 @@ export class PublishManager implements PublishContext {
   }
 
   async awaitTasks() {
-    if (this.errors.length > 0) {
-      this.cancelTasks()
-      throwError(this.errors)
-      return
+    const checkErrors = () => {
+      if (this.errors.length > 0) {
+        this.cancelTasks()
+        throwError(this.errors)
+        return
+      }
     }
 
+    checkErrors()
+
     const publishTasks = this.publishTasks
     let list = publishTasks.slice()
     publishTasks.length = 0
     while (list.length > 0) {
       await BluebirdPromise.all(list)
+      checkErrors()
       if (publishTasks.length === 0) {
         break
       }
@@ -301,7 +309,7 @@ async function writeUpdateInfo(event: ArtifactCreated, _publishConfigs: Array<Pu
 
 export function createPublisher(context: PublishContext, version: string, publishConfig: PublishConfiguration, options: PublishOptions): Publisher | null {
   if (debug.enabled) {
-    debug(`create publisher: ${safeStringifyJson(publishConfig)} is not published: cancelled`)
+    debug(`create publisher: ${safeStringifyJson(publishConfig)}`)
   }
 
   const provider = publishConfig.provider

packages/electron-publisher-s3/package.json

@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.3.0",
-    "aws-sdk": "^2.59.0",
+    "aws-sdk": "^2.60.0",
     "mime": "^1.3.6",
     "electron-publish": "~0.0.0-semantic-release",
     "electron-builder-util": "~0.0.0-semantic-release"

test/src/ArtifactPublisherTest.ts

@@ -34,10 +34,22 @@ function versionNumber() {
 const token = new Buffer("Y2Y5NDdhZDJhYzJlMzg1OGNiNzQzYzcwOWZhNGI0OTk2NWQ4ZDg3Yg==", "base64").toString()
 const iconPath = join(__dirname, "..", "fixtures", "test-app", "build", "icon.icns")
 
-//test("GitHub unauthorized", async (t) => {
-//  t.throws(await new GitHubPublisher("github-releases-test", "test-repo", versionNumber(), "incorrect token")
-//    .releasePromise, /(Bad credentials|Unauthorized|API rate limit exceeded)/)
-//})
+const publishContext: PublishContext = {
+  cancellationToken: new CancellationToken(),
+  progress: null,
+}
+
+test("GitHub unauthorized", async () => {
+  try {
+    await new GitHubPublisher(publishContext, {provider: "github", owner: "actperepo", repo: "ecb2", token: "incorrect token"}, versionNumber()).releasePromise
+  }
+  catch (e) {
+    expect(e.message).toMatch(/(Bad credentials|Unauthorized|API rate limit exceeded)/)
+    return
+  }
+
+  throw new Error("must be error")
+})
 
 function isApiRateError(e: Error): boolean {
   if (e.name === "HttpError") {
@@ -65,11 +77,6 @@ function testAndIgnoreApiRate(name: string, testFunction: () => Promise<any>) {
   })
 }
 
-const publishContext: PublishContext = {
-  cancellationToken: new CancellationToken(),
-  progress: null,
-}
-
 test("Bintray upload", async () => {
   const version = versionNumber()