concurrent-ruby 0.2.2 → 0.3.0.pre.1

data/spec/concurrent/thread_pool_shared.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
-share_examples_for 'Thread Pool' do
+share_examples_for :thread_pool do
+
+  after(:each) do
+    subject.kill
+    sleep(0.1)
+  end
 
   context '#running?' do
 
@@ -25,32 +30,6 @@ share_examples_for 'Thread Pool' do
     end
   end
 
-  context '#shutdown?' do
-
-    it 'returns true if #shutdown is complete' do
-      subject.shutdown
-      sleep(0.1)
-      subject.should be_shutdown
-    end
-
-    it 'returns false when running' do
-      subject.should_not be_shutdown
-    end
-  end
-
-  context '#killed?' do
-
-    it 'returns true if tasks were killed at shutdown' do
-      subject.post{ sleep(1) }
-      subject.kill
-      subject.should be_killed
-    end
-
-    it 'returns false when running' do
-      subject.should_not be_killed
-    end
-  end
-
   context '#shutdown' do
 
     it 'stops accepting new tasks' do
@@ -113,6 +92,14 @@ share_examples_for 'Thread Pool' do
       sleep(1)
       @expected.should be_false
     end
+
+    it 'kills all threads' do
+      100.times { subject << proc{ sleep(1) } }
+      sleep(0.1)
+      Thread.should_receive(:kill).at_least(subject.size).times
+      subject.kill
+      sleep(0.1)
+    end
   end
 
   context '#wait_for_termination' do
@@ -150,12 +137,12 @@ share_examples_for 'Thread Pool' do
     end
 
     it 'returns true when the block is added to the queue' do
-      subject.post{ nil }.should be_true
+      subject.post{ sleep }.should be_true
     end
 
     it 'calls the block with the given arguments' do
       @expected = nil
-      subject.post(1, 2, 3)do |a, b, c|
+      subject.post(1, 2, 3) do |a, b, c|
         @expected = a + b + c
       end
       sleep(0.1)
@@ -166,7 +153,7 @@ share_examples_for 'Thread Pool' do
       subject.post{ sleep(1) }
       subject.shutdown
       @expected = nil
-      subject.post(1, 2, 3)do |a, b, c|
+      subject.post(1, 2, 3) do |a, b, c|
         @expected = a + b + c
       end
       @expected.should be_nil
@@ -181,7 +168,7 @@ share_examples_for 'Thread Pool' do
     it 'rejects the block once shutdown' do
       subject.shutdown
       @expected = nil
-      subject.post(1, 2, 3)do |a, b, c|
+      subject.post(1, 2, 3) do |a, b, c|
         @expected = a + b + c
       end
       @expected.should be_nil

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
 require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
 SimpleCov.start do
   project_name 'concurrent-ruby'
   add_filter '/md/'
@@ -12,8 +19,6 @@ require 'eventmachine'
 require 'concurrent'
 require 'concurrent/functions'
 
-require 'functional'
-
 # import all the support files
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }
 
@@ -27,6 +32,8 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
+    Thread.list.each do |thread|
+      thread.kill unless thread == Thread.current
+    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.pre.1
 platform: ruby
 authors:
 - Jerry D'Antonio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: functional-ruby
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-      Modern concurrency tools including agents, futures, promises, thread pools, reactors, supervisors, and more.
+      Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
       Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
 email: jerry.dantonio@gmail.com
 executables: []
@@ -52,7 +52,7 @@ files:
 - LICENSE
 - lib/concurrent/agent.rb
 - lib/concurrent/cached_thread_pool.rb
-- lib/concurrent/defer.rb
+- lib/concurrent/channel.rb
 - lib/concurrent/event.rb
 - lib/concurrent/event_machine_defer_proxy.rb
 - lib/concurrent/executor.rb
@@ -64,27 +64,25 @@ files:
 - lib/concurrent/null_thread_pool.rb
 - lib/concurrent/obligation.rb
 - lib/concurrent/promise.rb
-- lib/concurrent/reactor/drb_async_demux.rb
-- lib/concurrent/reactor/tcp_sync_demux.rb
-- lib/concurrent/reactor.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
 - md/agent.md
-- md/defer.md
 - md/event.md
 - md/executor.md
 - md/future.md
 - md/goroutine.md
 - md/obligation.md
 - md/promise.md
+- md/reactor.md
+- md/supervisor.md
 - md/thread_pool.md
 - spec/concurrent/agent_spec.rb
 - spec/concurrent/cached_thread_pool_spec.rb
-- spec/concurrent/defer_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
@@ -96,13 +94,11 @@ files:
 - spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
-- spec/concurrent/reactor/drb_async_demux_spec.rb
-- spec/concurrent/reactor/tcp_sync_demux_spec.rb
-- spec/concurrent/reactor_spec.rb
+- spec/concurrent/runnable_shared.rb
+- spec/concurrent/runnable_spec.rb
 - 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
 homepage: http://www.concurrent-ruby.com
 licenses:
@@ -122,20 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Modern concurrency tools including agents, futures, promises, thread pools,
-  reactors, and more.
+  actors, and more.
 test_files:
 - spec/concurrent/agent_spec.rb
 - spec/concurrent/cached_thread_pool_spec.rb
-- spec/concurrent/defer_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
@@ -147,11 +143,9 @@ test_files:
 - spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
-- spec/concurrent/reactor/drb_async_demux_spec.rb
-- spec/concurrent/reactor/tcp_sync_demux_spec.rb
-- spec/concurrent/reactor_spec.rb
+- spec/concurrent/runnable_shared.rb
+- spec/concurrent/runnable_spec.rb
 - 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

data/lib/concurrent/defer.rb

@@ -1,65 +0,0 @@
-require 'thread'
-
-require 'concurrent/global_thread_pool'
-
-module Concurrent
-
-  IllegalMethodCallError = Class.new(StandardError)
-
-  class Defer
-    include UsesGlobalThreadPool
-
-    def initialize(opts = {}, &block)
-      operation = opts[:op] || opts[:operation]
-      @callback = opts[:cback] || opts[:callback]
-      @errorback = opts[:eback] || opts[:error] || opts[:errorback]
-      thread_pool = opts[:pool] || opts[:thread_pool]
-
-      raise ArgumentError.new('no operation given') if operation.nil? && ! block_given?
-      raise ArgumentError.new('two operations given') if ! operation.nil? && block_given?
-
-      @operation = operation || block
-
-      if operation.nil?
-        @running = false
-      else
-        self.go
-      end
-    end
-
-    def then(&block)
-      raise IllegalMethodCallError.new('a callback has already been provided') unless @callback.nil?
-      raise IllegalMethodCallError.new('the defer is already running') if @running
-      raise ArgumentError.new('no block given') unless block_given?
-      @callback = block
-      return self
-    end
-
-    def rescue(&block)
-      raise IllegalMethodCallError.new('a errorback has already been provided') unless @errorback.nil?
-      raise IllegalMethodCallError.new('the defer is already running') if @running
-      raise ArgumentError.new('no block given') unless block_given?
-      @errorback = block
-      return self
-    end
-    alias_method :catch, :rescue
-    alias_method :on_error, :rescue
-
-    def go
-      return nil if @running
-      @running = true
-      Defer.thread_pool.post { fulfill }
-      return nil
-    end
-
-    private
-
-    # @private
-    def fulfill # :nodoc:
-      result = @operation.call
-      @callback.call(result) unless @callback.nil?
-    rescue Exception => ex
-      @errorback.call(ex) unless @errorback.nil?
-    end
-  end
-end

data/lib/concurrent/reactor.rb

@@ -1,166 +0,0 @@
-require 'thread'
-require 'functional'
-require 'concurrent/supervisor'
-
-behavior_info(:sync_event_demux,
-              run: 0,
-              stop: 0,
-              running?: 0,
-              accept: 0,
-              respond: 2)
-
-behavior_info(:async_event_demux,
-              run: 0,
-              stop: 0,
-              running?: 0,
-              set_reactor: 1)
-
-behavior_info(:demux_reactor,
-              handle: -2)
-
-module Concurrent
-
-  class Reactor
-
-    behavior(:demux_reactor)
-    behavior(:runnable)
-
-    RESERVED_EVENTS = [ :stop ]
-
-    EventContext = Struct.new(:event, :args, :callback)
-
-    def initialize(demux = nil)
-      @demux = demux
-      if @demux.nil? || @demux.behaves_as?(:async_event_demux)
-        @sync = false
-        @queue = Queue.new
-        @demux.set_reactor(self) unless @demux.nil?
-      elsif @demux.behaves_as?(:sync_event_demux)
-        @sync = true
-      else
-        raise ArgumentError.new("invalid event demultiplexer '#{@demux}'")
-      end
-
-      @running = false
-      @handlers = Hash.new
-      @mutex = Mutex.new
-    end
-
-    def running?
-      return @running
-    end
-
-    def add_handler(event, &block)
-      raise ArgumentError.new('no block given') unless block_given?
-      event = event.to_sym
-      raise ArgumentError.new("'#{event}' is a reserved event") if RESERVED_EVENTS.include?(event)
-      @mutex.synchronize {
-        @handlers[event] = block
-      }
-      return true
-    end
-
-    def remove_handler(event)
-      handler = @mutex.synchronize {
-        @handlers.delete(event.to_sym)
-      }
-      return ! handler.nil?
-    end
-
-    def stop_on_signal(*signals)
-      signals.each{|signal| Signal.trap(signal){ Thread.new{ self.stop }.abort_on_exception = false}}
-    end
-
-    def handle(event, *args)
-      raise NotImplementedError.new("demultiplexer '#{@demux.class}' is synchronous") if @sync 
-      return [:stopped, 'reactor not running'] unless running?
-      context = EventContext.new(event.to_sym, args.dup, Queue.new)
-      @queue.push(context)
-      return context.callback.pop
-    end
-
-    def run
-      raise StandardError.new('already running') if self.running?
-      @sync ? (@running = true; run_sync) : (@running = true; run_async)
-    end
-    alias_method :run, :run
-
-    def stop
-      return true unless self.running?
-      if @sync
-        @demux.stop
-      else
-        @queue.push(:stop)
-      end
-      return true
-    end
-
-    private
-
-    def handle_event(context)
-      raise ArgumentError.new('no block given') unless block_given?
-
-      handler = @mutex.synchronize {
-        @handlers[context.event]
-      }
-
-      if handler.nil?
-         response = yield(:noop, "'#{context.event}' handler not found")
-      else
-        begin
-          result = handler.call(*context.args)
-          response = yield(:ok, result)
-        rescue Exception => ex
-          response = yield(:ex, ex)
-        end
-      end
-
-      return response
-    end
-
-    def finalize_stop
-      @mutex.synchronize do
-        @running = false
-        @demux.stop unless @demux.nil?
-        @demux = nil
-      end
-    end
-
-    def run_sync
-      @demux.run
-
-      loop do
-        break unless @demux.running?
-        context = @demux.accept
-        begin
-          if context.nil?
-            @demux.stop
-          else
-            response = handle_event(context) do |result, message|
-              [result, message]
-            end
-            @demux.respond(*response)
-          end
-        rescue Exception => ex
-          @demux.respond(:abend, ex)
-        end
-      end
-
-      finalize_stop
-    end
-
-    def run_async
-      @demux.run unless @demux.nil?
-
-      loop do
-        context = @queue.pop
-        break if context == :stop
-        handle_event(context) do |result, message|
-          context.callback.push([result, message])
-        end
-      end
-
-      finalize_stop
-    end
-  end
-end