ci_toolkit 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cd888726c86a779288d7e4a7d04bea4a1d1a52c479dcb862812f40ffa4f509
-  data.tar.gz: 75833b08101042e0d7d9b3dae759d5ff505525f95bc547295eb2eaa734381ffb
+  metadata.gz: fcff525b13f81bed444cb020bd0b41da763c049a3fc701ab69667b95667c45f1
+  data.tar.gz: 7838f0ab23174aef2eacf27438fa01359a35d0a39742d734372a25b18af239ad
 SHA512:
-  metadata.gz: 83eed0a9c51b4b4266648a505ba5cb1b861903631eca68ddc8bcb8ca8ade51e15727d882bde644f88f11ed2d2eb6375f5c990f98f2c112fc9b0971f98ddc9e80
-  data.tar.gz: d05f1b050e19d31291d570132deb5c3898fc1616629f7a4887813fec95e128bed07a08b38c5cfea82de491c375541a4b17a04bb5c7488f35bc41ff2c9e3a96b8
+  metadata.gz: 777b3ed09754c520fc539b29021f50f6b814b56a4cb2aee5d1cc4169b1840159aca5d16d6091677497dec6b7528c7ae1feb72cc1f306b6a43113513d27f63a7d
+  data.tar.gz: 9db6afb245cd1f70fbb8fbef7b35d1198b0b5937ea70c7c8e78962d9001022443d787f5cd8a7227b1e9ea318729d720fd914b64cc1f30389ce834fbf5af4c45e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.6.0)
+    ci_toolkit (1.6.2)
       faraday
       faraday-multipart
       faraday_middleware

data/ci_toolkit.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "ci_toolkit"
-  spec.version       = "1.6.0"
+  spec.version       = "1.6.2"
   spec.authors       = ["Gero Keller"]
   spec.email         = ["gero.f.keller@gmail.com"]
 

data/lib/ci_toolkit/gitlab_pr.rb

@@ -8,7 +8,8 @@ module CiToolkit
     def initialize(
       env = CiToolkit::BitriseEnv.new,
       build_types = ENV["BUILD_TYPES"]&.split(/,/) || ["BluetoothDemo", "Acceptance PreProd", "Acceptance Prod",
-                                                       "Latest Prod", "Latest PreProd", "Mock", "Design System"],
+                                                       "Latest Prod", "Latest PreProd", "Mock", "Design System",
+                                                       "Acceptance Prod DEBUG"],
 
       bot = CiToolkit::GitlabBot.new
     )

data/lib/ci_toolkit/seetest_client.rb

@@ -7,7 +7,6 @@ require "faraday/multipart"
 module CiToolkit
   # A client for Seetest webservice.
   # See API doc for more info: https://docs.experitest.com/display/PM/How+To+Execute+Rest+API
-  # rubocop:disable Metrics/ClassLength
   class SeeTestClient
     SUCCESS = "SUCCESS"
     OKAY = "OK"
@@ -19,30 +18,14 @@ module CiToolkit
       @faraday_conn = bot.faraday_conn
     end
 
-    # rubocop:disable Metrics/MethodLength
     def upload_file(
       project_name:,
       unique_name:,
       full_path_to_file:,
       content_type: "application/octet-stream"
     )
-      response = faraday_upload(
-        project_name,
-        unique_name,
-        full_path_to_file,
-        content_type
-      ).body
-
-      # Application already exists. Replace it.
-      if (response["status"] == SUCCESS && response["data"]["created"] == "false") ||
-         (response["status"] == ERROR && response.dig("data", "uniqueName"))
-        response = replace_existing_application_by_unique_name(
-          project_name,
-          unique_name,
-          full_path_to_file,
-          content_type
-        )
-      end
+
+      response = upload_or_replace(project_name, unique_name, full_path_to_file, content_type)
 
       unless response["status"] == SUCCESS
         raise StandardError,
@@ -51,10 +34,24 @@ module CiToolkit
 
       response["status"]
     end
-    # rubocop:enable Metrics/MethodLength
 
     private
 
+    def upload_or_replace(project_name, unique_name, full_path_to_file, content_type)
+      application_info_response = faraday_get_application_info(unique_name)
+      if application_info_response.empty?
+        return faraday_upload(project_name, unique_name, full_path_to_file, content_type).body
+      end
+
+      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 replace_existing_application(
       application_id,
       project_name,
@@ -63,24 +60,12 @@ module CiToolkit
       content_type
     )
       response = faraday_delete_application(application_id)
-
       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,
@@ -113,13 +98,7 @@ module CiToolkit
 
     def faraday_get_application_info(unique_name)
       params = { uniqueName: unique_name }
-      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. " \
-              "Response body is: '#{response}'"
-      end
-      response
+      @faraday_conn.get("/api/#{API_VERSION}/applications", params).body
     end
 
     def faraday_delete_application(application_id)
@@ -132,5 +111,4 @@ module CiToolkit
       response
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Gero Keller
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -260,7 +260,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Set of CI utilities
 test_files: []