waitforit 0.0.1.pre1 → 0.0.1.pre2

data/VERSION

@@ -1 +1 @@
-0.0.1.pre1
+0.0.1.pre2

data/lib/waitforit.rb

@@ -12,7 +12,7 @@ class Fixnum
 end
 
 def wait_until opts={}
-  opts.merge!(:timeout_after => 2.seconds,:retry_every => 0.1.seconds)
+  opts = {:timeout_after => 2.seconds,:retry_every => 0.1.seconds}.merge(opts)
   start_time = Time.now
   until Time.now > start_time + opts[:timeout_after]
     return if yield == true

data/spec/waitforit_spec.rb

@@ -9,25 +9,29 @@ describe 'waitforit' do
     end
     end_time.should be < Time.now
   end
-  
+
   it 'should throw an exception if when the prescribed action does not happen in time' do
-    expect{wait_until{false}}.to raise_error RuntimeError
+    expect { wait_until { false } }.to raise_error RuntimeError
   end
-  
+
   it 'should keep trying for a specified period' do
     start_time = Time.now
     wait_time = 1.second
-    
-    lambda{wait_until(:timeout_after => wait_time){false}}
-    
-    (start_time + wait_time).should be >= Time.now 
+
+    lambda { wait_until(:timeout_after => wait_time) { false } }
+
+    (start_time + wait_time).should be >= Time.now
   end
-  
+
   it 'should be possible for user to supply the retry time' do
     count = 0
-    wait_until(:timeout_after => 2.seconds, :retry_every => 0.5.seconds) do
-      count += 1
-      count == 4
+
+    begin
+      wait_until(:timeout_after => 1.second, :retry_every => 0.5.seconds) do
+        count += 1
+      end
+    rescue
+      count.should == 2
     end
   end
 end

data/waitforit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{waitforit}
-  s.version = "0.0.1.pre1"
+  s.version = "0.0.1.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["lashd"]

metadata

@@ -2,7 +2,7 @@
 name: waitforit
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.0.1.pre1
+  version: 0.0.1.pre2
 platform: ruby
 authors: 
 - lashd
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -512404082193466775
+      hash: 2684531027166851086
       segments: 
       - 0
       version: "0"