try-until 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQ5NDkxMzE4ZDc2MGMzMjQ1OWYzM2NjNTE0NGI4MmUwMGE3M2ZlZA==
+    YmU5N2NkZTJlMjgxODcyZTZkZjM4YzM1MDQyMWY2NGE2M2YzNjZmZg==
   data.tar.gz: !binary |-
-    ODZiMjJjYTllY2U4M2RjYjIyZDJhMjJkZWRlYWVhNjZiMzM2MTc4OA==
+    NjljNDU1NmFkZjgyNjFhNmVmZGFkNDFkNTUzZjdiYjcxYzJmYWEzNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjEwNjg4MDQ5NWFkZWE5MTdmNmFlZjU1MWQ2ZWRlM2I0ODA3NDI2YzFmMjY1
-    YWFiMDg5NTllMjNiY2QxMjYxZjNmODQ1ODA1MGVjNWU2Zjg4YjQxOTNhODBl
-    OWFkNTk5MTIxZWZhMjk0OTA4NDJjN2ZjYzU0ZWJjY2QyNjcwNWQ=
+    ODgzMDIxMzY3ZWY3Mzc1OWI5MTdjYTQ3OWZlZjI0NGNjZmIzY2QzM2QwOWVm
+    ZWY5MDIyYTBiM2I3MWU4OTdiNTIyMDc3ZGQwY2E4OTczYjhiYWE0ZjExY2Rm
+    MzA2NzhkYmNiODlmMmVlNGNlNjhkY2Q4YWJhYjVhMTBiMjNhMTk=
   data.tar.gz: !binary |-
-    MjI0MGExMjU4Yjc3ZjE1MzcyOWVkMjM5YWI4YjM3MjlhM2Y1ZDE3MzczYTNk
-    OTAwZDA1ZmE1NjkwMmVkYzI3MWQxMmRjZDhkOTI3YmEzY2JkNjY1YWVlYzkz
-    ODlkYjU4YmFlOThhYjM5MDFhMjlhMTdmNTgwYjhiNThkMWRmN2E=
+    YzgzZDBhNGM3MzBkMGFjYmVmNzM5NTg1MThhMzhmNjRhMDg4YjlmMmIwODIx
+    ZWM2ZmY2YTRjZGM1M2U2NDFkZjMyNzVlMzU0M2QzZTdiZDE1ZWZlZTQ0Yjk1
+    NWNkZWU3Zjg2NmIyZDJkYzdlMTFhN2VjOTM1NDdkZjVhMjY0OWM=

data/lib/try_until/repeatedly.rb

@@ -9,7 +9,7 @@ module TryUntil
   #   .rescues([ ArgumentError, IOError ])
   #   .stop_when(lambda { |response| JSON.parse(response.body)['id'] == 'some_id' })
   #   .log_to($stdout)
-  # .execute
+  #   .execute
   #
   # Not all of the above settings are required. These are the default values:
   # attempts   = 3
@@ -23,6 +23,7 @@ module TryUntil
 
     def initialize(probe)
       @probe = probe
+      defaults
     end
 
     def attempts(int_num)
@@ -60,19 +61,14 @@ module TryUntil
     # In case of errors it will rescue those and continue, provided the type
     # of error is among the ones defined in @rescues.
     def execute
-      @attempts = 3 unless @attempts
-      @interval = 0 unless @interval
-      @delay = 0 unless @delay
-      @rescues = [] unless @rescues
-      @stop_when = lambda { |response| false } unless @stop_when
-      @log_to = NullPrinter.new unless @log_to
-
       Kernel.sleep(@delay) if @delay > 0
       count = 0
+      condition_met = false
       while count < @attempts
         begin
           result = @probe.sample
           if @stop_when.call(result)
+            condition_met = true
             log_outcome(count, 'CONDITION_MET')
             return result
           end
@@ -81,8 +77,10 @@ module TryUntil
           log_outcome(count, exception.class)
           raise exception, "During final attempt (#{@attempts} configured) target returned #{exception}" if count + 1 == @attempts
         ensure
-          count += 1
-          Kernel.sleep @interval if @interval > 0
+          unless condition_met
+            count += 1
+            Kernel.sleep @interval if @interval > 0
+          end
         end
       end
       raise "After #{@attempts} attempts, the expected result was not returned!"
@@ -90,12 +88,21 @@ module TryUntil
 
     def configuration
       { :probe => @probe.to_s, :attempts => @attempts, :interval => @interval,
-        :rescues => @rescues, :stop_when => @stop_when }
+        :delay => @delay, :rescues => @rescues, :log_to => @log_to }
     end
 
     private
     def log_outcome(count, outcome)
       @log_to.printf("#{Time.new}|attempt ##{count + 1}|outcome: #{outcome}|#{@attempts - count - 1} attempts left\n")
     end
+
+    def defaults
+      @attempts = 3 unless @attempts
+      @interval = 0 unless @interval
+      @delay = 0 unless @delay
+      @rescues = [] unless @rescues
+      @stop_when = lambda { |response| false } unless @stop_when
+      @log_to = NullPrinter.new unless @log_to
+    end
   end
 end

data/lib/try_until/version.rb

@@ -1,3 +1,3 @@
 module TryUntil
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: try-until
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Markus Krogemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec