ci_toolkit 1.5.17 → 1.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186f7a74ac19e0ff178758e757620f8c489bfbf0c93f815d999fd1eec6710344
-  data.tar.gz: fabfee8fc42a0d0dc016ca34ca1a24a43c9b620b525bf34429f935fb9830ed95
+  metadata.gz: 0caae7232b53d65bcd7f5eb7103b3ce36d56d22120beee7534bdcfa3beb8d1c9
+  data.tar.gz: 5a1bf7389dec806379b9b0f6544950f026638c53e614481bd2d8b4dd3152a980
 SHA512:
-  metadata.gz: d45d3bfd1604ef09b32f56336b1917b8738fd2e6ebef06da5d29f82ff5b3f8f26e52dadf238d3aa552a13d9a746363d9e0256934efc66c479c3b648bcb1149b9
-  data.tar.gz: d9801923984198b34ec572e9b103079693c3f1701fd331453e66f6abb09e62f8ab0d59a6e25104d87921f4041471f86cfa4b4d2d50fc2ed7ab3f77921c233f86
+  metadata.gz: dd550bfe914c50d9b3f21f691ee933d06f4048dbae2c430c7499f1b164757a5870bb51f561e789986bf35d6400c14b1ebcf90b6374a5135a3737a2fb1d4ad267
+  data.tar.gz: efc45ea4f35a27d452e56d43b51e32fe4cf1f407c692eeacaed5f438b3b808c58212200d5b87ae7c01a2672535d52ce8c0b9442b9a8cfd819e26d08f5232fd8c

data/.rubocop.yml

@@ -16,4 +16,9 @@ Layout/LineLength:
   Max: 120
 
 Metrics/BlockLength:
-  IgnoredMethods: ['describe']
+  IgnoredMethods: ['describe']
+
+RSpec/MultipleExpectations:
+  Max: 5
+RSpec/ExampleLength:
+  Max: 20

data/Gemfile.lock

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

data/lib/ci_toolkit/seetest_bot.rb

@@ -3,7 +3,7 @@
 require "gitlab"
 
 module CiToolkit
-  # Utility class that provides an instance of a Gitlab Client
+  # Utility class that provides an faraday connection
   class SeeTestBot
     attr_reader :faraday_conn
 
@@ -27,6 +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.adapter :net_http # A MUST for file upload to work with Faraday::Multipart::FilePart
       end
     )

data/lib/ci_toolkit/{seetest_upload.rb → seetest_client.rb}

@@ -5,19 +5,18 @@ require "faraday/net_http"
 require "faraday/multipart"
 
 module CiToolkit
-  # Can be used to upload files to Seetest.
+  # 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 SeeTestUpload
+  class SeeTestClient
     SUCCESS = "SUCCESS"
-    BAD_REQUEST = "BAD_REQUEST"
     OKAY = "OK"
     ERROR = "ERROR"
+    API_VERSION = "v1"
+    attr_reader :faraday_conn
 
-    def initialize(
-      bot = CiToolkit::SeeTestBot.new
-    )
-      @bot = bot
+    def initialize(bot = CiToolkit::SeeTestBot.new)
+      @faraday_conn = bot.faraday_conn
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -28,39 +27,41 @@ module CiToolkit
       full_path_to_file:,
       content_type: "application/octet-stream"
     )
-      uploaded = ""
-
       response = faraday_upload(
         project_name,
         unique_name,
         full_path_to_file,
         content_type
-      )
-      response_obj = get_response_body(response.body)
+      ).body
 
-      # Application with unique name already exist. Replace it
-      if response_obj.status == SUCCESS && response_obj.data.created == "false"
-        uploaded = replace_existing_application(
-          response_obj.data.id,
+      # 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
         )
-      elsif response_obj.status == ERROR && response_obj.data?.uniqueName.empty?
+      # 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
-        uploaded = replace_existing_application(
+        response = replace_existing_application(
           application_id,
           project_name,
           unique_name,
           full_path_to_file,
           content_type
         )
-      else
-        uploaded = response_obj
       end
-      uploaded.status
+
+      unless response.status == SUCCESS
+        raise StandardError,
+              "Upload response from Seetest returned an error. Response body is: '#{response.marshal_dump}'"
+      end
+
+      response.status
     end
     # rubocop:enable Metrics/AbcSize Metrics/MethodLength
     # rubocop:enable Metrics/MethodLength
@@ -84,14 +85,13 @@ module CiToolkit
       full_path_to_file,
       content_type
     )
-      response = faraday_upload(project_name, unique_name, full_path_to_file, content_type)
-
-      body_obj = get_response_body(response.body)
-      unless body_obj.status == SUCCESS && body_obj.data.created == "true"
-        raise StandardError, "Upload response from Seetest returned an error. Response body is: '#{response.body}'"
+      response = faraday_upload(project_name, unique_name, full_path_to_file, content_type).body
+      unless response.status == SUCCESS && response.data.created == "true"
+        raise StandardError,
+              "Upload response from Seetest returned an error. Response body is: '#{response.marshal_dump}'"
       end
 
-      body_obj
+      response
     end
 
     def faraday_upload(
@@ -106,38 +106,28 @@ module CiToolkit
         uniqueName: unique_name,
         project: project_name
       }
-      @bot.faraday_conn.post("/api/v1/applications/new", params)
+      @faraday_conn.post("/api/#{API_VERSION}/applications/new", params)
     end
 
     def faraday_get_application_info(unique_name)
       params = { uniqueName: unique_name }
-      response = @bot.faraday_conn.get("/api/v1/applications", params)
-      response_obj = get_response_body(response.body)
-      if response_obj.empty?
+      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.body}'"
+              "Response body is: '#{response}'"
       end
-
-      response_obj
+      response
     end
 
     def faraday_delete_application(application_id)
-      response = @bot.faraday_conn.post("/api/v1/applications/#{application_id}/delete")
-
-      response_obj = get_response_body(response.body)
-
-      unless  response_obj.status == SUCCESS && response_obj.code == OKAY
+      response = @faraday_conn.post("/api/#{API_VERSION}/applications/#{application_id}/delete").body
+      unless response.status == SUCCESS && response.code == OKAY
         raise StandardError,
               "Delete application id: #{application_id} from Seetest returned an error. "\
-              "Response body is: '#{response.body}'"
+              "Response body is: '#{response.marshal_dump}'"
       end
-
-      response_obj
-    end
-
-    def get_response_body(response)
-      JSON.parse(response, object_class: OpenStruct)
+      response
     end
   end
   # rubocop:enable Metrics/ClassLength

data/lib/ci_toolkit.rb

@@ -11,7 +11,7 @@ require "ci_toolkit/gitlab_bot"
 require "ci_toolkit/gitlab_pr"
 require "ci_toolkit/gitlab_release"
 require "ci_toolkit/seetest_bot"
-require "ci_toolkit/seetest_upload"
+require "ci_toolkit/seetest_client"
 require "ci_toolkit/dvcs_pr_factory"
 require "ci_toolkit/git"
 require "ci_toolkit/jira"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.19
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -248,7 +248,7 @@ files:
 - lib/ci_toolkit/pr_messenger.rb
 - lib/ci_toolkit/pr_messenger_text.rb
 - lib/ci_toolkit/seetest_bot.rb
-- lib/ci_toolkit/seetest_upload.rb
+- lib/ci_toolkit/seetest_client.rb
 - transform_coverage_data.rb
 homepage: https://github.com/crvshlab/ci_toolkit
 licenses: