em-ventually 0.1.0 → 0.1.1

data/README.md

@@ -7,7 +7,7 @@ Your tests will eventually pass. You're not sure when, but you know it'll be qui
 Take this trivial example. (It's in Minitest, but you can use whatever test suite you'd like*)
 
 ~~~~~ {ruby}
-    def test_em_simple
+    def test_em_simple1
       val = nil
       EM.add_timer(0.5) { val = 'test' }
     end
@@ -22,7 +22,7 @@ So, you want to test that val is 'test', and as well, you want EM to start on th
 Taking the example above you can enqueue a test.
 
 ~~~~~ {ruby}
-    def test_em_simple
+    def test_em_simple2
       val = nil
       EM.add_timer(0.5) { val = 'test' }
       eventually('test') { val }
@@ -32,7 +32,7 @@ Taking the example above you can enqueue a test.
 This will poll your block every 0.1 seconds to see if the condition is true. After one second, if it's still not true, it will fail. You can mess with both values by passing in `:every` and `:total`. For example:
 
 ~~~~~ {ruby}
-    def test_em_simple
+    def test_em_simple3
       val = nil
       EM.add_timer(0.5) { val = 'test' }
       eventually('test', :every => 0.2, :total => 10) { val } # check every 0.2 seconds
@@ -43,7 +43,7 @@ This will poll your block every 0.1 seconds to see if the condition is true. Aft
 You can also parallelize tests if you don't want them to run serially.
 
 ~~~~~ {ruby}
-    def test_em_simple
+    def test_em_simple4
       val1, val2 = nil, nil
       EM.add_timer(0.5) { val1 = 'test1' }
       EM.add_timer(0.5) { val2 = 'test2' }
@@ -57,10 +57,10 @@ You can also parallelize tests if you don't want them to run serially.
 As well, simple returning doesn't always cover your test. You can pass values back for equality by doing the following.
 
 ~~~~~ {ruby}
-    def test_em_simple
+    def test_em_simple5
       val = nil
       EM.add_timer(0.5) { val = 'test1' }
-      eventually('test1') { |test| test[val1] } # The secret sauce is if you called
+      eventually('test1') { |with| with[val] } # The secret sauce is if you called
                                                 # `eventually` with a block that takes a parameter or not.
     end
 ~~~~~
@@ -74,7 +74,19 @@ There are a couple of global options you can mess with too. `EM::Ventually.every
 If you don't pass a value to eventually, it will test that your value is true (in the ruby sense). Optionally, you can call `.test` to pass a custom tester.
 
 ~~~~~ {ruby}
-    def test_em_with_test
-      eventually(3.5).test{ |v| v < 4 }
+    def test_em_with_test6
+      count = 0
+      EM.add_periodic_timer(0.01) { count += 0.5 }
+      eventually { count }.test{ |v| v >= 3 }
+    end
+~~~~~
+
+of course, you're gonna be writing so many of these we've aliased it to make your tests stylish and classy.
+
+~~~~~ {ruby}
+    def test_em_with_test6
+      count = 0
+      EM.add_periodic_timer(0.01) { count += 0.5 }
+      ly { count }.test{ |v| v >= 3 }
     end
 ~~~~~

data/Rakefile

@@ -28,6 +28,18 @@ task :test do
     end
   end
 
+  # test README.md
+  require 'minitest/autorun'
+  require 'eventmachine'
+  $LOAD_PATH << 'lib'
+  require 'em-ventually'
+  class ReadmeTest < MiniTest::Unit::TestCase
+    include EM::Ventually
 
+    readme = File.read('./README.md')
+    readme.scan(/~~~~~ \{ruby\}\n(.*?)~~~~~/m).each do |block|
+      class_eval(block.join)
+    end
+  end
 end
 

data/em-ventually.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',     '~> 0.8.7'
   s.add_development_dependency 'phocus'
   s.add_development_dependency 'bundler',  '~> 1.0.0'
+  s.add_development_dependency 'minitest', '~> 2.0.0'
 end

data/lib/em-ventually.rb

@@ -41,6 +41,7 @@ module EventMachine
       end
       cls.new(_pool, self, Callsite.parse(caller.first), expectation, opts, block)
     end
+    alias_method :ly, :eventually
 
     def parallel(&blk)
       _pool.in_parallel do

data/lib/em-ventually/eventually.rb

@@ -11,11 +11,11 @@ module EventMachine
       def initialize(pool, runner, caller, expectation, opts, block)
         @pool, @runner, @caller, @expectation, @opts, @block = pool, runner, caller, expectation, opts, block
         @count = 0
-        @pool.push self
+        @pool.push(self)
         @total_time = opts && opts[:total] || EventMachine::Ventually.total_default
         @every_time = opts && opts[:every] || EventMachine::Ventually.every_default
         @test_blk = expectation.nil? ? proc{|r| r } : proc{|r| expectation == r}
-        EM.add_timer(0.05) { run }
+        @run_timer = EM.add_timer(0.05) { run }
       end
 
       def test(&blk)
@@ -35,6 +35,7 @@ module EventMachine
       end
 
       def run
+        EM.cancel_timer(@run_timer)
         if @pool.should_run?(self)
           kill_timer
           if @block.arity != 1

data/lib/em-ventually/eventually/minitest.rb

@@ -7,6 +7,8 @@ module EventMachine
             ::MiniTest::Unit::TestCase.class_eval <<-EOT, __FILE__, __LINE__ + 1
             include EM::Ventually::Emify
             alias_method :__original__send__, :__send__
+            old_warning_level = $VERBOSE
+            $VERBOSE = nil
             def __send__(*args, &blk)
               if Callsite.parse(caller.first).method == 'run'
                 _em { __original__send__(*args, &blk) }
@@ -14,6 +16,7 @@ module EventMachine
                 __original__send__(*args, &blk)
               end
             end
+            $VERBOSE = old_warning_level
             EOT
           end
         end

data/lib/em-ventually/eventually/testunit.rb

@@ -7,6 +7,8 @@ module EventMachine
             ::Test::Unit::TestCase.class_eval <<-EOT, __FILE__, __LINE__ + 1
             include EM::Ventually::Emify
             alias_method :__original__send__, :__send__
+            old_warning_level = $VERBOSE
+            $VERBOSE = nil
             def __send__(*args, &blk)
               if Callsite.parse(caller.first).method == 'run'
                 _em { __original__send__(*args, &blk) }
@@ -14,6 +16,7 @@ module EventMachine
                 __original__send__(*args, &blk)
               end
             end
+            $VERBOSE = old_warning_level
             EOT
           end
         end

data/lib/em-ventually/pool.rb

@@ -21,8 +21,10 @@ module EventMachine
 
       def push(e)
         if @store.last.is_a?(Array)
+          @store.last.last.run unless @store.last.last.nil?
           @store.last.push(e)
         else
+          @store.last.run unless @store.last.nil?
           @store.push(e)
         end
       end

data/lib/em-ventually/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Ventually
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: em-ventually
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -108,6 +108,22 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id007
 description: Eventually, your tests should pass in EventMachine.
 email: 
 - joshbuddy@gmail.com