fix(bintray): do not require explicit publish=always (regression) #529

develar · develar · commit 6f20e8da13e0 · 2016-10-17T09:17:44.000+02:00
diff --git a/.idea/runConfigurations/ArtifactPublisherTest.xml b/.idea/runConfigurations/ArtifactPublisherTest.xml
diff --git a/src/builder.ts b/src/builder.ts
@@ -277,7 +277,9 @@ function publishManager(packager: Packager, publishTasks: Array<BluebirdPromise<
   })
 }
 
-export async function createPublisher(packager: Packager, publishConfig: PublishConfiguration | GithubOptions | BintrayOptions, options?: PublishOptions, isPublishOptionGuessed: boolean = false): Promise<Publisher | null> {
+// visible only for tests
+// call only from this file or from tests
+export async function createPublisher(packager: Packager, publishConfig: PublishConfiguration | GithubOptions | BintrayOptions, options: PublishOptions, isPublishOptionGuessed: boolean = false): Promise<Publisher | null> {
   const config = await getResolvedPublishConfig(packager, publishConfig, isPublishOptionGuessed)
   if (config == null) {
     return null
@@ -287,7 +289,7 @@ export async function createPublisher(packager: Packager, publishConfig: Publish
   if (publishConfig.provider === "github") {
     const githubInfo: GithubOptions = config
     log(`Creating Github Publisher — owner: ${githubInfo.owner}, project: ${githubInfo.repo}, version: ${version}`)
-    return new GitHubPublisher(githubInfo, version, options, isPublishOptionGuessed, githubInfo)
+    return new GitHubPublisher(githubInfo, version, options, isPublishOptionGuessed)
   }
   if (publishConfig.provider === "bintray") {
     const bintrayInfo: BintrayOptions = config
diff --git a/src/publish/BintrayPublisher.ts b/src/publish/BintrayPublisher.ts
@@ -17,7 +17,7 @@ export class BintrayPublisher implements Publisher {
 
   private readonly client: BintrayClient
 
-  constructor(private info: BintrayOptions, private version: string, private options?: PublishOptions) {
+  constructor(private readonly info: BintrayOptions, private readonly version: string, private readonly options: PublishOptions = {}) {
     let token = info.token
     if (isEmptyOrSpaces(token)) {
       token = process.env.BT_TOKEN
@@ -36,7 +36,7 @@ export class BintrayPublisher implements Publisher {
     }
     catch (e) {
       if (e instanceof HttpError && e.response.statusCode === 404) {
-        if (this.options != null && this.options.publish !== "onTagOrDraft") {
+        if (this.options.publish !== "onTagOrDraft") {
           log(`Version ${this.version} doesn't exist, creating one`)
           return this.client.createVersion(this.version)
         }
diff --git a/src/publish/gitHubPublisher.ts b/src/publish/gitHubPublisher.ts
@@ -35,13 +35,11 @@ export class GitHubPublisher implements Publisher {
   private readonly token: string
   private readonly policy: PublishPolicy
 
-  private readonly options: PublishOptions
-
   get releasePromise(): Promise<Release | null> {
     return this._releasePromise
   }
 
-  constructor(private info: GithubOptions, private version: string, options?: PublishOptions, private isPublishOptionGuessed: boolean = false, config?: GithubOptions | null) {
+  constructor(private readonly info: GithubOptions, private readonly version: string, private readonly options: PublishOptions = {}, private readonly isPublishOptionGuessed: boolean = false) {
     let token = info.token
     if (isEmptyOrSpaces(token)) {
       token = process.env.GH_TOKEN
@@ -58,7 +56,7 @@ export class GitHubPublisher implements Publisher {
       throw new Error(`Version must not starts with "v": ${version}`)
     }
 
-    this.tag = config != null && config.vPrefixedTagName === false ? version : `v${version}`
+    this.tag = info.vPrefixedTagName === false ? version : `v${version}`
     this._releasePromise = this.token === "__test__" ? BluebirdPromise.resolve(<any>null) : <BluebirdPromise<Release>>this.init()
   }
 
diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts
@@ -115,12 +115,17 @@ test("create publisher", async () => {
       repository: "develar/test"
     },
   }
-  const publisher = await createPublisher(packager, {provider: "github", vPrefixedTagName: false, token: token})
+  const publisher = await createPublisher(packager, {provider: "github", vPrefixedTagName: false, token: "__test__"}, {})
 
   assertThat(publisher).hasProperties({
-    "owner": "develar",
-    "repo": "test",
-    "token": "__test__",
+    info: {
+      provider: "github",
+      vPrefixedTagName: false,
+      owner: "develar",
+      repo: "test",
+      token: "__test__",
+    },
+    token: "__test__",
     "version": "2.0.0",
     "tag": "2.0.0",
   })
diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
@@ -168,7 +168,7 @@ function runTests(): BluebirdPromise<any> {
     args.push("test/out/*.js", "!test/out/macPackagerTest.js", "!test/out/linuxPackagerTest.js", "!test/out/CodeSignTest.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")
   }
   else if (!util.isCi()) {
-    args.push("test/out/*.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")
+    args.push("test/out/*.js", "!test/out/httpRequestTest.js")
   }
 
   return utilSpawn(path.join(rootDir, "node_modules", ".bin", "ava"), args, {

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,11 @@ export class GitHubPublisher implements Publisher {`
`35`	`35`	`private readonly token: string`
`36`	`36`	`private readonly policy: PublishPolicy`
`37`	`37`
`38`		`- private readonly options: PublishOptions`
`39`		`-`
`40`	`38`	`get releasePromise(): Promise<Release \| null> {`
`41`	`39`	`return this._releasePromise`
`42`	`40`	`}`
`43`	`41`
`44`		`- constructor(private info: GithubOptions, private version: string, options?: PublishOptions, private isPublishOptionGuessed: boolean = false, config?: GithubOptions \| null) {`
	`42`	`+ constructor(private readonly info: GithubOptions, private readonly version: string, private readonly options: PublishOptions = {}, private readonly isPublishOptionGuessed: boolean = false) {`
`45`	`43`	`let token = info.token`
`46`	`44`	`if (isEmptyOrSpaces(token)) {`
`47`	`45`	`token = process.env.GH_TOKEN`
`@@ -58,7 +56,7 @@ export class GitHubPublisher implements Publisher {`
`58`	`56`	throw new Error(`Version must not starts with "v": ${version}`)
`59`	`57`	`}`
`60`	`58`
`61`		- this.tag = config != null && config.vPrefixedTagName === false ? version : `v${version}`
	`59`	+ this.tag = info.vPrefixedTagName === false ? version : `v${version}`
`62`	`60`	`this._releasePromise = this.token === "__test__" ? BluebirdPromise.resolve(<any>null) : <BluebirdPromise<Release>>this.init()`
`63`	`61`	`}`
`64`	`62`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ function runTests(): BluebirdPromise<any> {`
`168`	`168`	`args.push("test/out/*.js", "!test/out/macPackagerTest.js", "!test/out/linuxPackagerTest.js", "!test/out/CodeSignTest.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")`
`169`	`169`	`}`
`170`	`170`	`else if (!util.isCi()) {`
`171`		`- args.push("test/out/*.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")`
	`171`	`+ args.push("test/out/*.js", "!test/out/httpRequestTest.js")`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`return utilSpawn(path.join(rootDir, "node_modules", ".bin", "ava"), args, {`