ci_toolkit 1.2.5 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86221df14b2f00663b451d8a2d4855ad67cef074c3c48770966af2d8543fb134
-  data.tar.gz: '0178ea21d74a4b047f2ac9e7d57176346fb777aa93b1c03fd18cd5bb6272584e'
+  metadata.gz: b4bfe956c92fad69ac062c30ab70aa5577d63cbdcab7f8e4ffb1d36bae851f2d
+  data.tar.gz: '087c4b667f9c79307132d6c26c34d4e08a3960b4ff9c2c3ab7c5b62477e5fee0'
 SHA512:
-  metadata.gz: 6c3705ef9c44edc5a86d49be8dcef6f8b3c934e50e67fdffd9c3d8a8cdb8d502790e4968c2e036ea18c539848d2b4a59b9d39935d562edebc242d15d946da700
-  data.tar.gz: 17c59b5188031c736c5885918874df044993f11499c9db65c267e85bc04c7928c009da12bb80b880829843102d281e2048dfa56ab731cd8a923a8893539eb81f
+  metadata.gz: 163a4bd2abb17fd25a69de5dbc78e32ce032817d5e2d6cca898a7a7c24f60048c49598f5558e06bff0bcfd455cd55813e6cd733a0735584d1f11a9a9cbe3e03e
+  data.tar.gz: 82decc260cc2080262bb2c67ab372fca9a2b79e8be03267039c743beeda9e4070bc5f88a8a37b24be0e09601ac4f41da92d16ccde53f00e97c2d668c8ed74463

data/Gemfile.lock

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

data/lib/ci_toolkit/bitrise_client.rb

@@ -9,12 +9,18 @@ module CiToolkit
     API_VERSION = "v0.1"
     attr_reader :connection
 
-    def initialize(token = ENV["BITRISE_TOKEN"], app_slug = ENV["BITRISE_APP_SLUG"], faraday = nil)
-      @token = token
-      @app_slug = app_slug
+    # noinspection Metrics/ParameterLists
+    def initialize(options = {
+      build_number: ENV["BITRISE_BUILD_NUMBER"],
+      token: ENV["BITRISE_TOKEN"],
+      app_slug: ENV["BITRISE_APP_SLUG"]
+    },
+                   faraday = nil)
+      @build_number = options[:build_number].to_i
+      @token = options[:token]
+      @app_slug = options[:app_slug]
       @connection = faraday
       configure_connection
-      @connection&.use Faraday::Response::Logger, nil, { headers: true, bodies: true }
     end
 
     def configure_connection
@@ -26,8 +32,8 @@ module CiToolkit
       )
       @connection.use Faraday::Request::UrlEncoded
       @connection.use Faraday::Request::Retry
-      @connection.use FaradayMiddleware::ParseJson
       @connection.use FaradayMiddleware::EncodeJson
+      @connection.use FaradayMiddleware::ParseJson
       @connection.use FaradayMiddleware::FollowRedirects
     end
 
@@ -46,7 +52,7 @@ module CiToolkit
 
     def abort_pull_request_builds(pull_request, branch, commit)
       find_pull_request_builds(pull_request, branch, commit).each do |build|
-        @connection&.post("/#{API_VERSION}/apps/#{@app_slug}/builds/#{build[:slug]}/abort", {
+        @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
@@ -58,17 +64,12 @@ module CiToolkit
                                     pull_request_id: pull_request.to_i,
                                     status: 0 # status: 0 == not finished
                                   })
-      puts "Response:\n"
-      puts response.inspect
-
-      builds = response.body[:data]
+      builds = response.body["data"]
       filter_builds_by_commit(builds, commit)
     end
 
     def filter_builds_by_commit(builds, commit)
-      puts "Builds:\n"
-      puts builds.inspect
-      builds&.select! { |build| build[:commit_hash] == commit }
+      builds&.select! { |build| build["commit_hash"] == commit && build["build_number"] != @build_number }
       builds || []
     end
   end

data/lib/ci_toolkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CiToolkit
-  VERSION = "1.2.5"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.9
 platform: ruby
 authors:
 - Gero Keller