polyphony 0.33 → 0.34

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.33'
+  VERSION = '0.34'
 end

data/test/test_fiber.rb

@@ -659,20 +659,41 @@ class FiberTest < MiniTest::Test
     i, o = IO.pipe
     pid = Polyphony.fork do
       i.close
-      f = spin do
+      spin do
         sleep 100
       rescue Exception => e
         o << e.class.to_s
         o.close
+        raise e
       end
-      snooze
+      suspend
     end
     o.close
+    spin do
+      sleep 0.2
+      Process.kill('TERM', pid)
+    end
     Gyro::Child.new(pid).await
     klass = i.read
     i.close
     assert_equal 'Polyphony::Terminate', klass
   end
+
+  def test_setup_raw
+    buffer = []
+    f = Fiber.new { buffer << receive }
+    
+    assert_raises(NoMethodError) { f << 'foo' }
+    snooze
+    f.setup_raw
+    assert_equal Thread.current, f.thread
+    assert_nil f.parent
+
+    f.schedule
+    f << 'bar'
+    snooze
+    assert_equal ['bar'], buffer
+  end
 end
 
 class MailboxTest < MiniTest::Test
@@ -956,76 +977,3 @@ class RestartTest < MiniTest::Test
     assert_equal [f, 'foo', 'bar', :done, f2, 'baz', 42, :done], buffer
   end
 end
-
-class SuperviseTest < MiniTest::Test
-  def test_supervise
-    p = spin { supervise }
-    snooze
-    f1 = p.spin { receive }
-    f2 = p.spin { receive }
-
-    snooze
-    assert_equal p.state, :waiting
-    f1 << 'foo'
-    f1.await
-    snooze
-
-    assert_equal :waiting, p.state
-    assert_equal :waiting, f2.state
-
-    f2 << 'bar'
-    f2.await
-    snooze
-
-    assert_equal :waiting, p.state
-  end
-
-  def test_supervise_with_restart
-    parent = spin { supervise(on_error: :restart) }
-    snooze
-
-    buffer = []
-    f1 = parent.spin do
-      buffer << 'f1'
-      buffer << receive
-    end
-
-    snooze
-    assert_equal ['f1'], buffer
-
-    f1.raise 'foo'
-
-    3.times { snooze }
-
-    assert_equal ['f1', 'f1'], buffer
-    assert_equal :dead, f1.state
-
-    # f1 should have been restarted by supervisor
-    f1 = parent.children.first
-    assert_kind_of Fiber, f1
-    f1 << 'foo'
-
-    f1.await
-    3.times { snooze }
-
-    assert_equal ['f1', 'f1', 'foo'], buffer
-  end
-
-  def test_supervise_with_block
-    failed = []
-    p = spin do
-      supervise(on_error: :restart) { |f, e| failed << [f, e] }
-    end
-    snooze
-    f1 = p.spin { receive }
-    snooze
-
-    f1.raise 'foo'
-    3.times { snooze }
-
-    assert_equal 1, failed.size
-    assert_equal f1, failed.first[0]
-    assert_kind_of RuntimeError, failed.first[1]
-    assert_equal 'foo', failed.first[1].message
-  end
-end

data/test/test_global_api.rb

@@ -121,8 +121,47 @@ class MoveOnAfterTest < MiniTest::Test
     assert t1 - t0 < 0.02
     assert_equal :bar, v
   end
+
+  def test_move_on_after_without_block
+    t0 = Time.now
+    f = move_on_after(0.01, with_value: 'foo')
+    assert_kind_of Fiber, f
+    assert_equal Fiber.current, f.parent
+    v = sleep 1
+    t1 = Time.now
+    assert t1 - t0 < 0.02
+    assert_equal 'foo', v
+  end
+end
+
+class CancelAfterTest < MiniTest::Test
+  def test_cancel_after
+    t0 = Time.now
+
+    assert_raises Polyphony::Cancel do
+      cancel_after(0.01) do
+        sleep 1
+        :foo
+      end
+    end
+    t1 = Time.now
+    assert t1 - t0 < 0.02
+  end
+
+  def test_cancel_after_without_block
+    t0 = Time.now
+    f = cancel_after(0.01)
+    assert_kind_of Fiber, f
+    assert_equal Fiber.current, f.parent
+    assert_raises Polyphony::Cancel do
+      sleep 1
+    end
+    t1 = Time.now
+    assert t1 - t0 < 0.02
+  end
 end
 
+
 class SpinLoopTest < MiniTest::Test
   def test_spin_loop
     buffer = []

data/test/test_kernel.rb

@@ -4,20 +4,18 @@ require_relative 'helper'
 
 class KernelTest < MiniTest::Test
   def test_system_method
+    fn = '/tmp/test_system_method'
+    FileUtils.rm(fn) rescue nil
+
     counter = 0
     timer = spin { throttled_loop(200) { counter += 1 } }
 
     system('sleep 0.01')
     assert(counter >= 2)
 
-    i, o = IO.pipe
-    orig_stdout = $stdout
-    $stdout = o
-    system('echo "hello"')
-    o.close
-    assert_equal "hello\n", i.read
+    system('echo "hello" > ' + fn)
+    assert_equal "hello\n", IO.read(fn)
   ensure
-    $stdout = orig_stdout
     timer&.stop
   end
 

data/test/test_process_supervision.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ProcessSupervisionTest < MiniTest::Test
+  def test_process_supervisor_with_block
+    i, o = IO.pipe
+
+    f = spin do
+      Polyphony.watch_process do
+        i.close
+        sleep 5
+      ensure
+        o << 'foo'
+        o.close
+      end
+      supervise(on_error: :restart)
+    end
+
+    sleep 0.05
+    f.terminate
+    f.await
+
+    o.close
+    msg = i.read
+    i.close
+    assert_equal 'foo', msg
+  end
+
+  def test_process_supervisor_with_cmd
+    fn = '/tmp/test_process_supervisor_with_cmd'
+    FileUtils.rm(fn) rescue nil
+
+    f = spin do
+      Polyphony.watch_process("echo foo >> #{fn}")
+      supervise(on_error: :restart)
+    end
+
+    sleep 0.05
+    f.terminate
+    f.await
+
+    assert_equal "foo\n", IO.read(fn)
+
+  end
+end

data/test/test_signal.rb

@@ -44,11 +44,10 @@ class SignalTrapTest < Minitest::Test
       i.close
       spin do
         spin do
-          sleep 1
+          sleep 5
         rescue ::Interrupt => e
-          # the signal will be trapped in the context of this fiber
+          # the signal should be raised only in the main fiber
           o.puts "1-interrupt"
-          raise e
         end.await
       end.await
     rescue ::Interrupt => e

data/test/test_supervise.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class SuperviseTest < MiniTest::Test
+  def test_supervise
+    p = spin { supervise }
+    snooze
+    f1 = p.spin { receive }
+    f2 = p.spin { receive }
+
+    snooze
+    assert_equal p.state, :waiting
+    f1 << 'foo'
+    f1.await
+    snooze
+
+    assert_equal :waiting, p.state
+    assert_equal :waiting, f2.state
+
+    f2 << 'bar'
+    f2.await
+    snooze
+
+    assert_equal :waiting, p.state
+  end
+
+  def test_supervise_with_restart
+    watcher = spin { receive }
+    parent = spin { supervise(restart: true, watcher: watcher) }
+    snooze
+
+    buffer = []
+    f1 = parent.spin do
+      buffer << 'f1'
+    end
+
+    f1.await
+    assert_equal ['f1'], buffer
+    watcher.await
+    assert_equal ['f1', 'f1'], buffer
+  end
+
+  def test_supervise_with_restart_on_error
+    parent = spin { supervise(restart: true) }
+    snooze
+
+    buffer = []
+    f1 = parent.spin do
+      buffer << 'f1'
+      buffer << receive
+    end
+
+    snooze
+    assert_equal ['f1'], buffer
+
+    f1.raise 'foo'
+
+    3.times { snooze }
+
+    assert_equal ['f1', 'f1'], buffer
+    assert_equal :dead, f1.state
+
+    # f1 should have been restarted by supervisor
+    f1 = parent.children.first
+    assert_kind_of Fiber, f1
+
+    f1 << 'foo'
+    f1.await
+
+    assert_equal ['f1', 'f1', 'foo'], buffer
+  end
+
+  def test_supervisor_termination
+    f = nil
+    p = spin do
+      f = spin { sleep 1 }
+      supervise
+    end
+    sleep 0.01
+
+    p.terminate
+    p.await
+
+    assert :dead, f.state
+    assert :dead, p.state
+  end
+
+  def test_supervisor_termination_with_restart
+    f = nil
+    p = spin do
+      f = spin { sleep 1 }
+      supervise(restart: true)
+    end
+    sleep 0.01
+
+    p.terminate
+    p.await
+
+    assert :dead, f.state
+    assert :dead, p.state
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.33'
+  version: '0.34'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -254,12 +254,30 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/polyphony-debug
 - docs/_config.yml
 - docs/_includes/nav.html
 - docs/_includes/prevnext.html
 - docs/_layouts/default.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
+- docs/api-reference.md
+- docs/api-reference/exception.md
+- docs/api-reference/fiber.md
+- docs/api-reference/io.md
+- docs/api-reference/object.md
+- docs/api-reference/polyphony-baseexception.md
+- docs/api-reference/polyphony-cancel.md
+- docs/api-reference/polyphony-moveon.md
+- docs/api-reference/polyphony-net.md
+- docs/api-reference/polyphony-process.md
+- docs/api-reference/polyphony-resourcepool.md
+- docs/api-reference/polyphony-restart.md
+- docs/api-reference/polyphony-terminate.md
+- docs/api-reference/polyphony-threadpool.md
+- docs/api-reference/polyphony-throttler.md
+- docs/api-reference/polyphony.md
+- docs/api-reference/thread.md
 - docs/assets/img/echo-fibers.svg
 - docs/assets/img/sleeping-fiber.svg
 - docs/faq.md
@@ -287,11 +305,15 @@ files:
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
+- examples/core/forever_sleep.rb
 - examples/core/xx-at_exit.rb
+- examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
+- examples/core/xx-exception-backtrace.rb
+- examples/core/xx-fork-spin.rb
 - examples/core/xx-fork-terminate.rb
 - examples/core/xx-forking.rb
 - examples/core/xx-move_on.rb
@@ -304,9 +326,11 @@ files:
 - examples/core/xx-sleep-forever.rb
 - examples/core/xx-sleeping.rb
 - examples/core/xx-snooze-starve.rb
+- examples/core/xx-spin-fork.rb
 - examples/core/xx-spin_error_backtrace.rb
 - examples/core/xx-state-machine.rb
 - examples/core/xx-stop.rb
+- examples/core/xx-supervise-process.rb
 - examples/core/xx-supervisors.rb
 - examples/core/xx-thread-selector-sleep.rb
 - examples/core/xx-thread-selector-snooze.rb
@@ -381,6 +405,7 @@ files:
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
 - lib/polyphony/adapters/postgres.rb
+- lib/polyphony/adapters/process.rb
 - lib/polyphony/adapters/redis.rb
 - lib/polyphony/adapters/trace.rb
 - lib/polyphony/core/channel.rb
@@ -410,8 +435,10 @@ files:
 - test/test_global_api.rb
 - test/test_io.rb
 - test/test_kernel.rb
+- test/test_process_supervision.rb
 - test/test_resource_pool.rb
 - test/test_signal.rb
+- test/test_supervise.rb
 - test/test_thread.rb
 - test/test_thread_pool.rb
 - test/test_throttler.rb