organization_audit 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f41e351d229c2a4a6ffed86c306323e77fa1952619f7804ecf33518c766039d
-  data.tar.gz: e14ed8bf0ea6733866c318c47c3125e3cf77a0c74d63db34cde8dd7ca7ea4112
+  metadata.gz: 2f1e2fd92f477c1781dbe7e02af8908e6046b56a13218d01358991f8586789b2
+  data.tar.gz: 0b930890543822993b5bedc9569aba2e3b53b8f94fe27a946ea17ccae5bd376e
 SHA512:
-  metadata.gz: 230a3eb9b32d6774682fb3c0223795e5b06ffa33ef2c386856eca9427e8168ea88abce7ad5660a300c52a589532c0f7f7a00492c3a744ce50bde5db9aed02225
-  data.tar.gz: 31f1b4b112f39711f3555d00da18a7a8867c9a8f0a7ce20fda88d62ba8ffaf3adfd6ad9930751499c32fb65dd0d9fa7b75583d5cdaa456521422bbf8cac6f5b5
+  metadata.gz: aa886169bd98058bcab53ea0875aef761bc6cb659fe86cc8e1ca4ad31c108dd18753f7d2c50762eecd41803a2277c8d20a57a825b0478ac65032bda683799a61
+  data.tar.gz: 74f128cfd33bf0248bf7fab7dfe2c8a9ef5e00b95c6d551ab178e9ad52054234edb678256c8e2a1dc9800fa51f7f7fd334d4655f00b67a3e960c21e3a77d048e

data/lib/organization_audit/repo.rb

@@ -125,29 +125,31 @@ module OrganizationAudit
       results
     end
 
-    def self.http_get(url, headers, retried: false)
-      uri = URI(url)
-      request = Net::HTTP::Get.new(uri, headers)
-      http = Net::HTTP.new(uri.hostname, uri.port)
-      http.use_ssl = true if uri.instance_of? URI::HTTPS
-      response =
-        begin
-          http.start { |http| http.request(request) }
-        rescue
-          raise RequestError.new("#{$!.class} error during request #{url}", url)
+    def self.http_get(url, headers)
+      tries = 3
+      tries.times do |i|
+        uri = URI(url)
+        request = Net::HTTP::Get.new(uri, headers)
+        http = Net::HTTP.new(uri.hostname, uri.port)
+        http.use_ssl = true if uri.instance_of? URI::HTTPS
+        response =
+          begin
+            http.start { |http| http.request(request) }
+          rescue
+            raise RequestError.new("#{$!.class} error during request #{url}", url)
+          end
+
+        return response.body if response.code == '200'
+
+        # github sends 403 with 0-limit header when rate limit is exceeded
+        if i < (tries - 1) && response["x-ratelimit-remaining"] == "0"
+          wait = Integer(response["x-ratelimit-reset"]) - Time.now.to_i
+          warn "Github rate limit exhausted, retrying in #{wait}"
+          sleep wait + 60 # wait more in case our time drifts
+        else
+          raise RequestError.new("HTTP get error, retried #{i} times", url, response.code, response.body)
         end
-
-      return response.body if response.code == '200'
-
-      # github sends 403 with 0-limit header when rate limit is exceeded
-      if !retried && response["x-ratelimit-remaining"] == "0"
-        wait = Integer(response["x-ratelimit-reset"]) - Time.now.to_i
-        warn "Github rate limit exhausted, retrying in #{wait}"
-        sleep wait + 60 # wait more in case our time drifts
-        return http_get(url, headers, retried: true)
       end
-
-      raise RequestError.new("HTTP get error", url, response.code, response.body)
     end
 
     def branch

data/lib/organization_audit/version.rb

@@ -1,3 +1,3 @@
 module OrganizationAudit
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organization_audit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json