ci_toolkit 1.2.4 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe8ccc57c8be14185039c9c5131af47aa42b84eec881738d1e8f36033350b9f
-  data.tar.gz: 5081c37c63b18871a5d9bf2810eb7ae56a5aff7b0b6358a4d878cb45f2de7348
+  metadata.gz: fcb2f396f954502fd4181fd9f96daedf067cf3800f5425b6b251515f4c4d81b0
+  data.tar.gz: 938bea990d63ced3c0f5b66d91ddec92a07ea0d8262536f81f6d149ce6da1bae
 SHA512:
-  metadata.gz: aad731920fc42c0275af28c247c3163b0a252780d667a87da4c908ad6d226e41db95db9679bb91c1fd98fab0029309023cc9b7273b41064b80067bc14c030089
-  data.tar.gz: 85cec32699fcdb392277efbf7f0385e6ce20440340de0603eb848dba8fc2188246674f2d441734ad478c01e13bb05bad680a804194fd8980ac040e6e748f4baa
+  metadata.gz: 64c8f72d6346a665bb43abf1e63ea1adc28fe183a3ccb1232120ad4e5ee1b1eddc015e87f8de2e6ed7655a417f53feda48f40ac9d2fca61b695fbf49f35acbcb
+  data.tar.gz: 7414b1b22c2da208fff9a266cdaa1cfb6657c9c6e29b1507c314d95544ab9b5453e4737638fb34bdde77f5af10e8741aa16fa37e6a2cc9d40fd3d9295fdad1c0

data/Gemfile.lock

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

data/lib/ci_toolkit/bitrise_client.rb

@@ -9,9 +9,16 @@ 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 }
@@ -26,8 +33,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 +53,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
@@ -61,14 +68,14 @@ module CiToolkit
       puts "Response:\n"
       puts response.inspect
 
-      builds = response[: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.4"
+  VERSION = "1.2.8"
 end

metadata

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