ci_toolkit 1.1.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0fec524e468ec5a3ae2b94076c67927b9b7d113d182331c89dc7e852969436
-  data.tar.gz: 0c128f21987de61c07c5283a71709c35df383bb23dd4bf697669c3c14f672e04
+  metadata.gz: fcf70d74f81c44a53d1e29376572cc61ee57a7ccc4de59f6760b40e51cbf3269
+  data.tar.gz: '06944accff7798d71a65eb9197ec35312e25ec11eb0aeea8ab406bad5ce6f4d9'
 SHA512:
-  metadata.gz: 7e39c811e40d5b330c39338b6fac6560c32809ab2ea2c2a420e9ff51b36651acf0338e3fc3dcbfb59ad90b9226478072859b7f1b11979904cee257c2ac548cd4
-  data.tar.gz: bb637004d4a9043eda7695285c959e445a69542bacb67f8eec41417bee706ac768191b0475133264a4289b689e5ad0644df7d8201d32efacafedc5fe0911f477
+  metadata.gz: 34995c2d9bd64bebe00a24e20f710bdf32f0793bdefc80fadc064672109af0e29681e07af17adc9f5b0d60949e7439b3837f5cf998ee6f264758731c0c89b512
+  data.tar.gz: d9eb2251f6b581b5814b1635c44005294cf78b81dccc26b636981e6e4be2ec8c7e3bf58efcd8ce241e78254e86de29db56d3503faf6781f0b37c6d4478fac801

data/Gemfile.lock

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

data/lib/ci_toolkit/bitrise_client.rb

@@ -6,7 +6,6 @@ require "faraday"
 module CiToolkit
   # client to use with the Bitrise API
   class BitriseClient
-    HOST = "https://api.bitrise.io"
     API_VERSION = "v0.1"
     attr_reader :connection
 
@@ -15,13 +14,14 @@ module CiToolkit
       @app_slug = app_slug
       @connection = faraday
       configure_connection
+      @connection&.use Faraday::Response::Logger, nil, { headers: true, bodies: true }
     end
 
     def configure_connection
       return unless @connection.nil?
 
       @connection = Faraday.new(
-        url: base_url,
+        url: "https://api.bitrise.io",
         headers: { "Content-Type" => "application/json", "Authorization" => @token }
       )
       @connection.use Faraday::Request::UrlEncoded
@@ -32,7 +32,7 @@ module CiToolkit
     end
 
     def create_pull_request_build(pull_request, branch, commit, workflow)
-      @connection&.post("/apps/#{@app_slug}/builds", {
+      @connection&.post("/#{API_VERSION}/apps/#{@app_slug}/builds", {
                           hook_info: { type: "bitrise" },
                           build_params: {
                             branch: branch,
@@ -46,24 +46,30 @@ module CiToolkit
 
     def abort_pull_request_builds(pull_request, branch, commit)
       find_pull_request_builds(pull_request, branch, commit).each do |build|
-        @connection&.post("/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
     end
 
     def find_pull_request_builds(pull_request, branch, commit)
-      builds = @connection&.get("/apps/#{@app_slug}/builds", {
-                                  branch: branch,
-                                  pull_request_id: pull_request.to_i,
-                                  status: 0 # status: 0 == not finished
-                                })
-      builds&.select! { |build| build[:commit_hash] == commit }
-      builds || []
+      response = @connection&.get("/#{API_VERSION}/apps/#{@app_slug}/builds", {
+                                    branch: branch,
+                                    pull_request_id: pull_request.to_i,
+                                    status: 0 # status: 0 == not finished
+                                  })
+      puts "Response:\n"
+      puts response.inspect
+
+      builds = response[:body][:data]
+      filter_builds_by_commit(builds, commit)
     end
 
-    def base_url
-      "#{HOST}/#{API_VERSION}"
+    def filter_builds_by_commit(builds, commit)
+      puts "Builds:\n"
+      puts builds.inspect
+      builds&.select! { |build| build[:commit_hash] == commit }
+      builds || []
     end
   end
 end

data/lib/ci_toolkit/bitrise_env.rb

@@ -8,7 +8,8 @@ module CiToolkit
                 :pull_request_number,
                 :app_url,
                 :git_branch,
-                :app_slug
+                :app_slug,
+                :git_commit
 
     def initialize(options = {
       build_number: ENV["BITRISE_BUILD_NUMBER"],

data/lib/ci_toolkit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday