sync-defer 0.9.5 → 0.9.6

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## sync-defer 0.9.6 -- 2012-09-13
+
+* Fixed call stacks information in the warning.
+* Properly detect if we're inside a fiber.
+
 ## sync-defer 0.9.5 -- 2012-03-21
 
 * Also fall back whenever it's not wrapped inside a fiber.

data/README.md

@@ -14,7 +14,7 @@ Synchronous deferred operations with fibers (coroutines)
 
 ## REQUIREMENTS:
 
-* Either cool.io or eventmachine
+* Either eventmachine or cool.io
 * Ruby 1.9+ (or if fibers could be used in Ruby 1.8)
 
 ## INSTALLATION:
@@ -47,6 +47,19 @@ Remember to wrap a fiber around the client, and inside the client:
 
   Full examples with reactor turned on:
 
+* with eventmachine:
+
+  ``` ruby
+      EM.run{
+        Fiber.new{
+          # or EM::SyncDefer
+          SyncDefer.defer{ sleep(5) }
+          puts "DONE"
+          EM.stop
+        }.resume
+      }
+  ```
+
 * with cool.io:
 
   ``` ruby
@@ -62,19 +75,6 @@ Remember to wrap a fiber around the client, and inside the client:
       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

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.5'
+    s.version = '0.9.6'
 
     %w[].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/sync-defer.rb

@@ -17,30 +17,33 @@ module SyncDefer
 
   module_function
   def defer *args, &block
-    if root_fiber?
-      fallback("Not called inside a fiber.", *args, &block)
+    if fiber_wrapped?
+      if Object.const_defined?(:EventMachine) &&
+         EventMachine.reactor_running?
+        EventMachine::SyncDefer.defer(*args, &block)
 
-    elsif Object.const_defined?(:EventMachine) &&
-          EventMachine.reactor_running?
-      EventMachine::SyncDefer.defer(*args, &block)
+      elsif Object.const_defined?(:Coolio) &&
+            Coolio::Loop.default.has_active_watchers?
+        Coolio::SyncDefer.defer(*args, &block)
 
-    elsif Object.const_defined?(:Coolio) &&
-          Coolio::Loop.default.has_active_watchers?
-      Coolio::SyncDefer.defer(*args, &block)
+      else
+        fallback("No reactor found.", *args, block)
+      end
 
     else
-      fallback("No reactor found.", *args, block)
+      fallback("Not called inside a fiber.", *args, &block)
     end
   end
 
-  def root_fiber?
-    RootFiber == Fiber.current
+  def fiber_wrapped?
+    # because under a thread, Fiber.current won't return the root fiber
+    RootFiber != Fiber.current && Thread.main == Thread.current
   end
 
   def fallback message, *args, &block
     $stderr.puts("SyncDefer: WARN: #{message}")
     $stderr.puts("           Falling back to run the computation directly.")
-    $stderr.puts("           Called from: #{caller.last(5).inspect}")
+    $stderr.puts("           Called from: #{caller.first(5).inspect}")
     args << block if block_given?
     if args.size == 1
       args.first.call

data/sync-defer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-03-21"
+  s.date = "2012-09-13"
   s.description = "Synchronous deferred operations with fibers (coroutines)"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   "test/test_sync-defer.rb"]
   s.homepage = "https://github.com/godfat/sync-defer"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
+  s.rubygems_version = "1.8.24"
   s.summary = "Synchronous deferred operations with fibers (coroutines)"
   s.test_files = ["test/test_sync-defer.rb"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync-defer
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Synchronous deferred operations with fibers (coroutines)
 email:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Synchronous deferred operations with fibers (coroutines)