fix(electron-updater): Autoupdater problem on mac if space in the URL

Close electron-userland#1192
develar · Feb 1, 2017 · e5d58e2 · e5d58e2
1 parent a2f64bb
commit e5d58e2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/packages/electron-builder/src/publish/PublishManager.ts b/packages/electron-builder/src/publish/PublishManager.ts
@@ -51,11 +51,11 @@ export class PublishManager {
 
       if (publishOptions.publish != null && publishOptions.publish !== "never") {
         this.isPublish = publishOptions.publish !== "onTag" || getCiTag() != null
-        if (this.isPublish && !isAuthTokenSet()) {
-          throw new Error(`Publish is set to ${publishOptions.publish}, but neither GH_TOKEN nor BT_TOKEN is not set`)
-        }
       }
     }
+    else if (publishOptions.publish !== "never") {
+      log("Current build is a part of pull request, publishing will be skipped")
+    }
 
     packager.addAfterPackHandler(async event => {
       if (!(event.electronPlatformName == "darwin" || event.packager.platform === Platform.WINDOWS)) {
@@ -264,11 +264,11 @@ function isAuthTokenSet() {
 function computeDownloadUrl(publishConfig: PublishConfiguration, fileName: string, version: string) {
   if (publishConfig.provider === "generic") {
     const baseUrl = url.parse((<GenericServerOptions>publishConfig).url)
-    return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname || "/", fileName)}))
+    return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname || "/", encodeURI(fileName))}))
   }
   else {
     const gh = <GithubOptions>publishConfig
-    return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${fileName}`
+    return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${encodeURI(fileName)}`
   }
 }
 

diff --git a/test/out/mac/__snapshots__/macPackagerTest.js.snap b/test/out/mac/__snapshots__/macPackagerTest.js.snap
@@ -57,6 +57,13 @@ Array [
 ]
 `;
 
+exports[`test one-package 3`] = `
+Object {
+  "url": "https://develar.s3.amazonaws.com/test/Test%20App%20%C3%9FW-1.1.0-mac.zip",
+  "version": "1.1.0",
+}
+`;
+
 exports[`test two-package 1`] = `
 Array [
   Object {

diff --git a/test/src/mac/macPackagerTest.ts b/test/src/mac/macPackagerTest.ts
@@ -1,5 +1,6 @@
 import { assertPack, platform, app, appThrows } from "../helpers/packTester"
 import { Platform, createTargets } from "electron-builder"
+import { readJson } from "fs-extra-p"
 import { DIR_TARGET } from "electron-builder/out/targets/targetFactory"
 import { copyFile } from "electron-builder-util/out/fs"
 import * as path from "path"
@@ -10,6 +11,10 @@ test.ifMac("two-package", () => assertPack("test-app", {targets: createTargets([
 test.ifMac("one-package", app({
   targets: Platform.MAC.createTarget(),
   config: {
+    publish: {
+      provider: "generic",
+      url: "https://develar.s3.amazonaws.com/test",
+    },
     mac: {
       fileAssociations: [
         {
@@ -33,6 +38,9 @@ test.ifMac("one-package", app({
     expect(info).toMatchSnapshot()
     await assertThat(path.join(appDir, "Contents", "Resources", "foo.icns")).isFile()
   },
+  packed: async context => {
+    expect(await readJson(path.join(context.outDir, "latest-mac.json"))).toMatchSnapshot()
+  },
 }))
 
 test.ifMac("electronDist", appThrows(/ENOENT: no such file or directory/, {

diff --git a/test/src/nsisUpdaterTest.ts b/test/src/nsisUpdaterTest.ts
@@ -86,7 +86,7 @@ test("file url generic", async () => {
   expect(actualEvents).toMatchSnapshot()
 })
 
-test("sha2 mismatch error event", async () => {
+test.ifNotCiWin("sha2 mismatch error event", async () => {
   const updater = new NsisUpdater()
   updater.updateConfigPath = await writeUpdateConfig(<GenericServerOptions>{
     provider: "generic",