jmgarnier_travis_dedup 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464ee010aaf415a819f821dce1ec7b2ab3345f3d
-  data.tar.gz: 6d7d7458af673bbcd3cd3986f2688aa632569dee
+  metadata.gz: 9c615ef2de3ea346497e411ff57903b5b0960973
+  data.tar.gz: 27d61db7286592d82c6fb47264c080e27c934263
 SHA512:
-  metadata.gz: 6b2197268038ab24b6a83fcf63ce02db45e39e4c077b970816719d6e617980dde323c932eecf95087ea9652099ca0cc35f46cdb20f8601a002d3c1ce54e4a0bd
-  data.tar.gz: eca992c5a94ee3207fe3df8d263973f3d39fbd0f7d8f8c2e149d8274d325132a2d47e003b997553a0605199c65cff7f0cbd2ac691d71cc88221c6b2045b245eb
+  metadata.gz: 1b5a2452db279fe756f4e6a6741cd3250bdd541754b2664ad6bcba51fe737bde155005934be0f77eee637bcee79777cf4351cb6759b25daf3c1e48e5354fd655
+  data.tar.gz: 1b826f0c074351d4e39c11dccc97f8f3903d198316189f40f0d8a260101519b53ad431bb3c1d9861c14d2e20bc4831b7417a4f8faa5b374f70533ee3023f3585

data/lib/travis_dedup.rb

@@ -5,10 +5,11 @@ require 'optparse'
 module TravisDedup
   ACTIVE = %w[created started queued]
 
-  DEFAULT_MAX_ATTEMPTS_WHEN_TRAVIS_DOES_NOT_RESPOND = 3
+  RETRY = 3
+  class RetryWhen500 < StandardError; end
 
   class << self
-    attr_accessor :pro, :verbose, :branches
+    attr_accessor :pro, :verbose, :branches, :retry_option, :force
 
     def cli(argv)
       parser = OptionParser.new do |opts|
@@ -22,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", "number of times to retry when Travis returns a 500. #{RETRY} times by default") { |value| self.retry_option = value }
+        opts.on("--force", "give up cancelling duplicate builds when Travis keeps returning 500") { self.force = 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
@@ -32,7 +35,11 @@ module TravisDedup
         return 1
       end
 
-      puts dedup_message(*argv)
+      begin
+        puts dedup_message(*argv)
+      rescue TravisDedup::RetryWhen500 => error
+        raise error unless force
+      end
       0
     end
 
@@ -100,37 +107,34 @@ module TravisDedup
     end
 
     def request(method, path, params, headers={})
-      attempts = 0
+      attempts = 1
       begin
         faraday_send(method, path, params, headers)
-      rescue TravisError500 => error
+      rescue TravisDedup::RetryWhen500 => error
         raise error if (attempts += 1) > max_attempts
+        puts "Travis returned an error 500. Retrying ..."
         retry
       end
     end
 
     def max_attempts
-      DEFAULT_MAX_ATTEMPTS_WHEN_TRAVIS_DOES_NOT_RESPOND
+      retry_option || RETRY
     end
 
-    class TravisError500 < Faraday::Error; 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
-        256.times { puts "500 on Travis, retrying! ⏰" }
-        raise(TravisError500, error_message(method, path, response))
+        raise TravisDedup::RetryWhen500
       else
-        raise(Faraday::Error, error_message(method, path, response))
+        raise(Faraday::Error,
+              "Communication with travis failed when trying to #{method} #{path}\n" \
+              "Response: #{response.status} - #{response.body}"
+        )
       end
     end
 
-    def error_message(method, path, response)
-      "Communication with travis failed when trying to #{method} #{path}\n" \
-      "Response: #{response.status} - #{response.body}"
-    end
   end
 end

data/lib/travis_dedup/version.rb

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

metadata

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