ci_toolkit 1.4.7 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6199cf52e7358b43cedcaff8b1e7791d4b63c8f16053f0573966a662c7f9de45
-  data.tar.gz: 109591a5daa0fc7c04c7cac5a18fe7a38afc1377f458b4b1f110c8b4a884f1b0
+  metadata.gz: ee76db372a182e446e5eded76144c48168dd732698ceadf6aed9786a4170f7df
+  data.tar.gz: eabd9e5d140b76dee0d8e09e53932bec6ef78d453521b5202028b9192b4f5f00
 SHA512:
-  metadata.gz: 0fae6e88e169e051ce3ebf6a54a1a72935eb0775b51ef9fe5e3e9319febb9bbe42e60e4bea6ba88c4c676cf3235bca16a036ab2496985c60a6ce97ebbf64f769
-  data.tar.gz: a2f2cf45f97253c56070d484adf1ad3f27cabf7bf44f10c4923b26a27373fd96f0c8e0b5d7e33d2762c954b18198a3349d09e84b8d3f0455247db59a52c17614
+  metadata.gz: 99d30cd39b55b0ab6f08a726d233a9d5e9edbedf35f2807191bac3b77c131b2214f3f393acd714ec5c38f578e38f7e05defefb4ec41cc4dd783ada9bd4bae6f4
+  data.tar.gz: 719c0db775f877d3fb72a728a63b7bd9fe7eb9beb227b9816198aed4a0e9a75832c1038bbe07aa5cab9aba9d3c7eb8845023ea2b984aec41c25ed07858824547

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.4.7)
+    ci_toolkit (1.4.11)
       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_status.rb

@@ -36,6 +36,10 @@ module CiToolkit
       @github.create_status(state, @context, @env.app_url, "Finished building #{num_finished}/#{num_total}")
     end
 
+    def error
+      @github.create_status("error", @context, @env.app_url, "Building failed")
+    end
+
     private
 
     def load_counter
@@ -46,9 +50,5 @@ module CiToolkit
       build_counter = description[%r{(\d/\d)}] || "0/0"
       { num_finished: build_counter.split("/")[0].to_i, num_total: build_counter.split("/")[1].to_i }
     end
-
-    def error
-      @github.create_status("error", @context, @env.app_url, "Building failed")
-    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.7
+  version: 1.4.11
 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