fibre 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07320e52433387848e04df86513a2084afb47c5f
-  data.tar.gz: 00fcf61e035ed39c5dcde9307f42511891051785
+  metadata.gz: 076cc4e6dae00554040ca8e3063d3469a63e1324
+  data.tar.gz: f741ab822b35765328caf475e4b86e65e1e21c2b
 SHA512:
-  metadata.gz: 345d4ddf8891a06747a859fd8d63eec61239eab74d5f91e97cc99d8a573e901eab0da69f1f5a5f5cc319c8fe6d2b10b5b0c3fa7f68138389cd2c56fc915ebc09
-  data.tar.gz: bb604e4a82e42707b733b8f356b8fc6e91821d63cd202d6e7aa2a6e345dee4478732332a6b91ffec5ebdd9ad3a8cbbcfb809d0c6f5c9a6dffaba4a0ea42704b7
+  metadata.gz: bf5708e702e36d8e118ed143f719bd20da66a37298055546f970aa3f124a4e7b957cf03bc81725c837fcbf22baaca982064668b589a817bca497a0c461d95eba
+  data.tar.gz: c88451330fecee054e8c7bcb4f1ba803d3fbab4ff43062ec6f5ea0b045b02d34be5e0a076f6eff3dfaedbd49cc231b38087519142156b196f12edf069569a3a0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 che
+Copyright (c) 2014 Inre Storm
 
 MIT License
 

data/README.md

@@ -29,18 +29,4 @@ Fibre.pool_size = 10
 Fibre.pool.checkout do
   puts "runned in fiber"
 end
