try-until 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU5N2NkZTJlMjgxODcyZTZkZjM4YzM1MDQyMWY2NGE2M2YzNjZmZg==
+    OTQ3ZDA3YmRlZDlhMjYwNjhmYjJhMWU4ZTI3ZDJlODdjMmIzOTA1NA==
   data.tar.gz: !binary |-
-    NjljNDU1NmFkZjgyNjFhNmVmZGFkNDFkNTUzZjdiYjcxYzJmYWEzNg==
+    N2U0ZWI4N2M5MWZlMDY2MmYxZmI4OTY1YzM0YTc3ZjJlZjBjNDc1ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODgzMDIxMzY3ZWY3Mzc1OWI5MTdjYTQ3OWZlZjI0NGNjZmIzY2QzM2QwOWVm
-    ZWY5MDIyYTBiM2I3MWU4OTdiNTIyMDc3ZGQwY2E4OTczYjhiYWE0ZjExY2Rm
-    MzA2NzhkYmNiODlmMmVlNGNlNjhkY2Q4YWJhYjVhMTBiMjNhMTk=
+    NmFlNWRhNjlmN2E1NTQ4ZDIwN2JlMjc4NjU0N2MxOGY0YTc4OTNiOGQ5ZGMw
+    Mzg1NzdlYjAwZmE5N2I3M2ZkMGJlOTMzNDdmZGMxOWZkMTA5Y2YzNmY5YTNk
+    NmIwMTQ5NzBhZWU3NzdlZGY1ZGU2NTEwNzZkNmUyZDMxNjZlNDI=
   data.tar.gz: !binary |-
-    YzgzZDBhNGM3MzBkMGFjYmVmNzM5NTg1MThhMzhmNjRhMDg4YjlmMmIwODIx
-    ZWM2ZmY2YTRjZGM1M2U2NDFkZjMyNzVlMzU0M2QzZTdiZDE1ZWZlZTQ0Yjk1
-    NWNkZWU3Zjg2NmIyZDJkYzdlMTFhN2VjOTM1NDdkZjVhMjY0OWM=
+    NDY4ZmE2YmIzM2FhZWNkMjc5NzNlZTYxNzRlMjU2MzI4OGZhNGNhMzRlNjM1
+    MDIyYTk1MmJmYTU5MjcxZDc2NzRjMjg5NTkyNTRiYWU1OTdhMDFkOGE2OTcx
+    MmRjNmZlMDFkMGEwNmYwODkzMjgwY2Y5MjZhMjVjNTM4ZGE5Mzg=

data/lib/try_until/repeatedly.rb

@@ -62,9 +62,9 @@ module TryUntil
     # of error is among the ones defined in @rescues.
     def execute
       Kernel.sleep(@delay) if @delay > 0
-      count = 0
+      count = 1
       condition_met = false
-      while count < @attempts
+      while count <= @attempts
         begin
           result = @probe.sample
           if @stop_when.call(result)
@@ -75,11 +75,11 @@ module TryUntil
           log_outcome(count, 'CONDITION_NOT_MET')
         rescue *@rescues => exception
           log_outcome(count, exception.class)
-          raise exception, "During final attempt (#{@attempts} configured) target returned #{exception}" if count + 1 == @attempts
+          raise exception, "During final attempt (#{@attempts} configured) target returned #{exception}" if count == @attempts
         ensure
           unless condition_met
+            Kernel.sleep @interval if @interval > 0 && count < @attempts
             count += 1
-            Kernel.sleep @interval if @interval > 0
           end
         end
       end
@@ -93,7 +93,7 @@ module TryUntil
 
     private
     def log_outcome(count, outcome)
-      @log_to.printf("#{Time.new}|attempt ##{count + 1}|outcome: #{outcome}|#{@attempts - count - 1} attempts left\n")
+      @log_to.printf("#{Time.new}|attempt ##{count}|outcome: #{outcome}|#{@attempts - count} attempts left\n")
     end
 
     def defaults

data/lib/try_until/version.rb

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

metadata

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