delayer-deferred 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fb3ffd22cfc243b60926a084efa91b6f9dee15
-  data.tar.gz: f73bcf244106e7699719884d36d374d52be94080
+  metadata.gz: 37e4d01b997cbcc9e878f5743755883123843d4f
+  data.tar.gz: f43c013e223a6f30da88a500237fbb1920473e26
 SHA512:
-  metadata.gz: ac64243c4a9440c32086bb99a94de79339b57f2aca5c57f2f068249d7adc9ac09736c09d7e8ccca220acbc52157c843eba3be63fe8577b1cd1e21b6f0cdbbc86
-  data.tar.gz: 7ec556c87dad8a807a1d9e2318678f3f5fd95dd5accab5c18228194902ac4cc22b85eae1d39cb913f28cffda006bc22751b72306938ee82453be65b9cb918293
+  metadata.gz: e53e3785d68e9c69431742d81efaa936ee80a93cf726c0c42f022732e120cbb7b5a08036743081b780e9548d7fbe4d797b1688c2a4ec68fd8a4e0a072770a860
+  data.tar.gz: dd6d334922b6e999fd2f2eb90fc3fccd656d038d76cfa10b6742961246c1feaca452862837a57c8a3dc33d2ed4257df38fbc401f15e5a40f505f8b8fdab53c6f

data/.gitignore

@@ -12,4 +12,5 @@
 *.o
 *.a
 mkmf.log
-/vendor/
+/vendor/
+/Guardfile

data/delayer-deferred.gemspec

@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.7"
   spec.add_development_dependency "ruby-prof"
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-shell'
+  spec.add_development_dependency 'guard-rake'
 end

data/lib/delayer/deferred/deferred.rb

@@ -51,12 +51,13 @@ module Delayer::Deferred
     end
 
     def self.fiber(&block)
-      @_fiber ||= Fiber.new do |b|
-        loop do
-          b = Fiber.yield(b.())
-        end
+      @_fiber ||= _gen_new_fiber
+      begin
+        result = @_fiber.resume(block)
+      rescue FiberError
+        @_fiber = _gen_new_fiber
+        result = @_fiber.resume(block)
       end
-      result = @_fiber.resume(block)
       if result.is_a?(Delayer::Deferred::ResultContainer)
         result
       else
@@ -65,5 +66,13 @@ module Delayer::Deferred
         return result, _fiber
       end
     end
+
+    def self._gen_new_fiber
+      Fiber.new do |b|
+        loop do
+          b = Fiber.yield(b.())
+        end
+      end
+    end
   end
 end

data/lib/delayer/deferred/tools.rb

@@ -40,7 +40,7 @@ module Delayer::Deferred
     # Kernel#systemを呼び出して、コマンドが成功たら成功するDeferredを返す。
     # 失敗した場合、trap{}ブロックには $? の値(Process::Status)か、例外が発生した場合それが渡される
     # ==== Args
-    # [*args] Kernel#system の引数
+    # [*args] Kernel#spawn の引数
     # ==== Return
     # Deferred
     def system(*args)
@@ -50,7 +50,7 @@ module Delayer::Deferred
         if status && status.success?
           status
         else
-          raise ForeignCommandAborted.new("command aborted: #{args.join(' ')}", process: $?) end
+          raise ForeignCommandAborted.new("command aborted: #{args.join(' ')}", process: status) end
       }
     end
   end

data/lib/delayer/deferred/version.rb

@@ -1,5 +1,5 @@
 module Delayer
   module Deferred
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/test/deferred_test.rb

@@ -213,6 +213,47 @@ describe(Delayer::Deferred) do
     end
   end
 
+  describe 'recursive delayer' do
+    it 'Deferred#next call in Deferred.next' do
+      delayer = Delayer.generate_class
+      buf = []
+      erra = errb = errc = nil
+      eval_all_events(delayer) do
+        delayer.Deferred.next{
+          buf << 'begin A'
+          delayer.run
+          buf << 'end A'
+        }.trap{|err|
+          erra = err
+        }
+        delayer.Deferred.next{
+          buf << 'begin B'
+          delayer.run
+          buf << 'end B'
+        }.trap{|err|
+          errb = err
+        }
+        delayer.Deferred.next{
+          buf << 'begin C'
+          delayer.run
+          buf << 'end C'
+        }.trap{|err|
+          errc = err
+        }
+
+      end
+      refute erra
+      refute errb
+      refute errc
+      assert_includes buf, 'begin A'
+      assert_includes buf, 'end A'
+      assert_includes buf, 'begin B'
+      assert_includes buf, 'end B'
+      assert_includes buf, 'begin C'
+      assert_includes buf, 'end C'
+    end
+  end
+
   describe "Deferredable#system" do
     it "command successed" do
       succeed = failure = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayer-deferred
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayer
@@ -86,6 +86,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deferred for Delayer.
 email:
 - toshi.alternative@gmail.com