bucky-core 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95eea4889710b2e9a9c9ed0c75cb3383e9036119
-  data.tar.gz: 92eb538f8b984f71e3f06534adbc2f7a014fea37
+  metadata.gz: ba4cfdfb0d88340a326b8bb17c55517e8f4e9838
+  data.tar.gz: d52796926a4bdd0bce45326f73aeb4b0bddd62f7
 SHA512:
-  metadata.gz: cac44cb6d544e868a146a26ae5e38b1547557072eb1d6722e38c33a571d578fa078f574dfc6f93206d54d212edae32c0266190f2f4c2c70375f87284dca686fb
-  data.tar.gz: 4905bbbeb5dd84b279b746d250a7cfc40a9c690f22def77666b590dfad104c58f45a05fc228e0e9762b41e3838a12b30583bae92df60370d6f0b8722c963b0d7
+  metadata.gz: f30e29812db9cf2b91c771e5565d4d477dd0c2f59675878a3a17c24891c2d3aea99cf650609ea60ee5b6c2665cf40d8c22a098d12773782bf211f2245659daa4
+  data.tar.gz: c8018498f6471c2744e8142c883853b2a9575e96b21aa2f27bdd7e1cf33a0e596de9334348201d6a089922c164343cbed4fffea7f20678d785983af8759617a2

data/.rubocop.yml

@@ -61,7 +61,7 @@ MethodLength:
   Enabled: false
 
 ModuleLength:
-  Max: 120
+  Max: 130
   Exclude:
     - 'spec/**/*.rb'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bucky-core (0.10.5)
+    bucky-core (0.10.6)
       addressable (~> 2.5)
       color_echo (~> 3.1)
       json (~> 2.1)

data/lib/bucky/test_equipment/verifications/status_checker.rb

@@ -34,7 +34,11 @@ module Bucky
           # If number of requests is over redirect limit
           return { error_message: "\n[Redirect Error] #{url} is redirected more than #{REDIRECT_LIMIT}" } if redirect_count > REDIRECT_LIMIT
 
-          check_result = check_log_and_get_response(url, device, link_check_max_times, url_log)
+          begin
+            check_result = check_log_and_get_response(url, device, link_check_max_times, url_log)
+          rescue Net::ReadTimeout => e
+            return { error_message: "#{e.message} Please check this url: #{url}" }
+          end
           # If result include response continue to check, else return result
           !check_result.key?(:response) ? (return check_result) : response = check_result[:response]
 
@@ -46,13 +50,8 @@ module Bucky
             puts "  #{url} ...  [#{response.code}:OK]"
             { entity: response.entity }
           when /3[0-9]{2}/
-            fqdn = url[%r{^(https?:\/\/([a-zA-Z0-9\-_.]+))}]
-            redirect_url = response['location']
-            # Add fqdn if location doesn't include fqdn
-            redirect_url = fqdn << redirect_url unless redirect_url.include?('http')
-            puts "  #{url} ... redirect to #{redirect_url} [#{response.code}:RD]"
-            http_status_check_args = { url: redirect_url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: redirect_count + 1, redirect_url_list: redirect_url_list }
-            http_status_check(http_status_check_args)
+            http_status_check_args = { url: url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: redirect_count + 1, redirect_url_list: redirect_url_list }
+            redirect_and_http_status_check(response, http_status_check_args)
           when /(4|5)[0-9]{2}/
             url_log[url][:error_message] = "[Status Error] http status returned #{response.code}.\ncheck this url: #{redirect_url_list.join(' -> ')}"
             puts "  #{url} ...  [#{response.code}:NG]"
@@ -82,12 +81,12 @@ module Bucky
           # Check base url
           http_status_check_args = { url: url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: 0, redirect_url_list: [] }
           base_response = http_status_check(http_status_check_args)
-          assert_nil(base_response[:error_message], "Response of base URL is incorrect.\n#{base_response[:error_message]}")
+          raise Test::Unit::AssertionFailedError, "Response of base URL is incorrect.\n#{base_response[:error_message]}" unless base_response[:error_message].nil?
 
           # Collect links
           links_args = { base_url: base_url, base_fqdn: base_fqdn, url_reg: url_reg, only_same_fqdn: only_same_fqdn, entity: base_response[:entity] }
           links = make_target_links(links_args)
-          links = exclude(links, exclude_urls) unless exclude_urls.nil?
+          links = exclude(links, exclude_urls)
 
           errors = []
           Parallel.each(links.uniq, in_threads: Bucky::Utils::Config.instance[:linkstatus_thread_num]) do |link|
@@ -96,7 +95,7 @@ module Bucky
             link_response = http_status_check(http_status_check_args)
             errors << link_response[:error_message] if link_response[:error_message]
           end
-          assert_empty(errors, errors.join("\n"))
+          raise Test::Unit::AssertionFailedError, errors.join("\n") unless errors.empty?
         end
 
         def make_target_links(args)
@@ -128,6 +127,8 @@ module Bucky
 
         # Exclude non test target url
         def exclude(links, exclude_urls)
+          return links if exclude_urls.nil?
+
           excluded_links = links - exclude_urls
 
           # Exclude url if it has "*" in the last of it
@@ -178,6 +179,16 @@ module Bucky
           href.insert(0, '/') unless href.match(%r{^/|^#})
           base_url + href
         end
+
+        def redirect_and_http_status_check(response, http_status_check_args)
+          fqdn = http_status_check_args[:url][%r{^(https?:\/\/([a-zA-Z0-9\-_.]+))}]
+          redirect_url = response['location']
+          # Add fqdn if location doesn't include fqdn
+          redirect_url = fqdn << redirect_url unless redirect_url.include?('http')
+          puts "  #{http_status_check_args[:url]} ... redirect to #{redirect_url} [#{response.code}:RD]"
+          http_status_check_args[:url] = redirect_url
+          http_status_check(http_status_check_args)
+        end
       end
     end
   end

data/lib/bucky/version.rb

@@ -2,6 +2,6 @@
 
 module Bucky
   module Version
-    VERSION = '0.10.6'
+    VERSION = '0.10.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucky-core
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - NaotoKishino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print