ci_toolkit 1.2.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb2f396f954502fd4181fd9f96daedf067cf3800f5425b6b251515f4c4d81b0
-  data.tar.gz: 938bea990d63ced3c0f5b66d91ddec92a07ea0d8262536f81f6d149ce6da1bae
+  metadata.gz: e28c272f3fdb72564c18cd2dc76dd575126d6a513fb00033a7e41327fc3fbc59
+  data.tar.gz: 89f86604b9a8869886ba799f39d90961878353cbe7b1c54bc4d8d9bea81c4397
 SHA512:
-  metadata.gz: 64c8f72d6346a665bb43abf1e63ea1adc28fe183a3ccb1232120ad4e5ee1b1eddc015e87f8de2e6ed7655a417f53feda48f40ac9d2fca61b695fbf49f35acbcb
-  data.tar.gz: 7414b1b22c2da208fff9a266cdaa1cfb6657c9c6e29b1507c314d95544ab9b5453e4737638fb34bdde77f5af10e8741aa16fa37e6a2cc9d40fd3d9295fdad1c0
+  metadata.gz: 170db6c9cb9901615ee93a70deca455a96413fd68b9dad8eb728ae77efd442a8032ee10d06dad6300fd0aadc908e2527813f61bf47552a00ae7a7b6f143eb5ff
+  data.tar.gz: 8802f0f9d2dc7fd8ccfc2b449f4cf37df326295c1e68dd8b97cb10954491a59c5274e1890cd3ef2d47fa7aecb80b3475ff76c2dabc0dbe812beab23601c9b82c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.2.8)
+    ci_toolkit (1.3.9)
       faraday
       faraday_middleware
       jwt
@@ -39,7 +39,7 @@ GEM
     faraday_middleware (1.1.0)
       faraday (~> 1.0)
     json (2.5.1)
-    jwt (2.2.3)
+    jwt (2.3.0)
     multipart-post (2.1.1)
     octokit (4.21.0)
       faraday (>= 0.9)

data/README.md

@@ -17,10 +17,6 @@ Or install it yourself as:
 
     $ gem install ci_toolkit
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec/test/test-unit` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ci_toolkit/bitrise_client.rb

@@ -21,7 +21,6 @@ module CiToolkit
       @app_slug = options[:app_slug]
       @connection = faraday
       configure_connection
-      @connection&.use Faraday::Response::Logger, nil, { headers: true, bodies: true }
     end
 
     def configure_connection
@@ -65,16 +64,11 @@ 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"]
       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 && build["build_number"] != @build_number }
       builds || []
     end

data/lib/ci_toolkit/build_status.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module CiToolkit
+  # allows to have a combined build status for all builds that are triggered for a pull request
+  # it uses the description of the status check on Github to parse the number of builds remaining and total
+  class BuildStatus
+    def initialize(context = "Builds", github = CiToolkit::GithubPr.new, env = CiToolkit::BitriseEnv.new)
+      @context = context
+      @github = github
+      @env = env
+    end
+
+    def start(num_builds)
+      state = "pending"
+      target_url = @env.app_url
+      desc = "Finished building 0/#{num_builds}"
+      if num_builds.zero?
+        state = "success"
+        desc = "No builds assigned"
+        target_url = @env.build_url
+      end
+
+      @github.create_status(state, @context, target_url, desc)
+    end
+
+    def increment
+      counter = load_counter
+      return if counter.nil?
+
+      num_finished = counter[:num_finished] + 1
+      num_total = counter[:num_total]
+
+      state = "pending"
+      state = "success" if num_finished == num_total
+
+      @github.create_status(state, @context, @env.app_url, "Finished building #{num_finished}/#{num_total}")
+    end
+
+    private
+
+    def load_counter
+      status = @github.get_status(@context)
+      return if status.nil?
+
+      description = status[:description]
+      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
+  end
+end

data/lib/ci_toolkit/github_pr.rb

@@ -13,6 +13,7 @@ module CiToolkit
     )
       @pr_number = env.pull_request_number
       @repo_slug = env.repository_path
+      @commit_sha = env.git_commit
       @_client = client
       @build_types = build_types
       @access = CiToolkit::GithubAccess.new
@@ -61,15 +62,20 @@ module CiToolkit
     end
 
     def create_status(state, context, target_url, description)
-      ref = client.pull_request(@repo_slug, @pr_number).[](:head).[](:sha)
       client.create_status(
         @repo_slug,
-        ref,
+        @commit_sha,
         state,
         { context: context, target_url: target_url, description: description }
       )
     end
 
+    def get_status(context)
+      client.statuses(@repo_slug, @commit_sha).each do |status|
+        return status if status[:context] == context
+      end
+    end
+
     def build_types
       types = []
       @build_types.each do |type|

data/lib/ci_toolkit/version.rb

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

data/lib/ci_toolkit.rb

@@ -4,6 +4,7 @@ require_relative "ci_toolkit/version"
 
 require "ci_toolkit/bitrise_env"
 require "ci_toolkit/build"
+require "ci_toolkit/build_status"
 require "ci_toolkit/duplicate_files_finder"
 require "ci_toolkit/github_access"
 require "ci_toolkit/github_pr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -202,6 +202,7 @@ files:
 - lib/ci_toolkit/bitrise_client.rb
 - lib/ci_toolkit/bitrise_env.rb
 - lib/ci_toolkit/build.rb
+- lib/ci_toolkit/build_status.rb
 - lib/ci_toolkit/duplicate_files_finder.rb
 - lib/ci_toolkit/git.rb
 - lib/ci_toolkit/github_access.rb
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Set of CI utilities