hiptest-publisher 1.30.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51e585e6cfddfb427d0ce4d5ccd898d812072b5def6ada9ac19eb2ebfec7b07
-  data.tar.gz: d23a1a44229b281b0ae4a6ab8d561923f35d99fc3bba9cd5ad546217363f2a6a
+  metadata.gz: 16ac0103a98c523651a2cf5bd076ef8a6193053c14bb2b09535ea83b241035c8
+  data.tar.gz: 911faffe0592b0f17bdff8a64d7d3e19acd118c86f58b60b1dec24446f89453d
 SHA512:
-  metadata.gz: ecb76a6be315f0ccc199e52708fcd9df128f04d1b3c0d66fd1327d09360b5975d3414887af2950f82ebda04581e0139307a014e7d869cf1a78102d77e23c66ed
-  data.tar.gz: 3cae8f924fefc9bc926a6cee22463f3abfbd9afc917c9ae12d51e3baecd23927ef51d654cafba4f1db7442644a8f9d975f4cf055b6ab9477974f484441ce53bf
+  metadata.gz: 68d9c8b314466a693c2e738d32669c52ed3001fa6789b5c5732a374fb72beb3fd7faaafe9bc81ed271b629313ef158e049109b63a4c367159f7bd6ffb3e97024
+  data.tar.gz: a4e6406e141313255388544c6cd7c117b1ffd76500525a184cd01f490add5842035b6ecbea04bf808e50266c3859e8cc7133d3a21ff7a5f2f91d3b99fdac73dc

data/lib/hiptest-publisher/client.rb

@@ -12,6 +12,20 @@ module Hiptest
   class ClientError < StandardError
   end
 
+  class RedirectionError < StandardError
+    attr_reader :redirect
+
+    def initialize(msg, redirect)
+      @redirect = redirect
+      super(msg)
+    end
+  end
+
+  class MaximumRedirectionReachedError < StandardError
+  end
+
+  MAX_REDIRECTION = 10
+
   class Client
     attr_reader :cli_options
 
@@ -109,16 +123,15 @@ module Hiptest
     def push_results
       # Code from: https://github.com/nicksieger/multipart-post
       uploaded = {}
-      Dir.glob(cli_options.push.gsub('\\', '/')).each_with_index do |filename, index|
-        uploaded["file-#{filename.normalize}"] = UploadIO.new(File.new(filename), "text", filename)
+      Dir.glob(cli_options.push.gsub('\\', '/')).each do |filename|
+        uploaded["file-#{filename.normalize}"] = filename
       end
 
       if cli_options.global_failure_on_missing_reports && uploaded.empty?
         return send_post_request(global_failure_url)
       end
 
-      uri = URI.parse(url)
-      send_request(Net::HTTP::Post::Multipart.new(uri, uploaded))
+      send_multipart_request(url, uploaded)
     end
 
     private
@@ -178,34 +191,59 @@ module Hiptest
       "#{cli_options.site}/publication/#{cli_options.token}"
     end
 
-    def send_get_request(url)
+    def send_get_request(url, attempt = MAX_REDIRECTION)
+      raise MaximumRedirectionReachedError if attempt < 0
+
       uri = URI.parse(url)
-      response = send_request(Net::HTTP::Get.new(uri))
-      response
+      send_request(Net::HTTP::Get.new(uri))
+    rescue RedirectionError => err
+      send_get_request(err.redirect, attempt - 1)
     end
 
-    def send_post_request(url)
+    def send_post_request(url, attempt = MAX_REDIRECTION)
+      raise MaximumRedirectionReachedError if attempt < 0
+
       uri = URI.parse(url)
-      response = send_request(Net::HTTP::Post.new(uri))
-      response
+      send_request(Net::HTTP::Post.new(uri))
+    rescue RedirectionError => err
+      send_post_request(err.redirect, attempt - 1)
+    end
+
+    def send_multipart_request(url, uploaded, attempt = MAX_REDIRECTION)
+      raise MaximumRedirectionReachedError if attempt < 0
+
+      uri = URI.parse(url)
+      files = {}
+      uploaded.each do |fieldname, filename|
+        files[fieldname] = UploadIO.new(File.new(filename), "text", filename)
+      end
+
+      send_request(Net::HTTP::Post::Multipart.new(uri, files))
+    rescue RedirectionError => err
+      send_multipart_request(err.redirect, uploaded, attempt - 1)
     end
 
     def send_request(request)
       request["User-Agent"] = "Ruby/hiptest-publisher"
       use_ssl = request.uri.scheme == "https"
+
       proxy_uri = find_proxy_uri(request.uri.hostname, request.uri.port)
       if proxy_uri
         proxy_address = proxy_uri.hostname
         proxy_port = proxy_uri.port
         proxy_user, proxy_pass = proxy_uri.userinfo.split(':', 2) if proxy_uri.userinfo
       end
+
       Net::HTTP.start(
           request.uri.hostname, request.uri.port,
           proxy_address, proxy_port, proxy_user, proxy_pass,
           use_ssl: use_ssl,
           verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http|
         @reporter.show_verbose_message(I18n.t(:request_sent, uri: request.uri))
-        http.request(request)
+        response = http.request(request)
+
+        raise RedirectionError.new("Got redirected", response['location']) if response.is_a?(Net::HTTPRedirection)
+        response
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.31.0
 platform: ruby
 authors:
 - HipTest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -754,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Export your tests from HipTest into executable tests.