concurrent-ruby 0.3.0.pre.1 → 0.3.0.pre.2

data/spec/concurrent/supervisor_spec.rb

@@ -8,7 +8,6 @@ module Concurrent
 
     let(:worker_class) do
       Class.new {
-        behavior(:runnable)
         attr_reader :start_count, :stop_count
         def run() @start_count ||= 0; @start_count += 1; return true; end
         def stop() @stop_count ||= 0; @stop_count += 1; return true; end
@@ -296,7 +295,7 @@ module Concurrent
         @thread = Thread.new{ sleep(0.5); supervisor.stop }
         sleep(0.1)
         lambda {
-          Timeout::timeout(1){ supervisor.run }
+          Concurrent::timeout(1){ supervisor.run }
         }.should_not raise_error
         Thread.kill(@thread) unless @thread.nil?
       end

data/spec/concurrent/thread_pool_shared.rb

@@ -43,7 +43,8 @@ share_examples_for :thread_pool do
 
     it 'allows in-progress tasks to complete' do
       @expected = false
-      subject.post{ sleep(0.5); @expected = true }
+      subject.post{ @expected = true }
+      sleep(0.1)
       subject.shutdown
       sleep(1)
       @expected.should be_true
@@ -53,15 +54,20 @@ share_examples_for :thread_pool do
       @expected = false
       subject.post{ sleep(0.2) }
       subject.post{ sleep(0.2); @expected = true }
+      sleep(0.1)
       subject.shutdown
       sleep(1)
       @expected.should be_true
     end
 
     it 'allows threads to exit normally' do
+      before_thread_count = Thread.list.size
+      10.times{ subject << proc{ nil } }
+      sleep(0.1)
+      Thread.list.size.should > before_thread_count
       subject.shutdown
       sleep(1)
-      subject.status.should be_empty
+      Thread.list.size.should == before_thread_count
     end
   end
 
@@ -69,6 +75,7 @@ share_examples_for :thread_pool do
 
     it 'stops accepting new tasks' do
       subject.post{ sleep(1) }
+      sleep(0.1)
       subject.kill
       @expected = false
       subject.post{ @expected = true }.should be_false
@@ -79,6 +86,7 @@ share_examples_for :thread_pool do
     it 'attempts to kill all in-progress tasks' do
       @expected = false
       subject.post{ sleep(1); @expected = true }
+      sleep(0.1)
       subject.kill
       sleep(1)
       @expected.should be_false
@@ -88,43 +96,56 @@ share_examples_for :thread_pool do
       @expected = false
       subject.post{ sleep(0.5) }
       subject.post{ sleep(0.5); @expected = true }
+      sleep(0.1)
       subject.kill
       sleep(1)
       @expected.should be_false
     end
 
     it 'kills all threads' do
+      before_thread_count = Thread.list.size
       100.times { subject << proc{ sleep(1) } }
       sleep(0.1)
-      Thread.should_receive(:kill).at_least(subject.size).times
+      Thread.list.size.should > before_thread_count
       subject.kill
       sleep(0.1)
+      Thread.list.size.should == before_thread_count
     end
   end
 
   context '#wait_for_termination' do
 
-    it 'immediately returns true after shutdown has complete' do
+    it 'immediately returns true when no threads running' do
+      subject.shutdown
+      subject.wait_for_termination.should be_true
+    end
+
+    it 'returns true after shutdown has complete' do
+      10.times { subject << proc{ sleep(0.1) } }
+      sleep(0.1)
       subject.shutdown
       subject.wait_for_termination.should be_true
     end
 
-    it 'blocks indefinitely when timeout it nil' do
+    it 'blocks indefinitely when timeout is nil' do
       subject.post{ sleep(1) }
+      sleep(0.1)
       subject.shutdown
       subject.wait_for_termination(nil).should be_true
     end
 
     it 'returns true when shutdown sucessfully completes before timeout' do
       subject.post{ sleep(0.5) }
+      sleep(0.1)
       subject.shutdown
       subject.wait_for_termination(1).should be_true
     end
 
     it 'returns false when shutdown fails to complete before timeout' do
-      subject.post{ sleep(1) }
+      subject.post{ sleep }
+      sleep(0.1)
       subject.shutdown
-      subject.wait_for_termination(0.5).should be_false
+      subject.wait_for_termination(1).should be_false
     end
   end
 

data/spec/concurrent/utilities_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+module Concurrent
+
+  describe '#timeout' do
+
+    it 'raises an exception if no block is given' do
+      expect {
+        Concurrent::timeout(1)
+      }.to raise_error
+    end
+
+    it 'returns the value of the block on success' do
+      result = Concurrent::timeout(1) { 42 }
+      result.should eq 42
+    end
+
+    it 'raises an exception if the timeout value is reached' do
+      expect {
+        Concurrent::timeout(1){ sleep }
+      }.to raise_error(Concurrent::TimeoutError)
+    end
+
+    it 'bubbles thread exceptions' do
+      expect {
+        Concurrent::timeout(1){ raise NotImplementedError }
+      }.to raise_error
+    end
+
+    it 'kills the thread on success' do
+      result = Concurrent::timeout(1) { 42 }
+      Thread.should_receive(:kill).with(any_args())
+      Concurrent::timeout(1){ 42 }
+    end
+
+    it 'kills the thread on timeout' do
+      Thread.should_receive(:kill).with(any_args())
+      expect {
+        Concurrent::timeout(1){ sleep }
+      }.to raise_error
+    end
+
+    it 'kills the thread on exception' do
+      Thread.should_receive(:kill).with(any_args())
+      expect {
+        Concurrent::timeout(1){ raise NotImplementedError }
+      }.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ end
 require 'eventmachine'
 
 require 'concurrent'
-require 'concurrent/functions'
 
 # import all the support files
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }

data/spec/support/functions.rb

@@ -0,0 +1,17 @@
+require 'rbconfig'
+
+def delta(v1, v2)
+  if block_given?
+    v1 = yield(v1)
+    v2 = yield(v2)
+  end
+  return (v1 - v2).abs
+end
+
+def mri?
+  RbConfig::CONFIG['ruby_install_name']=~ /^ruby$/i 
+end
+
+def jruby?
+  RbConfig::CONFIG['ruby_install_name']=~ /^jruby$/i 
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.1
+  version: 0.3.0.pre.2
 platform: ruby
 authors:
 - Jerry D'Antonio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: functional-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,23 +36,23 @@ extra_rdoc_files:
 files:
 - README.md
 - LICENSE
+- lib/concurrent/actor.rb
 - lib/concurrent/agent.rb
+- lib/concurrent/cached_thread_pool/worker.rb
 - lib/concurrent/cached_thread_pool.rb
-- lib/concurrent/channel.rb
 - lib/concurrent/event.rb
 - lib/concurrent/event_machine_defer_proxy.rb
 - lib/concurrent/executor.rb
+- lib/concurrent/fixed_thread_pool/worker.rb
 - lib/concurrent/fixed_thread_pool.rb
-- lib/concurrent/functions.rb
 - lib/concurrent/future.rb
 - lib/concurrent/global_thread_pool.rb
 - lib/concurrent/goroutine.rb
-- lib/concurrent/null_thread_pool.rb
 - lib/concurrent/obligation.rb
 - lib/concurrent/promise.rb
 - lib/concurrent/runnable.rb
 - lib/concurrent/supervisor.rb
-- lib/concurrent/thread_pool.rb
+- lib/concurrent/utilities.rb
 - lib/concurrent/version.rb
 - lib/concurrent.rb
 - lib/concurrent_ruby.rb
@@ -77,21 +63,18 @@ files:
 - md/goroutine.md
 - md/obligation.md
 - md/promise.md
-- md/reactor.md
 - md/supervisor.md
 - md/thread_pool.md
+- spec/concurrent/actor_spec.rb
 - spec/concurrent/agent_spec.rb
 - spec/concurrent/cached_thread_pool_spec.rb
-- spec/concurrent/channel_spec.rb
 - spec/concurrent/event_machine_defer_proxy_spec.rb
 - spec/concurrent/event_spec.rb
 - spec/concurrent/executor_spec.rb
 - spec/concurrent/fixed_thread_pool_spec.rb
-- spec/concurrent/functions_spec.rb
 - spec/concurrent/future_spec.rb
 - spec/concurrent/global_thread_pool_spec.rb
 - spec/concurrent/goroutine_spec.rb
-- spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
 - spec/concurrent/runnable_shared.rb
@@ -99,7 +82,9 @@ files:
 - spec/concurrent/supervisor_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/uses_global_thread_pool_shared.rb
+- spec/concurrent/utilities_spec.rb
 - spec/spec_helper.rb
+- spec/support/functions.rb
 homepage: http://www.concurrent-ruby.com
 licenses:
 - MIT
@@ -129,18 +114,16 @@ specification_version: 4
 summary: Modern concurrency tools including agents, futures, promises, thread pools,
   actors, and more.
 test_files:
+- spec/concurrent/actor_spec.rb
 - spec/concurrent/agent_spec.rb
 - spec/concurrent/cached_thread_pool_spec.rb
-- spec/concurrent/channel_spec.rb
 - spec/concurrent/event_machine_defer_proxy_spec.rb
 - spec/concurrent/event_spec.rb
 - spec/concurrent/executor_spec.rb
 - spec/concurrent/fixed_thread_pool_spec.rb
-- spec/concurrent/functions_spec.rb
 - spec/concurrent/future_spec.rb
 - spec/concurrent/global_thread_pool_spec.rb
 - spec/concurrent/goroutine_spec.rb
-- spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
 - spec/concurrent/runnable_shared.rb
@@ -148,4 +131,6 @@ test_files:
 - spec/concurrent/supervisor_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/uses_global_thread_pool_shared.rb
+- spec/concurrent/utilities_spec.rb
 - spec/spec_helper.rb
+- spec/support/functions.rb

data/lib/concurrent/functions.rb

@@ -1,105 +0,0 @@
-require 'concurrent/agent'
-require 'concurrent/future'
-require 'concurrent/promise'
-
-module Kernel
-
-  ## agent
-
-  def agent(*args, &block)
-    return Concurrent::Agent.new(*args, &block)
-  end
-  module_function :agent
-
-  def post(object, *args, &block)
-    if object.respond_to?(:post)
-      return object.post(*args, &block)
-    else
-      raise ArgumentError.new('object does not support #post')
-    end
-  end
-  module_function :post
-
-  ## future
-
-  def future(*args, &block)
-    return Concurrent::Future.new(*args, &block)
-  end
-  module_function :future
-
-  ## obligation
-
-  def deref(object, *args, &block)
-    if object.respond_to?(:deref)
-      return object.deref(*args, &block)
-    elsif object.respond_to?(:value)
-      return object.value(*args, &block)
-    else
-      raise ArgumentError.new('object does not support #deref')
-    end
-  end
-  module_function :deref
-
-  def pending?(object)
-    if object.respond_to?(:pending?)
-      return object.pending?
-    else
-      raise ArgumentError.new('object does not support #pending?')
-    end
-  end
-  module_function :pending?
-
-  def fulfilled?(object)
-    if object.respond_to?(:fulfilled?)
-      return object.fulfilled?
-    elsif object.respond_to?(:realized?)
-      return object.realized?
-    else
-      raise ArgumentError.new('object does not support #fulfilled?')
-    end
-  end
-  module_function :fulfilled?
-
-  def realized?(object)
-    if object.respond_to?(:realized?)
-      return object.realized?
-    elsif object.respond_to?(:fulfilled?)
-      return object.fulfilled?
-    else
-      raise ArgumentError.new('object does not support #realized?')
-    end
-  end
-  module_function :realized?
-
-  def rejected?(object)
-    if object.respond_to?(:rejected?)
-      return object.rejected?
-    else
-      raise ArgumentError.new('object does not support #rejected?')
-    end
-  end
-  module_function :rejected?
-
-  ## promise
-
-  # Creates a new promise object. "A promise represents the eventual
-  # value returned from the single completion of an operation."
-  # Promises can be chained in a tree structure where each promise
-  # has zero or more children. Promises are resolved asynchronously
-  # in the order they are added to the tree. Parents are guaranteed
-  # to be resolved before their children. The result of each promise
-  # is passes to each of its children when the child resolves. When
-  # a promise is rejected all its children will be summarily rejected.
-  # A promise added to a rejected promise will immediately be rejected.
-  # A promise that is neither resolved or rejected is pending.
-  #
-  # @param args [Array] zero or more arguments for the block
-  # @param block [Proc] the block to call when attempting fulfillment
-  #
-  # @see Promise
-  # @see http://wiki.commonjs.org/wiki/Promises/A
-  def promise(*args, &block)
-    return Concurrent::Promise.new(*args, &block)
-  end
-  module_function :promise
-end

data/lib/concurrent/null_thread_pool.rb

@@ -1,25 +0,0 @@
-require 'concurrent/global_thread_pool'
-
-module Concurrent
-
-  class NullThreadPool
-    behavior(:global_thread_pool)
-
-    def self.post(*args)
-      Thread.new(*args) do
-        Thread.current.abort_on_exception = false
-        yield(*args)
-      end
-      return true
-    end
-
-    def post(*args, &block)
-      return NullThreadPool.post(*args, &block)
-    end
-
-    def <<(block)
-      NullThreadPool.post(&block)
-      return self
-    end
-  end
-end