labclient 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '038bb19b37338ea79eae25d376f49c470e3a3901e84d9f578e51da0ef78f9041'
-  data.tar.gz: 8b7893bbcefc7fa4cbecdf1e3f1b3a21d0298678bb9ae8ed30cc2df13eee2e3f
+  metadata.gz: 2d1d2daf2bc113e0a5e74d3b2888dc20278bb18e5aab063a21919f9ab7ef4ca9
+  data.tar.gz: 40f0b1e58ba394663e4ab90f1ac9fd6e4734e718d6f1aac9f1394bc7c067afd3
 SHA512:
-  metadata.gz: 17c52ea58baf3bda4bf70c9111000a823e9f0eac9fdc2cbece3be95c89162ed19b31e3ec39ce86ee504be590f600d9710afe1e0ce5efe11ef339f4fa9dec963e
-  data.tar.gz: f4b66628ef3916cc5d431d36196d9abb278435fc98fba7b90ff6720cc159d3599ff6f0d87c5152b1ba0cf0d252fe4a3052a5344b28bdf8d26d8e59845f0f9d19
+  metadata.gz: 9d6e0a96ecd9eba62f3a38c89b621b6379cb1e63bb67a212acc7333dc0dc3ae6d3b58011bdbbb8b2b13c08959d144540e46698112dd1d91a6c613208abe541f3
+  data.tar.gz: 317e9e1290ccad1878af5f838842ab893879ed2306fcbcf0509ba9fa4372717a94b98ba37f038db86b01945dc7d2a95b18d8f158b1db64fc6884aa310bd14001

data/lib/labclient/client.rb

@@ -46,7 +46,7 @@ module LabClient
       self.retries += 1
 
       # Assume Retry After by Default
-      logger.debug('Retry After', value: retry_after) if debug?
+      logger.debug('Retry After', value: retry_after, retry_header: retry_header) if debug?
       self.delay = retry_after if resp.headers.key? 'retry-after'
 
       self.delay += delay_factor
@@ -67,6 +67,9 @@ module LabClient
       # Save Client
       save_client
 
+      # Reset Delay/Retry Factor
+      retry_update if resp.success?
+
       # Exit on Max Retries
       raise LabClient::Error.new(resp), resp.friendly_error if retry_max?
 
@@ -74,9 +77,6 @@ module LabClient
 
       # Drop in raw path
       save_path
-
-      # Reset Delay/Retry Factor
-      retry_update
     end
 
     # Assume we want LabStruct if @klass is ever nil

data/lib/labclient/client/helpers.rb

@@ -94,7 +94,11 @@ module LabClient
 
     # Helper for Accessing the Retry Headers
     def retry_after
-      resp.headers['retry-after'].to_i || 0
+      retry_header || delay_factor || 1
+    end
+
+    def retry_header
+      resp.headers['retry-after']&.to_i
     end
 
     # Handle Retry Logic

data/lib/labclient/client/setup.rb

@@ -17,7 +17,7 @@ module LabClient
     # If nothing entered Prompt for Input
     def prompt_for_url
       print 'Enter GitLab URL (e.g. https://gitlab.com): '
-      @settings[:url] = $stdin.gets.chomp
+      @settings[:url] = $stdin.gets&.chomp
       raise 'LabClient Error - Missing URL!' if @settings[:url].blank?
     end
 
@@ -35,7 +35,7 @@ module LabClient
       @settings[:debug] = false if @settings[:quiet].nil?
       @settings[:debug] = false if @settings[:debug].nil?
       @settings[:token_type] = 'Private-Token' if @settings[:token_type].nil?
-      @settings[:retry] = { max: 5, delay_factor: 1, count: 0 } if @settings[:retry].nil?
+      @settings[:retry] = { max: 5, delay_factor: 10, count: 0 } if @settings[:retry].nil?
     end
 
     # Support for Named Profiles

data/lib/labclient/version.rb

@@ -1,3 +1,9 @@
+# Overall version
 module LabClient
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.2'.freeze
+
+  # Make it easy to print version
+  def self.version
+    VERSION
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: labclient
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport