gitlab-triage 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ef311a9c0950dacc0823958bf5a5a61ead1dbc6696599d5a9c1ed9d1cc5ca7
-  data.tar.gz: 421ccd2c8d050659990ad07a8493d23bac378224acd94f47997cfaeec3633b04
+  metadata.gz: 403aa273677c675e590d5c2a46c0feb1d5087e1369532cb7c3b063e79191bc8c
+  data.tar.gz: 2f25cbdcad4c7b8ddd861d026711e396d8c1f9cc01f489a65166954694bc344c
 SHA512:
-  metadata.gz: 706a9954e233b3a7c427068194e25a998fd193fd6373f5d82ad2f152935c2ca9ec16fd61301c687fac057b4972ccadfcc34bc52d44821494bd908cd5eae32b6e
-  data.tar.gz: 639d905c6dce18d3d1af351897a05800e4cb708a7673dc325887d0b38a58d62c54dc85afdf084705ec713ec9d3d9c06273fc7b8afce5e8644a3fada7193b5d2b
+  metadata.gz: 27804c7a88c2079a8559593381e4aa6a0a94bbc6b0d5f23e4624227953fb75b57d177f79b86dbb09ee0836c2be0f9637ac7f762da80f955ae88294943cd1d6fa
+  data.tar.gz: 5ba384a4eb246540da8d23250240af00f4bdc30aa16e1dc17a1fbd4c294f3463e0a9cfefdce653d942ae738c7abc90ad55c28aff95f4c820247d027a18f2459b

data/lib/gitlab/triage/errors.rb

@@ -0,0 +1 @@
+require 'gitlab/triage/errors/network'

data/lib/gitlab/triage/errors/network.rb

@@ -0,0 +1,9 @@
+module Gitlab
+  module Triage
+    module Errors
+      module Network
+        InternalServerError = Class.new(StandardError)
+      end
+    end
+  end
+end

data/lib/gitlab/triage/network.rb

@@ -3,6 +3,7 @@ require 'net/protocol'
 
 require_relative 'retryable'
 require_relative 'ui'
+require_relative 'errors'
 
 module Gitlab
   module Triage
@@ -31,7 +32,7 @@ module Gitlab
         begin
           print '.'
 
-          response = execute_with_retry(Net::ReadTimeout) do
+          response = execute_with_retry([Net::ReadTimeout, Errors::Network::InternalServerError]) do
             puts Gitlab::Triage::UI.debug "query_api: #{url}" if options.debug
 
             @adapter.get(token, response.fetch(:next_page_url) { url })

data/lib/gitlab/triage/network_adapters/httparty_adapter.rb

@@ -2,6 +2,7 @@ require 'httparty'
 
 require_relative 'base_adapter'
 require_relative '../ui'
+require_relative '../errors'
 
 module Gitlab
   module Triage
@@ -17,6 +18,7 @@ module Gitlab
           )
 
           raise_on_unauthorized_error!(response)
+          raise_on_internal_server_error!(response)
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
@@ -38,6 +40,7 @@ module Gitlab
           )
 
           raise_on_unauthorized_error!(response)
+          raise_on_internal_server_error!(response)
 
           {
             results: response.parsed_response,
@@ -52,8 +55,17 @@ module Gitlab
           return unless response.response.is_a?(Net::HTTPUnauthorized)
 
           puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
           raise 'The provided token is unauthorized!'
         end
+
+        def raise_on_internal_server_error!(response)
+          return unless response.response.is_a?(Net::HTTPInternalServerError)
+
+          puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
+          raise Errors::Network::InternalServerError, 'Internal server error encountered!'
+        end
       end
     end
   end

data/lib/gitlab/triage/retryable.rb

@@ -5,7 +5,7 @@ module Gitlab
 
       attr_accessor :tries
 
-      def execute_with_retry(exception_type = StandardError)
+      def execute_with_retry(exception_types = [StandardError])
         @tries = 0
 
         until maximum_retries_reached?
@@ -13,7 +13,7 @@ module Gitlab
             @tries += 1
             result = yield
             break
-          rescue exception_type
+          rescue *exception_types
             raise if maximum_retries_reached?
           end
         end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.6.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,6 +146,8 @@ files:
 - lib/gitlab/triage/command_builders/text_content_builder.rb
 - lib/gitlab/triage/engine.rb
 - lib/gitlab/triage/entity_builders/issue_builder.rb
+- lib/gitlab/triage/errors.rb
+- lib/gitlab/triage/errors/network.rb
 - lib/gitlab/triage/expand_condition.rb
 - lib/gitlab/triage/expand_condition/expansion.rb
 - lib/gitlab/triage/expand_condition/list.rb