ci_toolkit 1.4.8 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910885b713c894576eec434ed74390a2515fd052757cbe3f88dd6a2f57b7566d
-  data.tar.gz: e12d83ad28862c5c3db7598eebfd5d2d15e6154aa240a14517b1b4661c56d604
+  metadata.gz: cf57d831af4f6cf35645bf6badfa46e4e5c4a248b71073e913c7b00d916d9e29
+  data.tar.gz: '0178662a1ea410b9dd1b653a5da8c7afd9230825e51b3f8da3f57e857d925907'
 SHA512:
-  metadata.gz: 1c45cca7b322bc882da4610b9ce9d7aea7a68a9f5ed1d1a1c14576e51bc4e4a75313895d10f2298f03202e00bbd4e2baecb3b65fb73c0441efbea7abc5a2a740
-  data.tar.gz: 8c9efef28981894104b2bed2608a55a7b8aa446844cff5c6158fb58568c5f4ba9a21f1603d6365a25314d4ab6769d447bbaffe6e08a95101100eb630f606cb70
+  metadata.gz: 37b8173921e346aaeb9cf254ed372d239abd5a23b53f0357139ad85876c3f5d9f832d60cde27046a343302e3d1eca766c8a819580af8c2c5cc1235c9d8a68716
+  data.tar.gz: 2abe3d539e171cafdea9fce063300ef331e7be7c96fa50c56b437d51588019a8c30ece24c5bb5b4236176814e81481317c9adbf291f9cac18d115c522c5557fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.4.8)
+    ci_toolkit (1.4.12)
       faraday
       faraday_middleware
       jwt

data/lib/ci_toolkit/bitrise_client.rb

@@ -13,12 +13,14 @@ module CiToolkit
     def initialize(options = {
       build_number: ENV["BITRISE_BUILD_NUMBER"],
       token: ENV["BITRISE_TOKEN"],
-      app_slug: ENV["BITRISE_APP_SLUG"]
+      app_slug: ENV["BITRISE_APP_SLUG"],
+      build_slug: ENV["BITRISE_BUILD_SLUG"]
     },
                    faraday = nil)
       @build_number = options[:build_number].to_i
       @token = options[:token]
       @app_slug = options[:app_slug]
+      @build_slug = options[:build_slug]
       @connection = faraday || create_connection
     end
 
@@ -49,22 +51,25 @@ module CiToolkit
                        })
     end
 
-    def abort_pull_request_builds(pull_request, branch, commit)
+    def abort_pull_request_builds(pull_request, branch, commit = nil)
       find_pull_request_builds(pull_request, branch, commit).each do |build|
+        next if build["slug"] == @build_slug
+
         @connection.post("/#{API_VERSION}/apps/#{@app_slug}/builds/#{build["slug"]}/abort", {
                            abort_reason: "Aborting due to other build failed for pull request #{pull_request}"
                          })
       end
     end
 
-    def find_pull_request_builds(pull_request, branch, commit)
+    def find_pull_request_builds(pull_request, branch, commit = nil)
       response = @connection.get("/#{API_VERSION}/apps/#{@app_slug}/builds", {
                                    branch: branch,
                                    pull_request_id: pull_request.to_i,
                                    status: 0 # status: 0 == not finished
                                  })
-      builds = response.body["data"]
-      filter_builds_by_commit(builds, commit)
+      builds = response.body["data"] || []
+      builds = filter_builds_by_commit(builds, commit) unless commit.nil?
+      builds
     end
 
     def filter_builds_by_commit(builds, commit)

data/lib/ci_toolkit/build.rb

@@ -50,9 +50,9 @@ release branch with semantic versioning, eg. release/x.y.z"
     end
 
     def tag_name(build_number = nil)
-      return "#{version}-build.#{build_number}" if build_number
+      return version.to_s if version.include?("-build.") || build_number.nil?
 
-      version.to_s
+      "#{version}-build.#{build_number}"
     end
   end
 end

data/lib/ci_toolkit/git.rb

@@ -9,7 +9,7 @@ module CiToolkit
     end
 
     def latest_tag
-      describe = "git describe --abbrev=0"
+      describe = "git describe --tags --abbrev=0"
       return `#{describe}`.gsub("\n", "") unless @dir
 
       `cd #{@dir} && #{describe}`.gsub("\n", "")

data/lib/ci_toolkit/pr_messenger_text.rb

@@ -12,9 +12,9 @@ module CiToolkit
     end
 
     def for_new_build(name, version_name, tag)
-      "#### New `#{name}` build deployed 🚀\nVersion **#{version_name}** with
-        build number **#{@build.number}** on tag **#{tag}** deployed
-        from [this](#{@build.url}) build"
+      "#### New `#{name}` build deployed 🚀\nVersion **#{version_name}** with\
+ build number **#{@build.number}** on tag **#{tag}** deployed\
+ from [this](#{@build.url}) build"
     end
 
     def for_build_failure(reason)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.12
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday