ci_toolkit 1.5.21 → 1.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e460504bc5d274e82021dacfcd7065ff46b65ca747956a0809d734e0985d8f
-  data.tar.gz: 938bfce127bc20430c4543bb6fefda1b5ae203563ae8234950724578f57c1015
+  metadata.gz: daf8706f40db455565b6b237d4dfcf563239516fdff0cdc79ccc109923f42f5c
+  data.tar.gz: 9c042f0747d5ca6cfbaae07d728275555d7491e211e2c81e13c962b4b352bfb8
 SHA512:
-  metadata.gz: 6964d3d2d9e1108b8513aabb6011501b5db2ee0eebe85e7ef4e253e952b81acfbd89148ba496524fffed5f1e790d2f6e3455a79e8e82cf75f0590d8021290dae
-  data.tar.gz: 5238ece91784b8962584eab1d057943b7f3d1dc23814bdfa3fc8622e040b76ad69dec80484b4917dd1f2fb61847d30325df284067b573a57f659927cc7d0b108
+  metadata.gz: 708160a8dbfbbb60740a98225b53c2935f01e5db6ae94b91c091b0f18ccda14c080626c1260299cde74005b2ea366b548c6dd08b14314d58ba964b98f0f2e9a2
+  data.tar.gz: 71721b7bab9067e2a3ba7bb4751481e2093a9b47abeb7a135c5371f84ff1ea95b414ae9437e3409ccd93a0db8fd5b02b1cde72863577bb92f3acea4baa393d99

data/.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
-ARG VARIANT=2-bullseye
+ARG VARIANT=3-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

data/.rubocop.yml

@@ -2,7 +2,7 @@ require: rubocop-rspec
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.2
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.5.21)
+    ci_toolkit (1.5.23)
       faraday
       faraday-multipart
       faraday_middleware
@@ -60,13 +60,13 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl (2.2.1)
       ipaddr
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -81,22 +81,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.21.0)
+    rubocop (1.51.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     rubocop-rspec (2.5.0)
       rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)

data/Rakefile

@@ -6,3 +6,7 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: :rubocop
+
+task :rubocop do
+  sh "rubocop -A"
+end

data/ci_toolkit.gemspec

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "ci_toolkit"
+  spec.version       = "1.5.23"
+  spec.authors       = ["Gero Keller"]
+  spec.email         = ["gero.f.keller@gmail.com"]
+
+  spec.summary       = "Set of CI utilities"
+  spec.description   = "Set of tools making it easier to interact between Github PRs and Bitrise CI"
+  spec.homepage      = "https://github.com/crvshlab/ci_toolkit"
+  spec.license       = "MIT"
+  spec.required_ruby_version = ">= 3.2"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/crvshlab/ci_toolkit"
+  spec.metadata["changelog_uri"] = "https://github.com/crvshlab/ci_toolkit/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # rubocop:disable Gemspec/DevelopmentDependencies
+  spec.add_dependency "faraday"
+  spec.add_dependency "faraday_middleware"
+  spec.add_dependency "faraday-multipart"
+  spec.add_dependency "gitlab"
+  spec.add_dependency "jwt"
+  spec.add_dependency "octokit"
+  spec.add_dependency "openssl"
+  spec.add_dependency "time"
+
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "rubocop", "~> 1.7"
+  spec.add_development_dependency "rubocop-rake"
+  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-json"
+  spec.metadata["rubygems_mfa_required"] = "true"
+  # rubocop:enable Gemspec/DevelopmentDependencies
+end

data/lib/ci_toolkit/bitrise_client.rb

@@ -11,10 +11,10 @@ module CiToolkit
 
     # noinspection Metrics/ParameterLists
     def initialize(options = {
-      build_number: ENV["BITRISE_BUILD_NUMBER"],
-      token: ENV["BITRISE_TOKEN"],
-      app_slug: ENV["BITRISE_APP_SLUG"],
-      build_slug: ENV["BITRISE_BUILD_SLUG"]
+      build_number: ENV.fetch("BITRISE_BUILD_NUMBER", nil),
+      token: ENV.fetch("BITRISE_TOKEN", nil),
+      app_slug: ENV.fetch("BITRISE_APP_SLUG", nil),
+      build_slug: ENV.fetch("BITRISE_BUILD_SLUG", nil)
     },
                    faraday = nil)
       @build_number = options[:build_number].to_i
@@ -42,7 +42,7 @@ module CiToolkit
       @connection.post("/#{API_VERSION}/apps/#{@app_slug}/builds", {
                          hook_info: { type: "bitrise" },
                          build_params: {
-                           branch: branch,
+                           branch:,
                            branch_dest: "develop",
                            pull_request_id: pull_request,
                            workflow_id: workflow,
@@ -63,7 +63,7 @@ module CiToolkit
 
     def find_pull_request_builds(pull_request, branch, commit = nil)
       response = @connection.get("/#{API_VERSION}/apps/#{@app_slug}/builds", {
-                                   branch: branch,
+                                   branch:,
                                    pull_request_id: pull_request.to_i,
                                    status: 0 # status: 0 == not finished
                                  })

data/lib/ci_toolkit/bitrise_env.rb

@@ -13,17 +13,17 @@ module CiToolkit
                 :repository_slug
 
     def initialize(options = {
-      build_number: ENV["BITRISE_BUILD_NUMBER"],
-      build_url: ENV["BITRISE_BUILD_URL"],
-      pull_request_number: ENV["BITRISE_PULL_REQUEST"],
+      build_number: ENV.fetch("BITRISE_BUILD_NUMBER", nil),
+      build_url: ENV.fetch("BITRISE_BUILD_URL", nil),
+      pull_request_number: ENV.fetch("BITRISE_PULL_REQUEST", nil),
       build_from_cron_job: !ENV["BITRISE_SCHEDULED_BUILD"].nil?,
       repository_owner: ENV["BITRISEIO_GIT_REPOSITORY_OWNER"] || "crvshlab",
-      repository_slug: ENV["BITRISEIO_GIT_REPOSITORY_SLUG"],
-      app_url: ENV["BITRISE_APP_URL"],
-      app_slug: ENV["BITRISE_APP_SLUG"],
-      git_branch: ENV["BITRISE_GIT_BRANCH"],
-      git_commit: ENV["BITRISE_GIT_COMMIT"],
-      api_token: ENV["BITRISE_TOKEN"]
+      repository_slug: ENV.fetch("BITRISEIO_GIT_REPOSITORY_SLUG", nil),
+      app_url: ENV.fetch("BITRISE_APP_URL", nil),
+      app_slug: ENV.fetch("BITRISE_APP_SLUG", nil),
+      git_branch: ENV.fetch("BITRISE_GIT_BRANCH", nil),
+      git_commit: ENV.fetch("BITRISE_GIT_COMMIT", nil),
+      api_token: ENV.fetch("BITRISE_TOKEN", nil)
     })
       @build_number = options[:build_number]
       @build_url = options[:build_url]

data/lib/ci_toolkit/dvcs_pr.rb

@@ -107,13 +107,13 @@ module CiToolkit
   # values for the two services are different
   # It uses the ENV["DVCS_SERVICE"] to decide which DVCS to use.
   class DvcsPrUtil
-    def self.status_state_error(service = ENV["DVCS_SERVICE"])
+    def self.status_state_error(service = ENV.fetch("DVCS_SERVICE", nil))
       status = "error"
       status = "failed" if service == "gitlab"
       status
     end
 
-    def self.status_state_pending(service = ENV["DVCS_SERVICE"])
+    def self.status_state_pending(service = ENV.fetch("DVCS_SERVICE", nil))
       status = "pending"
       status = "running" if service == "gitlab"
       status

data/lib/ci_toolkit/dvcs_pr_factory.rb

@@ -12,7 +12,7 @@ module CiToolkit
     private_constant :SERVICES
 
     def self.create(bitrise_env = CiToolkit::BitriseEnv.new)
-      service = ENV["DVCS_SERVICE"]
+      service = ENV.fetch("DVCS_SERVICE", nil)
       (SERVICES[service.to_s.downcase] || CiToolkit::DvcsPr).new bitrise_env
     end
   end

data/lib/ci_toolkit/github_bot.rb

@@ -10,7 +10,8 @@ module CiToolkit
     class Credentials
       attr_reader :app_id
 
-      def initialize(app_id = ENV["CRVSH_BOT_GITHUB_APP_ID"], private_key = ENV["CRVSH_BOT_GITHUB_APP_PRIVATE_KEY"])
+      def initialize(app_id = ENV.fetch("CRVSH_BOT_GITHUB_APP_ID", nil),
+                     private_key = ENV.fetch("CRVSH_BOT_GITHUB_APP_PRIVATE_KEY", nil))
         @app_id = app_id.to_i
         @private_key = private_key
       end

data/lib/ci_toolkit/github_pr.rb

@@ -71,7 +71,7 @@ module CiToolkit
         @repo_slug,
         @commit_sha,
         state,
-        { context: context, target_url: target_url, description: description }
+        { context:, target_url:, description: }
       )
     end
 

data/lib/ci_toolkit/gitlab_bot.rb

@@ -12,8 +12,8 @@ module CiToolkit
       attr_reader :endpoint, :project_access_token
 
       def initialize(
-        endpoint = ENV["GITLAB_API_URL"],
-        project_access_token = ENV["GITLAB_PROJECT_ACCESS_TOKEN"]
+        endpoint = ENV.fetch("GITLAB_API_URL", nil),
+        project_access_token = ENV.fetch("GITLAB_PROJECT_ACCESS_TOKEN", nil)
       )
         @endpoint = endpoint
         @project_access_token = project_access_token

data/lib/ci_toolkit/gitlab_pr.rb

@@ -73,7 +73,7 @@ module CiToolkit
         @repo_slug,
         @commit_sha,
         state,
-        { name: context, target_url: target_url, description: description }
+        { name: context, target_url:, description: }
       )
     end
 

data/lib/ci_toolkit/gitlab_release.rb

@@ -23,10 +23,10 @@ module CiToolkit
       file_name:
     )
       release_details = {
-        name: name,
-        tag_name: tag_name,
+        name:,
+        tag_name:,
         ref: last_git_commit,
-        description: description,
+        description:,
         assets: { links: [get_assets_details(project_id, tag_name, file_name)] }
       }
 

data/lib/ci_toolkit/jira.rb

@@ -8,7 +8,7 @@ module CiToolkit
     def initialize(
       github_pr = CiToolkit::DvcsPrFactory.create(CiToolkit::BitriseEnv.new),
       git = CiToolkit::Git.new,
-      ticket_regex_keys = ENV["SUPPORTED_JIRA_PROJECT_KEYS_REGEX"]
+      ticket_regex_keys = ENV.fetch("SUPPORTED_JIRA_PROJECT_KEYS_REGEX", nil)
     )
       @ticket_regex_keys = ticket_regex_keys
       @ticket = parse_ticket(github_pr.nil? ? "" : github_pr.title) || parse_ticket(git.nil? ? "" : git.branch)

data/lib/ci_toolkit/seetest_bot.rb

@@ -13,8 +13,8 @@ module CiToolkit
       attr_reader :base_url, :access_token
 
       def initialize(
-        base_url = ENV["SEETEST_BASE_URL"],
-        access_token = ENV["SEETEST_ACCESS_TOKEN"]
+        base_url = ENV.fetch("SEETEST_BASE_URL", nil),
+        access_token = ENV.fetch("SEETEST_ACCESS_TOKEN", nil)
       )
         @base_url = base_url
         @access_token = access_token
@@ -27,7 +27,7 @@ module CiToolkit
         f.request :authorization, "Bearer", credentials.access_token
         f.request :multipart
         f.request :url_encoded
-        f.response :json, parser_options: { object_class: OpenStruct }
+        f.response :json
         f.adapter :net_http # A MUST for file upload to work with Faraday::Multipart::FilePart
       end
     )

data/lib/ci_toolkit/seetest_client.rb

@@ -35,20 +35,17 @@ module CiToolkit
       ).body
 
       # Application already exists. Replace it.
-      if response.status == SUCCESS && response.data.created == "false"
+      if response[:status] == SUCCESS && response[:data][:created] == "false"
         response = replace_existing_application(
-          response.data.id,
+          response[:data][:id],
           project_name,
           unique_name,
           full_path_to_file,
           content_type
         )
       # Application with unique name already exist. Replace it.
-      elsif response.status == ERROR && !response.data.nil? && !response.data.uniqueName.nil?
-        application_info_response = faraday_get_application_info(unique_name)
-        application_id = application_info_response[0].id
-        response = replace_existing_application(
-          application_id,
+      elsif response[:status] == ERROR && !response[:data].nil? && !response[:data][:uniqueName].nil?
+        response = replace_existing_application_by_unique_name(
           project_name,
           unique_name,
           full_path_to_file,
@@ -56,12 +53,12 @@ module CiToolkit
         )
       end
 
-      unless response.status == SUCCESS
+      unless response[:status] == SUCCESS
         raise StandardError,
-              "Upload response from Seetest returned an error. Response body is: '#{response.marshal_dump}'"
+              "Upload response from Seetest returned an error. Response body is: '#{response}'"
       end
 
-      response.status
+      response[:status]
     end
     # rubocop:enable Metrics/AbcSize Metrics/MethodLength
     # rubocop:enable Metrics/MethodLength
@@ -77,12 +74,23 @@ module CiToolkit
     )
       response = faraday_delete_application(application_id)
 
-      if response.status == SUCCESS && response.code == OKAY
+      if response[:status] == SUCCESS && response[:code] == OKAY
         response = faraday_upload_file_with_error_handling(project_name, unique_name, full_path_to_file, content_type)
       end
       response
     end
 
+    def replace_existing_application_by_unique_name(project_name, unique_name, full_path_to_file, content_type)
+      application_info_response = faraday_get_application_info(unique_name)
+      application_info_response.each do |app_response|
+        next unless app_response[:uniqueName] == unique_name
+
+        response = replace_existing_application(app_response[:id], project_name, unique_name, full_path_to_file,
+                                                content_type)
+        return response if response[:status] == SUCCESS
+      end
+    end
+
     def faraday_upload_file_with_error_handling(
       project_name,
       unique_name,
@@ -90,9 +98,9 @@ module CiToolkit
       content_type
     )
       response = faraday_upload(project_name, unique_name, full_path_to_file, content_type).body
-      unless response.status == SUCCESS && response.data.created == "true"
+      unless response[:status] == SUCCESS && response[:data][:created] == "true"
         raise StandardError,
-              "Upload response from Seetest returned an error. Response body is: '#{response.marshal_dump}'"
+              "Upload response from Seetest returned an error. Response body is: '#{response}'"
       end
 
       response
@@ -106,7 +114,7 @@ module CiToolkit
     )
       file = Faraday::Multipart::FilePart.new(full_path_to_file, content_type)
       params = {
-        file: file,
+        file:,
         uniqueName: unique_name,
         project: project_name
       }
@@ -118,7 +126,7 @@ module CiToolkit
       response = @faraday_conn.get("/api/#{API_VERSION}/applications", params).body
       if response.empty?
         raise StandardError,
-              "Get application info for uniqueName: #{unique_name} from Seetest returned an error. "\
+              "Get application info for uniqueName: #{unique_name} from Seetest returned an error. " \
               "Response body is: '#{response}'"
       end
       response
@@ -126,10 +134,10 @@ module CiToolkit
 
     def faraday_delete_application(application_id)
       response = @faraday_conn.post("/api/#{API_VERSION}/applications/#{application_id}/delete").body
-      unless response.status == SUCCESS && response.code == OKAY
+      unless response[:status] == SUCCESS && response[:code] == OKAY
         raise StandardError,
-              "Delete application id: #{application_id} from Seetest returned an error. "\
-              "Response body is: '#{response.marshal_dump}'"
+              "Delete application id: #{application_id} from Seetest returned an error. " \
+              "Response body is: '#{response}'"
       end
       response
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.21
+  version: 1.5.23
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -229,6 +229,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ci_toolkit.gemspec
 - duplicate_files_whitelist.txt
 - lib/ci_toolkit.rb
 - lib/ci_toolkit/bitrise_client.rb
@@ -258,6 +259,7 @@ metadata:
   homepage_uri: https://github.com/crvshlab/ci_toolkit
   source_code_uri: https://github.com/crvshlab/ci_toolkit
   changelog_uri: https://github.com/crvshlab/ci_toolkit/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -266,14 +268,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Set of CI utilities