ci_toolkit 1.4.9 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7f5bba49c6c9e1161a6c7d5169173557d6a9f26e42936f92fcde54033563d1
-  data.tar.gz: a56c807056f491f5b08502ad54c5cc70139733be8119ad3bedd8f50fe795a3b7
+  metadata.gz: 8ca9241717a55023bbc883936c7ea991130d731343cda78c48e392c37d00384d
+  data.tar.gz: 72a99fe032af182bdeec1b7c6b8ba335bb2c90b55f5236598f1ad9ccd833fd69
 SHA512:
-  metadata.gz: b3f63b8e2454b4f9af57a82f99ae6c7c2bb62e39ae87d60246f5d9ad1d1163671af6d975437cacdeef62a788128c910890e77eb27725388f926a608a416c0da4
-  data.tar.gz: 84b8beecd8f3bf472aace619789500d10b0116b1b4b6b11b05039a0ee410ba9cc44cd34f9d9eab8863fc80117bd5e3bf4409a61d77d879d6a52e2d61b02ac8a1
+  metadata.gz: b560f3ed3c5bc90e4f85e12fc0bb795c961fd3adba2090821756ca9cbe6da3e9f936cd040fdad2809ab01b31db5d65b775083cd39c0a83bf01dfb974b8bbbfe8
+  data.tar.gz: 6ed5a5cb7fbc4c449469dadcfd937c4092582a9e2251771416299a78683f6dd84a584cb2e442dddb168d3b51b059ddec4bf39c1606673f07c6acfbde7ce7a86b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.4.9)
+    ci_toolkit (1.4.13)
       faraday
       faraday_middleware
       jwt
@@ -15,7 +15,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    date (3.2.0)
+    date (3.2.1)
     diff-lcs (1.4.4)
     docile (1.4.0)
     faraday (1.8.0)

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
 
@@ -51,6 +53,8 @@ module CiToolkit
 
     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}"
                          })

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.9
+  version: 1.4.13
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday