ci_toolkit 1.0.19 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 764a0232eaf62477c0c732c391473bba9f94f6e5300917e7f10d519cee6270c5
-  data.tar.gz: 48ec6e86b5a71d4b786c87fe20deb753441271a7746f05b3de9a4a3a1580aa6d
+  metadata.gz: 8a0fec524e468ec5a3ae2b94076c67927b9b7d113d182331c89dc7e852969436
+  data.tar.gz: 0c128f21987de61c07c5283a71709c35df383bb23dd4bf697669c3c14f672e04
 SHA512:
-  metadata.gz: 6ffe7c0fab3c34e5ba50b8da27e14ecff1b546549b8797a1eaa28ebd747937ef92c85819737e2aee36af36026b4cffb75e58c590f4c0ebbe0b55d98734023abd
-  data.tar.gz: f80b2a1b5cf8e5d4f611b31aace6811a8be1b956df8d7efaa3a3c5300230b2dd492c5c0c5e1b563fd354461f53e96532c8243ab1b1895a0298ccbe2287839bdf
+  metadata.gz: 7e39c811e40d5b330c39338b6fac6560c32809ab2ea2c2a420e9ff51b36651acf0338e3fc3dcbfb59ad90b9226478072859b7f1b11979904cee257c2ac548cd4
+  data.tar.gz: bb637004d4a9043eda7695285c959e445a69542bacb67f8eec41417bee706ac768191b0475133264a4289b689e5ad0644df7d8201d32efacafedc5fe0911f477

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.0.19)
+    ci_toolkit (1.1.1)
+      faraday
+      faraday_middleware
       jwt
       octokit
       openssl
@@ -34,6 +36,8 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
+      faraday (~> 1.0)
     json (2.5.1)
     jwt (2.2.3)
     multipart-post (2.1.1)

data/lib/ci_toolkit/bitrise_client.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "faraday_middleware"
+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
+
+    def initialize(token = ENV["BITRISE_TOKEN"], app_slug = ENV["BITRISE_APP_SLUG"], faraday = nil)
+      @token = token
+      @app_slug = app_slug
+      @connection = faraday
+      configure_connection
+    end
+
+    def configure_connection
+      return unless @connection.nil?
+
+      @connection = Faraday.new(
+        url: base_url,
+        headers: { "Content-Type" => "application/json", "Authorization" => @token }
+      )
+      @connection.use Faraday::Request::UrlEncoded
+      @connection.use Faraday::Request::Retry
+      @connection.use FaradayMiddleware::ParseJson
+      @connection.use FaradayMiddleware::EncodeJson
+      @connection.use FaradayMiddleware::FollowRedirects
+    end
+
+    def create_pull_request_build(pull_request, branch, commit, workflow)
+      @connection&.post("/apps/#{@app_slug}/builds", {
+                          hook_info: { type: "bitrise" },
+                          build_params: {
+                            branch: branch,
+                            branch_dest: "develop",
+                            pull_request_id: pull_request,
+                            workflow_id: workflow,
+                            commit_hash: commit
+                          }
+                        })
+    end
+
+    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", {
+                            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 || []
+    end
+
+    def base_url
+      "#{HOST}/#{API_VERSION}"
+    end
+  end
+end

data/lib/ci_toolkit/bitrise_env.rb

@@ -2,11 +2,13 @@
 
 module CiToolkit
   # Bitrise constants
+  # noinspection RubyTooManyInstanceVariablesInspection
   class BitriseEnv
     attr_reader :build_number, :build_url,
                 :pull_request_number,
                 :app_url,
-                :git_branch
+                :git_branch,
+                :app_slug
 
     def initialize(options = {
       build_number: ENV["BITRISE_BUILD_NUMBER"],
@@ -16,7 +18,10 @@ module CiToolkit
       repository_owner: ENV["BITRISEIO_GIT_REPOSITORY_OWNER"] || "crvshlab",
       repository_slug: ENV["BITRISEIO_GIT_REPOSITORY_SLUG"],
       app_url: ENV["BITRISE_APP_URL"],
-      git_branch: ENV["BITRISE_GIT_BRANCH"]
+      app_slug: ENV["BITRISE_APP_SLUG"],
+      git_branch: ENV["BITRISE_GIT_BRANCH"],
+      git_commit: ENV["BITRISE_GIT_COMMIT"],
+      api_token: ENV["BITRISE_TOKEN"]
     })
       @build_number = options[:build_number]
       @build_url = options[:build_url]
@@ -25,7 +30,9 @@ module CiToolkit
       @repository_owner = options[:repository_owner]
       @repository_slug = options[:repository_slug]
       @app_url = options[:app_url]
+      @app_slug = options[:app_slug]
       @git_branch = options[:git_branch]
+      @git_commit = options[:git_commit]
     end
 
     def build_from_pr?

data/lib/ci_toolkit/github_pr.rb

@@ -19,7 +19,7 @@ module CiToolkit
     end
 
     def title
-      client.pull_request(@repo_slug, @pr_number).[](:title)
+      client.pull_request(@repo_slug, @pr_number).[](:title) || ""
     end
 
     def number
@@ -39,21 +39,21 @@ module CiToolkit
       client.add_comment(@repo_slug, @pr_number, text[0...65_500]) # github comment character limit is 65536
     end
 
-    def delete_comment_containing_text(text)
-      comment = find_comment_containing_text(text)
-      delete_comment(comment[:id]) unless comment.nil?
+    def delete_comments_including_text(text)
+      comments = find_comments_including_text(text)
+      comments.each { |comment| delete_comment(comment[:id]) unless comment.nil? }
     end
 
     def delete_comment(comment_id)
       client.delete_comment(@repo_slug, comment_id)
     end
 
-    def find_comment_containing_text(text)
-      comment = nil
+    def find_comments_including_text(text)
+      comments = []
       client.issue_comments(@repo_slug, @pr_number).map do |item|
-        comment = item if item[:body]&.include? text
+        comments << item if item[:body]&.include? text
       end
-      comment
+      comments
     end
 
     def labels

data/lib/ci_toolkit/pr_messenger.rb

@@ -17,9 +17,14 @@ module CiToolkit
     end
 
     def send_ci_failed(reason)
+      delete_ci_failed
       send(@messenger_text.for_build_failure(reason))
     end
 
+    def delete_ci_failed
+      delete(@messenger_text.build_failure_title)
+    end
+
     def send_duplicate_files_report(finder)
       delete_duplicate_files_report
       report = @messenger_text.create_duplicate_files_report(finder)
@@ -72,7 +77,7 @@ module CiToolkit
     def delete(message)
       return unless @is_connected
 
-      @github_pr.delete_comment_containing_text(message)
+      @github_pr.delete_comments_including_text(message)
     end
   end
 end

data/lib/ci_toolkit/pr_messenger_text.rb

@@ -18,7 +18,7 @@ module CiToolkit
     end
 
     def for_build_failure(reason)
-      "#### Build failed ⛔️\n#{body(reason.to_s)}"
+      "#{build_failure_title}️\n#{body(reason.to_s)}"
     end
 
     def for_duplicated_files_report(report)
@@ -29,6 +29,10 @@ module CiToolkit
       "#{lint_report_title}\n#{body(report)}"
     end
 
+    def build_failure_title
+      "#### Build failed ⛔"
+    end
+
     def duplicated_files_title
       warning_with_message("There are duplicated files found")
     end

data/lib/ci_toolkit/version.rb

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

data/lib/ci_toolkit.rb

@@ -11,6 +11,7 @@ require "ci_toolkit/git"
 require "ci_toolkit/jira"
 require "ci_toolkit/pr_messenger"
 require "ci_toolkit/pr_messenger_text"
+require "ci_toolkit/bitrise_client"
 
 module CiToolkit
   class Error < StandardError; end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.1
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +199,7 @@ files:
 - bin/setup
 - duplicate_files_whitelist.txt
 - lib/ci_toolkit.rb
+- lib/ci_toolkit/bitrise_client.rb
 - lib/ci_toolkit/bitrise_env.rb
 - lib/ci_toolkit/build.rb
 - lib/ci_toolkit/duplicate_files_finder.rb