ci_toolkit 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cd888726c86a779288d7e4a7d04bea4a1d1a52c479dcb862812f40ffa4f509
-  data.tar.gz: 75833b08101042e0d7d9b3dae759d5ff505525f95bc547295eb2eaa734381ffb
+  metadata.gz: e72169e62cce70b95ff7872f841a40721103289b06792dc18863d08f5d5aa535
+  data.tar.gz: fba0e495ebd1c8e69efa917a1fb159078e42df29dc2a805fda7175bcb0992269
 SHA512:
-  metadata.gz: 83eed0a9c51b4b4266648a505ba5cb1b861903631eca68ddc8bcb8ca8ade51e15727d882bde644f88f11ed2d2eb6375f5c990f98f2c112fc9b0971f98ddc9e80
-  data.tar.gz: d05f1b050e19d31291d570132deb5c3898fc1616629f7a4887813fec95e128bed07a08b38c5cfea82de491c375541a4b17a04bb5c7488f35bc41ff2c9e3a96b8
+  metadata.gz: 1ea49531735be387235cb0481ba039ae6f964e21055e0769b788e05c1417a6406386226b2f304edaee1a45d753f4793b7701c705152db8f2e88e485ca9957495
+  data.tar.gz: c4210324b27bf7b0b591627fd29bdd8790f3b0ae1acae963c02da0e1745e3485fd544ead1448d4c30c81a9ea8fb2f51d9cb5d375fa7a811bfa2c4ad5e85cee57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.6.0)
+    ci_toolkit (1.6.1)
       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.1"
   spec.authors       = ["Gero Keller"]
   spec.email         = ["gero.f.keller@gmail.com"]
 

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.1
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday