travis_dedup 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f88af9f44b907ec9119b865cfd115512f1920de
-  data.tar.gz: 0d4e4dc768900f59735ecad2d989014c782a9f2a
+  metadata.gz: 4a16be148e31528f8174764a66c9432df37a3c45
+  data.tar.gz: d9cbf5d59ddaa85f369acaf90a6c2a4864aa5a06
 SHA512:
-  metadata.gz: eeee3dde588968b401dd060eb26ef750280e47bf96607a8d4bed7f56b43cf3461163d559de5e7ea4f85488de4e009e94b0438fe37a510ada58720332f71aa32d
-  data.tar.gz: 05938a005ee8fe662a720e5a73093a4b2fa57456bbcb01ec6abb02f48dc63c2d514d8c9025c3110c895ea6538236eb258700e0a9ce1634bcfd3a57cc22e881bd
+  metadata.gz: 99650998edaf069bdb7e932cfa48813ab8c893862a01ce9169d71243dbe9c267bde6ab1f90b20499e9b5aae08b61c1a99b366114b807bef73c85719c3c722f42
+  data.tar.gz: f8c17cabb09465a4a680cb123f9c6df83dafecfc95085cd6bc8f7c9469f92246ee919a8b14061aa0963b92deb645fcd44577ea5f29aefe9f434ac6f8abb7074b

data/lib/travis_dedup.rb

@@ -5,8 +5,11 @@ require 'optparse'
 module TravisDedup
   ACTIVE = %w[created started queued]
 
+  RETRY = 3
+  class RetryWhen500 < StandardError; end
+
   class << self
-    attr_accessor :pro, :verbose, :branches
+    attr_accessor :pro, :verbose, :branches, :retry_option, :ignore_error_500
 
     def cli(argv)
       parser = OptionParser.new do |opts|
@@ -20,6 +23,8 @@ module TravisDedup
         BANNER
         opts.on("--pro", "travis pro") { self.pro = true }
         opts.on("--branches", "dedup builds on branches too") { self.branches = true }
+        opts.on("--retry [COUNT]", Integer, "number of times to retry when Travis returns a 500. #{RETRY} times by default") { |value| self.retry_option = value }
+        opts.on("--ignore-error-500", "let the build run when Travis API keeps returning 500") { self.ignore_error_500 = true }
         opts.on("-h", "--help","Show this") { puts opts; exit }
         opts.on('-v', '--version','Show Version'){ require 'travis_dedup/version'; puts TravisDedup::VERSION; exit}
       end
@@ -30,7 +35,11 @@ module TravisDedup
         return 1
       end
 
-      puts dedup_message(*argv)
+      begin
+        puts dedup_message(*argv)
+      rescue TravisDedup::RetryWhen500 => error
+        raise error unless ignore_error_500
+      end
       0
     end
 
@@ -98,10 +107,27 @@ module TravisDedup
     end
 
     def request(method, path, params, headers={})
+      attempts = 1
+      begin
+        faraday_send(method, path, params, headers)
+      rescue TravisDedup::RetryWhen500 => error
+        raise error if (attempts += 1) > max_attempts
+        puts "Travis returned an error 500. Retrying ..."
+        retry
+      end
+    end
+
+    def max_attempts
+      retry_option || RETRY
+    end
+
+    def faraday_send(method, path, params, headers={})
       response = Faraday.send(method, "#{host}/#{path}", params, headers)
       case response.status
       when 200 then JSON.parse(response.body)
       when 204 then nil
+      when 500
+        raise TravisDedup::RetryWhen500
       else
         raise(
           Faraday::Error,
@@ -110,5 +136,6 @@ module TravisDedup
         )
       end
     end
+
   end
 end

data/lib/travis_dedup/version.rb

@@ -1,3 +1,3 @@
 module TravisDedup
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_dedup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday