feat(publisher): Check that tag name starts with "v" #340

develar · develar · commit bb716219f17e · 2016-06-26T20:15:56.000+02:00
diff --git a/src/gitHubPublisher.ts b/src/gitHubPublisher.ts
@@ -40,15 +40,19 @@ export class GitHubPublisher implements Publisher {
     return this._releasePromise
   }
 
-  constructor(private owner: string, private repo: string, 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) {
     if (isEmptyOrSpaces(options.githubToken)) {
       throw new Error("GitHub Personal Access Token is not specified")
     }
 
     this.token = options.githubToken!
-    this.policy = options.publish!
+    this.policy = options.publish || "always"
 
-    this.tag = "v" + version
+    if (version.startsWith("v")) {
+      throw new Error(`Version must not starts with "v": ${version}`)
+    }
+
+    this.tag = `v${version}`
     this._releasePromise = <BluebirdPromise<Release>>this.init()
   }
 
@@ -75,6 +79,9 @@ 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) {
diff --git a/src/targets/nsis.ts b/src/targets/nsis.ts
@@ -84,7 +84,7 @@ export default class NsisTarget extends Target {
       defines.MUI_HEADERIMAGE_BITMAP = installerHeader
     }
 
-    const headerIcon = oneClick ? await this.getResource(this.options.installerHeader, "headerIcon.ico") : null
+    const headerIcon = oneClick ? await this.getResource(this.options.headerIcon, "headerIcon.ico") : null
     if (headerIcon != null) {
       defines.HEADER_ICO = headerIcon
     }
diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts
@@ -79,6 +79,28 @@ testAndIgnoreApiRate("prerelease", async () => {
   }
 })
 
+testAndIgnoreApiRate("incorrect tag name", async () => {
+  const publisher = new GitHubPublisher("actperepo", "ecb2", "5.0", {
+    githubToken: token,
+    draft: false,
+    prerelease: true,
+    publish: "onTagOrDraft",
+  })
+  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(), {

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,19 @@ export class GitHubPublisher implements Publisher {`
`40`	`40`	`return this._releasePromise`
`41`	`41`	`}`
`42`	`42`
`43`		`- constructor(private owner: string, private repo: string, version: string, private options: PublishOptions, private isPublishOptionGuessed: boolean = false) {`
	`43`	`+ constructor(private owner: string, private repo: string, private version: string, private options: PublishOptions, private isPublishOptionGuessed: boolean = false) {`
`44`	`44`	`if (isEmptyOrSpaces(options.githubToken)) {`
`45`	`45`	`throw new Error("GitHub Personal Access Token is not specified")`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`this.token = options.githubToken!`
`49`		`- this.policy = options.publish!`
	`49`	`+ this.policy = options.publish \|\| "always"`
`50`	`50`
`51`		`- this.tag = "v" + version`
	`51`	`+ if (version.startsWith("v")) {`
	`52`	+ throw new Error(`Version must not starts with "v": ${version}`)
	`53`	`+ }`
	`54`	`+`
	`55`	+ this.tag = `v${version}`
`52`	`56`	`this._releasePromise = <BluebirdPromise<Release>>this.init()`
`53`	`57`	`}`
`54`	`58`
`@@ -75,6 +79,9 @@ export class GitHubPublisher implements Publisher {`
`75`	`79`	`}`
`76`	`80`	`return null`
`77`	`81`	`}`
	`82`	`+ else if (release.tag_name === this.version) {`
	`83`	+ throw new Error(`Tag name must starts with "v": ${release.tag_name}`)
	`84`	`+ }`
`78`	`85`	`}`
`79`	`86`
`80`	`87`	`if (createReleaseIfNotExists) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ export default class NsisTarget extends Target {`
`84`	`84`	`defines.MUI_HEADERIMAGE_BITMAP = installerHeader`
`85`	`85`	`}`
`86`	`86`
`87`		`- const headerIcon = oneClick ? await this.getResource(this.options.installerHeader, "headerIcon.ico") : null`
	`87`	`+ const headerIcon = oneClick ? await this.getResource(this.options.headerIcon, "headerIcon.ico") : null`
`88`	`88`	`if (headerIcon != null) {`
`89`	`89`	`defines.HEADER_ICO = headerIcon`
`90`	`90`	`}`