-# some fiber raised exception
-using EventObject
-Fibre.pool.on :error do |e|
-  puts e.to_s
-  exit
-end
 ```
-
-## Contributing
-
-1. Fork it ( https://github.com/chelovekov/fibre/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/fibre.gemspec

@@ -6,8 +6,8 @@ require 'fibre/version'
 Gem::Specification.new do |spec|
   spec.name          = "fibre"
   spec.version       = Fibre::VERSION
-  spec.authors       = ["che"]
-  spec.email         = ["max@kupibilet.ru"]
+  spec.authors       = ["inre"]
+  spec.email         = ["inre.storm@gmail.com"]
   spec.summary       = %q{Fibre - fiber pool, mock and scoping fibres}
   #spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = '>= 2.1.0'
   spec.required_rubygems_version = '>= 2.3.0'
 
-  spec.add_development_dependency "eventmachine", "~> 1.0.3"
+  spec.add_development_dependency "eventmachine-le"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3"

data/lib/fibre.rb

@@ -2,6 +2,7 @@ require "event_object"
 require "fibre/version"
 require "fibre/core_ext/fiber"
 require "fibre/core_ext/synchrony"
+require "fibre/fiber_error"
 
 module Fibre
   autoload :FiberPool,    'fibre/fiber_pool'
@@ -12,8 +13,6 @@ module Fibre
     autoload :FiberPool,  'fibre/rack/fiber_pool'
   end
 
-  class LeaveError < StandardError; end
-
   # Configuration module
 
   extend self

data/lib/fibre/core_ext/fiber.rb

@@ -30,24 +30,23 @@ class Fiber
     end
 
     def sync(*a, &b)
-      Fibre::Scope.scope? ? Fibre::Scope.sync(*a, &b) : sync_it(*a, &b)
+      Fibre::Scope.scope? ? Fibre::Scope.sync(*a, &b) : wait(*a, &b)
     end
 
     # raise exception if we catch exception
     def yield!
       Fiber.yield.tap do |y|
-        raise y if y.is_a?(Exception)
+        raise FiberError.new(y) if y.is_a?(Exception)
       end
     end
 
-
-    def sync_it
+    def wait
       yield(Fiber.current) if block_given?
       Fiber.yield!
     end
   end
 
-  def leave(exception=Fibre::LeaveError, message=nil)
-    resume exception.new(message)
+  def leave(exception, message=nil) # deprecated
+    raise exception.new(message)
   end
 end

data/lib/fibre/fiber_error.rb

@@ -0,0 +1,18 @@
+class FiberError < StandardError
+  attr_accessor :parent
+
+  def initialize parent = $!
+    @parent = parent
+    super(parent && parent.to_s)
+  end
+
+  def set_backtrace backtrace
+    bt = backtrace
+    if parent
+      bt = parent.backtrace
+      bt << "<<< parent fiber: #{parent.class.name}: #{parent}"
+      bt.concat backtrace
+    end
+    super bt
+  end
+end

data/lib/fibre/fiber_pool.rb

@@ -7,17 +7,12 @@
 #  pool.checkout do
 #    puts "runned in fiber"
 #  end
-#
-#  # some fiber raised exception
-#  pool.on :error do |e|
-#    puts e.to_s
-#  end
 
 module Fibre
   using EventObject
 
   class FiberPool
-    events :error, :before, :after
+    events :before, :after
 
     # Initialize fibers pool
     def initialize(size)
@@ -37,8 +32,9 @@ module Fibre
       end
 
       @pool.shift.tap do |fiber|
-        @reserved[fiber.object_id] = fiber
-        fiber.resume(spec)
+        @reserved[fiber.object_id] = spec
+        err = fiber.resume(spec)
+        raise FiberError.new(err) if err.is_a?(Exception)
       end
 
       self
@@ -64,19 +60,19 @@ module Fibre
       loop do
         raise "wrong spec in fiber block" unless spec.is_a?(Hash)
 
+        result = nil
         begin
           before!(spec)
           spec[:block].call# *Fiber.current.args
           after!(spec)
-        # catch ArgumentError, IOError, EOFError, IndexError, LocalJumpError, NameError, NoMethodError
-        # RangeError, FloatDomainError, RegexpError, RuntimeError, SecurityError, SystemCallError
-        # SystemStackError, ThreadError, TypeError, ZeroDivisionError
+
+          # catch ArgumentError, IOError, EOFError, IndexError, LocalJumpError, NameError, NoMethodError
+          # RangeError, FloatDomainError, RegexpError, RuntimeError, SecurityError, SystemCallError
+          # SystemStackError, ThreadError, TypeError, ZeroDivisionError
         rescue StandardError => e
-          raise e if error.empty?
-          error!(e)
-        # catch NoMemoryError, ScriptError, SignalException, SystemExit, fatal etc
-        rescue Exception => e
-          raise e
+          result = e
+          # catch NoMemoryError, ScriptError, SignalException, SystemExit, fatal etc
+          #rescue Exception
         end
 
         unless @queue.empty?
@@ -84,15 +80,15 @@ module Fibre
           next
         end
 
-        spec = checkin
+        spec = checkin(result)
       end
     end
 
     # Check-in fiber to pool
-    def checkin
+    def checkin(result=nil)
       @reserved.delete ::Fiber.current.object_id
       @pool.unshift ::Fiber.current
-      ::Fiber.yield
+      ::Fiber.yield result
     end
   end
 end

data/lib/fibre/version.rb

@@ -1,3 +1,3 @@
 module Fibre
-  VERSION = "0.9.7"
+  VERSION = "0.9.9"
 end

data/spec/fibre_spec.rb

@@ -21,7 +21,7 @@ describe Fibre do
     expect(probe).to receive(:call)
     Fibre.pool.checkout(&probe)
   end
-
+=begin
   it "should rescue error in fiber" do
     expect(probe).to receive(:call)
     Fibre.pool.on(:error) do |error|
@@ -32,6 +32,7 @@ describe Fibre do
       raise
     end
   end
+=end
 
   it "should scope" do
     expect(probe).to receive(:call)
@@ -42,14 +43,18 @@ describe Fibre do
     end
   end
 
+  def raise_method
+    raise "test exception"
+  end
+
   it "should raise uncatched exceptions" do
     expect {
       Fibre.pool.checkout do
-        raise
+        raise_method
       end
     }.to raise_error
   end
-
+=begin
   it "should catch exception" do
     Fibre.pool.on :error do |error|
       # catch exception here
@@ -61,7 +66,7 @@ describe Fibre do
       end
     }.to_not raise_error
   end
-
+=end
   describe "in fiber specs" do
 
     around do |examples|
@@ -84,6 +89,20 @@ describe Fibre do
       end
     end
 
+    class FibreTestOperationWithException
+      def initialize(number)
+        @number = number
+      end
+
+      def sync
+        Fiber.sync do |f|
+          Fibre.pool.checkout do
+            raise "test"
+          end
+        end
+      end
+    end
+
     it "should Fiber.sync works well" do
       result = Fiber.sync do |fiber|
         EM.next_tick do
@@ -93,14 +112,19 @@ describe Fibre do
       expect(result).to be :success
     end
 
-    it "should method leave raise exception" do
+    it "should raise exception in fiber" do
       expect {
-        Fiber.sync do |fiber|
-          EM.next_tick do
-            fiber.leave
-          end
+        Fibre.pool.checkout do
+          raise "test"
         end
-      }.to raise_error Fibre::LeaveError
+      }.to raise_error FiberError
+    end
+
+    it "should sync with exception" do
+      expect {
+        op = FibreTestOperationWithException.new(4)
+        op.sync
+      }.to raise_error FiberError
     end
 
     it "should sync array (scoping test)" do
@@ -132,7 +156,7 @@ describe Fibre do
           op45: [op4, { op5: op5 }]
         }
       }.sync!
-      
+
       expect(res).to include(
         op3: 5,
         ops: match_array([3,13]),

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fibre
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
-- che
+- inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: eventmachine-le
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.9'
 description: 
 email:
-- max@kupibilet.ru
+- inre.storm@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,6 +96,7 @@ files:
 - lib/fibre.rb
 - lib/fibre/core_ext/fiber.rb
 - lib/fibre/core_ext/synchrony.rb
+- lib/fibre/fiber_error.rb
 - lib/fibre/fiber_pool.rb
 - lib/fibre/mock.rb
 - lib/fibre/rack/fiber_pool.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Fibre - fiber pool, mock and scoping fibres