fix: Don't throw an error if version doesn't start with `v´

Closes #743

src/builder.ts

@@ -11,6 +11,7 @@ import { getRepositoryInfo } from "./repositoryInfo"
 import { DIR_TARGET } from "./targets/targetFactory"
 import { BintrayPublisher } from "./publish/BintrayPublisher"
 import { BintrayOptions } from "./publish/bintray"
+import { PublishConfiguration, GithubPublishConfiguration } from "./options/publishOptions"
 
 //noinspection JSUnusedLocalSymbols
 const __awaiter = require("./util/awaiter")
@@ -269,18 +270,23 @@ function publishManager(packager: Packager, publishTasks: Array<BluebirdPromise<
       }
 
       if (publishers == null && options.githubToken != null) {
-        publishers = ["github"]
+        publishers = {provider: "github"}
       }
       // if both tokens are set — still publish to github (because default publisher is github)
       if (publishers == null && options.bintrayToken != null) {
-        publishers = ["bintray"]
+        publishers = {provider: "bintray"}
       }
     }
 
-    for (let publisherName of asArray(publishers)) {
+    for (let publishConfig of asArray(publishers)) {
+      if (typeof publishConfig === "string") {
+        publishConfig = {provider: publishConfig}
+      }
+
+      const publisherName = publishConfig.provider
       let publisher = nameToPublisher.get(publisherName)
       if (publisher == null) {
-        publisher = createPublisher(packager, options, publisherName, isPublishOptionGuessed)
+        publisher = createPublisher(packager, options, publishConfig, isPublishOptionGuessed)
         nameToPublisher.set(publisherName, publisher)
       }
 
@@ -292,9 +298,13 @@ function publishManager(packager: Packager, publishTasks: Array<BluebirdPromise<
   })
 }
 
-export async function createPublisher(packager: Packager, options: PublishOptions, publisherName: string, isPublishOptionGuessed: boolean = false): Promise<Publisher | null> {
-  const info = await getRepositoryInfo(packager.metadata, packager.devMetadata)
-  if (info == null) {
+export async function createPublisher(packager: Packager, options: PublishOptions, publishConfig: PublishConfiguration | GithubPublishConfiguration, isPublishOptionGuessed: boolean = false): Promise<Publisher | null> {
+  async function getInfo() {
+    const info = await getRepositoryInfo(packager.metadata, packager.devMetadata)
+    if (info != null) {
+      return info
+    }
+
     if (isPublishOptionGuessed) {
       return null
     }
@@ -303,12 +313,30 @@ export async function createPublisher(packager: Packager, options: PublishOption
     throw new Error(`Please specify 'repository' in the dev package.json ('${packager.devPackageFile}')`)
   }
 
-  if (publisherName === "github") {
+  if (publishConfig.provider === "github") {
+    const config = <GithubPublishConfiguration>publishConfig
+    let user = config.owner
+    let repo = config.repo
+    if (!user || !repo) {
+      const info = await getInfo()
+      if (info == null) {
+        return null
+      }
+
+      user = info.user
+      repo = info.project
+    }
+
     const version = packager.metadata.version!
-    log(`Creating Github Publisher — user: ${info.user}, project: ${info.project}, version: ${version}`)
-    return new GitHubPublisher(info.user, info.project, version, options, isPublishOptionGuessed)
+    log(`Creating Github Publisher — user: ${user}, project: ${repo}, version: ${version}`)
+    return new GitHubPublisher(user, repo, version, options, isPublishOptionGuessed, config)
   }
-  if (publisherName === "bintray") {
+  if (publishConfig.provider === "bintray") {
+    const info = await getInfo()
+    if (info == null) {
+      return null
+    }
+
     const version = packager.metadata.version!
     //noinspection ReservedWordAsName
     const bintrayInfo: BintrayOptions = {user: info.user, package: info.project, repo: "generic"}

src/index.ts

@@ -4,4 +4,4 @@ export { DIR_TARGET, DEFAULT_TARGET } from "./targets/targetFactory"
 export { BuildOptions, build, CliOptions, createTargets } from "./builder"
 export { PublishOptions, Publisher } from "./publish/publisher"
 export { AppMetadata, DevMetadata, Platform, Arch, archFromString, BuildMetadata, WinBuildOptions, LinuxBuildOptions, CompressionLevel } from "./metadata"
-export { MacOptions, DmgOptions, MasBuildOptions } from "./macOptions"
+export { MacOptions, DmgOptions, MasBuildOptions } from "./options/macOptions"

src/macPackager.ts

@@ -1,6 +1,6 @@
 import { PlatformPackager, BuildInfo, Target } from "./platformPackager"
 import { Platform, Arch } from "./metadata"
-import { MasBuildOptions, MacOptions } from "./macOptions"
+import { MasBuildOptions, MacOptions } from "./options/macOptions"
 import * as path from "path"
 import { Promise as BluebirdPromise } from "bluebird"
 import { log, warn, task } from "./util/log"

src/metadata.ts

@@ -1,6 +1,7 @@
 import { AsarOptions } from "asar-electron-builder"
 import { PlatformPackager } from "./platformPackager"
-import { MacOptions, DmgOptions, MasBuildOptions } from "./macOptions"
+import { MacOptions, DmgOptions, MasBuildOptions } from "./options/macOptions"
+import { PublishConfiguration } from "./options/publishOptions"
 
 export interface Metadata {
   readonly repository?: string | RepositoryInfo | null
@@ -206,7 +207,7 @@ export interface BuildMetadata {
 
   readonly dereference?: boolean
 
-  readonly publish?: string | Array<string> | null
+  readonly publish?: string | Array<string> | null | PublishConfiguration
 }
 
 export interface AfterPackContext {

src/macOptions.ts → src/options/macOptions.ts

@@ -1,4 +1,4 @@
-import { PlatformSpecificBuildOptions } from "./metadata"
+import { PlatformSpecificBuildOptions } from "../metadata"
 
 /*
  ### `.build.mac`

src/options/publishOptions.ts

@@ -0,0 +1,13 @@
+export type PublishProvider = "github" | "bintray"
+
+export interface PublishConfiguration {
+  provider: PublishProvider
+}
+
+export interface GithubPublishConfiguration extends PublishConfiguration {
+  repo: string
+  version: string
+  owner: string
+
+  vPrefixedTagName?: boolean
+}

src/publish/gitHubPublisher.ts

@@ -9,6 +9,7 @@ import { githubRequest, HttpError, doApiRequest } from "./restApiRequest"
 import { Promise as BluebirdPromise } from "bluebird"
 import { PublishPolicy, PublishOptions, Publisher } from "./publisher"
 import { uploadFile } from "./uploader"
+import { GithubPublishConfiguration } from "../options/publishOptions"
 
 //noinspection JSUnusedLocalSymbols
 const __awaiter = require("../util/awaiter")
@@ -38,7 +39,7 @@ export class GitHubPublisher implements Publisher {
     return this._releasePromise
   }
 
-  constructor(private owner: string, private repo: string, private version: string, private options: PublishOptions, private isPublishOptionGuessed: boolean = false) {
+  constructor(private owner: string, private repo: string, private version: string, private options: PublishOptions, private isPublishOptionGuessed: boolean = false, config?: GithubPublishConfiguration | null) {
     if (isEmptyOrSpaces(options.githubToken)) {
       throw new Error("GitHub Personal Access Token is not specified")
     }
@@ -50,7 +51,7 @@ export class GitHubPublisher implements Publisher {
       throw new Error(`Version must not starts with "v": ${version}`)
     }
 
-    this.tag = `v${version}`
+    this.tag = config != null && config.vPrefixedTagName ? `v${version}` : version
     this._releasePromise = this.token === "__test__" ? BluebirdPromise.resolve(<any>null) : <BluebirdPromise<Release>>this.init()
   }
 
@@ -59,7 +60,7 @@ export class GitHubPublisher implements Publisher {
     // we don't use "Get a release by tag name" because "tag name" means existing git tag, but we draft release and don't create git tag
     const releases = await githubRequest<Array<Release>>(`/repos/${this.owner}/${this.repo}/releases`, this.token)
     for (let release of releases) {
-      if (release.tag_name === this.tag) {
+      if (release.tag_name === this.tag || release.tag_name === this.version) {
         if (release.draft) {
           return release
         }
@@ -77,9 +78,6 @@ export class GitHubPublisher implements Publisher {
         }
         return null
       }
-      else if (release.tag_name === this.version) {
-        throw new Error(`Tag name must starts with "v": ${release.tag_name}`)
-      }
     }
 
     if (createReleaseIfNotExists) {

src/targets/dmg.ts

@@ -2,7 +2,7 @@ import { deepAssign } from "../util/deepAssign"
 import * as path from "path"
 import { log } from "../util/log"
 import { Target, PlatformPackager } from "../platformPackager"
-import { MacOptions, DmgOptions } from "../macOptions"
+import { MacOptions, DmgOptions } from "../options/macOptions"
 import { Promise as BluebirdPromise } from "bluebird"
 import { debug, use } from "../util/util"
 

test/src/ArtifactPublisherTest.ts

@@ -98,30 +98,6 @@ testAndIgnoreApiRate("prerelease", async () => {
   }
 })
 
-testAndIgnoreApiRate("incorrect tag name", async () => {
-  const publisher = new GitHubPublisher("actperepo", "ecb2", "5.0", {
-    githubToken: token,
-    draft: false,
-    prerelease: true,
-    publish: "onTagOrDraft",
-  })
-
-  // await publisher.deleteOldReleases()
-  try {
-    await publisher.releasePromise
-    //noinspection ExceptionCaughtLocallyJS
-    throw new Error("No expected error")
-  }
-  catch (e) {
-    if (e.message !== 'Tag name must starts with "v": 5.0') {
-      throw e
-    }
-  }
-  finally {
-    await publisher.deleteRelease()
-  }
-})
-
 testAndIgnoreApiRate("GitHub upload org", async () => {
   //noinspection SpellCheckingInspection
   const publisher = new GitHubPublisher("builder-gh-test", "darpa", versionNumber(), {
@@ -146,12 +122,13 @@ test("create publisher", async () => {
   }
   const publisher = await createPublisher(packager, {
     githubToken: "__test__",
-  }, "github")
+  }, {provider: "github", vPrefixedTagName: false})
 
   assertThat(publisher).hasProperties({
     "owner": "develar",
     "repo": "test",
     "token": "__test__",
     "version": "2.0.0",
+    "tag": "2.0.0",
   })
 })