sync-defer 0.9.2 → 0.9.3

data/CHANGES.md

@@ -1,10 +1,15 @@
 # CHANGES
 
+## sync-defer 0.9.3 -- 2012-03-20
+
+* Also work without a reactor in the generic interface: `SyncDefer.defer`,
+  but print a warning about it.
+
 ## sync-defer 0.9.2 -- 2012-03-20
 
 * Properly select the reactor.
 
-* Make it exception aware. If there's an exception raised in the
+* Made it exception aware. If there's an exception raised in the
   computation, sync-defer would resume back and raise that exception.
 
 ## sync-defer 0.9.1 -- 2012-02-25

data/README.md

@@ -25,69 +25,70 @@ Synchronous deferred operations with fibers (coroutines)
 
 Remember to wrap a fiber around the client, and inside the client:
 
-### Generic interface which would select underneath reactor automatically:
-
-``` ruby
-    # Single computation:
-    puts(SyncDefer.defer{
-                           sleep(10) # any CPU-bound operations
-                           100})     # 100
-    puts "DONE"
-
-    # Multiple computations:
-    puts(SyncDefer.defer(lambda{
-                           sleep(10) # any CPU-bound operations
-                           100
-                         },
-                         lambda{
-                           sleep(5)  # any CPU-bound operations
-                           50}))     # [100, 50] # it would match the index
-    puts "DONE"
-```
-
-Full examples with reactor turned on:
-
-### with cool.io:
-
-``` ruby
-    # only for adding at least one watcher in the loop
-    Coolio::TimerWatcher.new(1).attach(Coolio::Loop.default).on_timer{detach}
-
-    Fiber.new{
-      # or Coolio::SyncDefer
-      SyncDefer.defer{ sleep(10) }
+* Generic interface which would select underneath reactor automatically:
+
+  ``` ruby
+      # Single computation:
+      puts(SyncDefer.defer{
+                             sleep(5) # any CPU-bound operations
+                             100})    # 100
       puts "DONE"
-    }.resume
-    Coolio::Loop.default.run
-```
 
-### with eventmachine:
+      # Multiple computations:
+      puts(SyncDefer.defer(lambda{
+                             sleep(5) # any CPU-bound operations
+                             100
+                           },
+                           lambda{
+                             sleep(2) # any CPU-bound operations
+                             50}))    # [100, 50] # it would match the index
+      puts "DONE"
+  ```
 
-``` ruby
-    EM.run{
-      Fiber.new{
-        # or EM::SyncDefer
-        SyncDefer.defer{ sleep(10) }
-        puts "DONE"
-        EM.stop
-      }.resume
-    }
-```
+  Full examples with reactor turned on:
+
+* with cool.io:
 
-### No problems with exceptions, use them as normal:
+  ``` ruby
+      # only for adding at least one watcher in the loop
+      Coolio::TimerWatcher.new(1).
+        attach(Coolio::Loop.default).on_timer{detach}
 
-``` ruby
-    EM.run{
       Fiber.new{
-        begin
-          SyncDefer.defer{ raise "BOOM" }
-        rescue => e
-          p e
-        end
-        EM.stop
+        # or Coolio::SyncDefer
+        SyncDefer.defer{ sleep(5) }
+        puts "DONE"
       }.resume
-    }
-```
+      Coolio::Loop.default.run
+  ```
+
+* with eventmachine:
+
+  ``` ruby
+      EM.run{
+        Fiber.new{
+          # or EM::SyncDefer
+          SyncDefer.defer{ sleep(5) }
+          puts "DONE"
+          EM.stop
+        }.resume
+      }
+  ```
+
+* No problems with exceptions, use them as normal:
+
+  ``` ruby
+      EM.run{
+        Fiber.new{
+          begin
+            SyncDefer.defer{ raise "BOOM" }
+          rescue => e
+            p e
+          end
+          EM.stop
+        }.resume
+      }
+  ```
 
 ## CONTRIBUTORS:
 

data/Rakefile

@@ -8,7 +8,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'sync-defer'
-    s.version = '0.9.2'
+    s.version = '0.9.3'
 
     %w[].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/sync-defer.rb

@@ -18,7 +18,11 @@ module SyncDefer
           Coolio::Loop.default.has_active_watchers?
       Coolio::SyncDefer.defer(*args, &block)
     else
-      raise "No reactor found. Only cool.io and eventmachine are supported."
+      $stderr.puts("SyncDefer: WARN: No reactor found. " \
+                   "Only cool.io and eventmachine are supported.")
+      $stderr.puts("           Called from: #{caller.last(5).inspect}")
+      args << block if block_given?
+      args.map(&:call)
     end
   end
 end

data/sync-defer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]

data/test/test_sync-defer.rb

@@ -15,8 +15,8 @@ begin
   [Coolio::SyncDefer, SyncDefer].each do |defer|
     describe defer do
       before do
-        stub(Object).const_defined?(:EventMachine){ false }
-        stub(Object).const_defined?(:Coolio)      { true  }
+        @watcher = Coolio::AsyncWatcher.new.attach(Coolio::Loop.default)
+        @watcher.on_signal{detach}
       end
 
       after do
@@ -29,6 +29,7 @@ begin
           result << defer.defer{ sleep 0.1; result << 0; 1 }
           result << defer.defer(lambda{ 2 })
           result << 3
+          @watcher.signal
         }.resume
         Coolio::Loop.default.run
         result.should.eql [0, 1, 2, 3]
@@ -40,6 +41,7 @@ begin
             result.concat(defer.defer(lambda{ sleep 0.1; 1 },
                                       lambda{ result << 0; 2 }))
             result << 3
+            @watcher.signal
           }.resume
         Coolio::Loop.default.run
         result.should.eql [0, 1, 2, 3]
@@ -50,6 +52,7 @@ begin
           lambda{
             defer.defer{ raise TestException }
           }.should.raise(TestException)
+          @watcher.signal
         }.resume
         Coolio::Loop.default.run
       end
@@ -63,6 +66,7 @@ begin
           lambda{
             defer.defer(lambda{}, lambda{ raise TestException })
           }.should.raise(TestException)
+          @watcher.signal
         }.resume
         Coolio::Loop.default.run
       end
@@ -76,10 +80,6 @@ begin
   require 'eventmachine/sync-defer'
   [EventMachine::SyncDefer, SyncDefer].each do |defer|
     describe defer do
-      before do
-        stub(Object).const_defined?(:EventMachine){ true }
-      end
-
       after do
         RR.verify
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync-defer
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors: