ci_toolkit 1.5.24 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd562f4fd521be367616dd224494af02a37431c7a2e7ad04cfdb3e021b64456f
-  data.tar.gz: a51db4bc721f309482748d1852387abcec89aec95745607d726ca0834f85c678
+  metadata.gz: e72169e62cce70b95ff7872f841a40721103289b06792dc18863d08f5d5aa535
+  data.tar.gz: fba0e495ebd1c8e69efa917a1fb159078e42df29dc2a805fda7175bcb0992269
 SHA512:
-  metadata.gz: cdd2864b3d4a3958c141edb99f70616589fbe3fa04140aa80ab01348ca750dfcf5300216355c05f9d21593f4467dec9d7be32d49098ef33452337ce4e597323f
-  data.tar.gz: 74fbcf1d6572a201d4f46f73113b155d5de74710b2fb7151d7580ba6bc137b635e1dff90f061e5c9471c75b2cf1a4e318c23ad1c860e7c5aade894c30815769e
+  metadata.gz: 1ea49531735be387235cb0481ba039ae6f964e21055e0769b788e05c1417a6406386226b2f304edaee1a45d753f4793b7701c705152db8f2e88e485ca9957495
+  data.tar.gz: c4210324b27bf7b0b591627fd29bdd8790f3b0ae1acae963c02da0e1745e3485fd544ead1448d4c30c81a9ea8fb2f51d9cb5d375fa7a811bfa2c4ad5e85cee57

data/.rubocop.yml

@@ -21,4 +21,7 @@ Metrics/BlockLength:
 RSpec/MultipleExpectations:
   Max: 5
 RSpec/ExampleLength:
-  Max: 20
+  Max: 20
+
+RSpec/VerifiedDoubleReference:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.5.24)
+    ci_toolkit (1.6.1)
       faraday
       faraday-multipart
       faraday_middleware
@@ -14,22 +14,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    date (3.2.1)
-    diff-lcs (1.4.4)
+    date (3.3.3)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (1.8.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
@@ -41,6 +42,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     gitlab (4.19.0)
@@ -49,38 +51,36 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    ipaddr (1.2.3)
-    json (2.5.1)
-    jwt (2.3.0)
+    json (2.6.3)
+    jwt (2.7.0)
     mini_mime (1.1.2)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    openssl (2.2.1)
-      ipaddr
+    multipart-post (2.3.0)
+    octokit (6.1.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    openssl (3.1.0)
     parallel (1.23.0)
     parser (3.2.2.1)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -93,16 +93,22 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.28.1)
       parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.5.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    simplecov (0.21.2)
+      faraday (>= 0.17.3, < 3)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -110,16 +116,17 @@ GEM
     simplecov-json (0.2.3)
       json
       simplecov
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    time (0.2.0)
+    time (0.2.2)
       date
     unicode-display_width (2.4.2)
 
 PLATFORMS
   universal-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES

data/ci_toolkit.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "ci_toolkit"
-  spec.version       = "1.5.24"
+  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,52 +18,40 @@ module CiToolkit
       @faraday_conn = bot.faraday_conn
     end
 
-    # rubocop:disable Metrics/AbcSize
-    # 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 = replace_existing_application(
-          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?
-        response = replace_existing_application_by_unique_name(
-          project_name,
-          unique_name,
-          full_path_to_file,
-          content_type
-        )
-      end
 
-      unless response[:status] == SUCCESS
+      response = upload_or_replace(project_name, unique_name, full_path_to_file, content_type)
+
+      unless response["status"] == SUCCESS
         raise StandardError,
               "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
 
     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,
@@ -73,24 +60,12 @@ module CiToolkit
       content_type
     )
       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,
@@ -98,7 +73,7 @@ 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}'"
       end
@@ -123,18 +98,12 @@ 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)
       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}'"
@@ -142,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.5.24
+  version: 1.6.1
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday