feat(deployment): support foo/bar repo as short form of owner foo and…

… repo bar Close #1227
electron-userland · Feb 28, 2017 · 9d0e1fe · 9d0e1fe
1 parent ef9b5a6
commit 9d0e1fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.idea/electron-builder.iml b/.idea/electron-builder.iml
diff --git a/packages/electron-builder/src/publish/publisher.ts b/packages/electron-builder/src/publish/publisher.ts
@@ -36,6 +36,16 @@ export async function getResolvedPublishConfig(packager: BuildInfo, publishConfi
 
   let owner = publishConfig.owner
   let project = provider === "github" ? (<GithubOptions>publishConfig).repo : (<BintrayOptions>publishConfig).package
+
+  if (provider === "github" && owner == null && project != null) {
+    const index = project.indexOf("/")
+    if (index > 0) {
+      const repo = project
+      project = repo.substring(0, index)
+      owner = repo.substring(index + 1)
+    }
+  }
+
   if (!owner || !project) {
     const info = await getInfo()
     if (info == null) {

diff --git a/packages/electron-publish/src/gitHubPublisher.ts b/packages/electron-publish/src/gitHubPublisher.ts
@@ -192,7 +192,7 @@ export class GitHubPublisher extends HttpPublisher {
     return httpExecutor.request<T>(configureRequestOptions({
       hostname: baseUrl.hostname,
       port: <any>baseUrl.port,
-      path: (this.info.host != null && this.info.host !== "github.com") ? `/api/v3/${path}` : path,
+      path: (this.info.host != null && this.info.host !== "github.com") ? `/api/v3${path.startsWith("/") ? path : `/${path}`}` : path,
       headers: {Accept: "application/vnd.github.v3+json"}
     }, token, method), this.context.cancellationToken, data)
   }

diff --git a/test/src/windows/oneClickInstallerTest.ts b/test/src/windows/oneClickInstallerTest.ts
@@ -150,8 +150,12 @@ test.ifNotCiMac("web installer", app({
 
 test.ifAll.ifNotCiMac("web installer (default github)", app({
   targets: Platform.WINDOWS.createTarget(["nsis-web"], Arch.ia32, Arch.x64),
-  appMetadata: {
-    repository: "foo/bar"
+  config: {
+    publish: {
+      provider: "github",
+      // test form without owner
+      repo: "foo/bar"
+    }
   },
 }, {
   packed: async context => {