concurrent-ruby 0.6.0 → 0.6.1

data/spec/concurrent/agent_spec.rb

@@ -20,7 +20,7 @@ module Concurrent
     end
 
     context '#send_off' do
-      subject { Agent.new 2 }
+      subject { Agent.new 2, executor: executor }
 
       it 'executes post and post-off in order' do
         subject.post { |v| v + 2 }
@@ -164,7 +164,7 @@ module Concurrent
         subject.post { nil }
         sleep(0.1)
         subject.
-            instance_variable_get(:@one_by_one).
+            instance_variable_get(:@serialized_execution).
             instance_variable_get(:@stash).
             size.should eq 2
       end

data/spec/concurrent/configuration_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 module Concurrent
 
   describe Configuration do
-    with_full_reset
-
     it 'creates a global timer pool' do
       Concurrent.configuration.global_timer_set.should_not be_nil
       Concurrent.configuration.global_timer_set.should respond_to(:post)

data/spec/concurrent/executor/thread_pool_shared.rb

@@ -100,6 +100,36 @@ share_examples_for :executor_service do
     end
   end
 
+  context '#shutdown followed by #wait_for_termination' do
+    it "allows in-progress tasks to complete" do
+      @expected = false
+      subject.post{ sleep 0.1; @expected = true }
+      subject.shutdown
+      subject.wait_for_termination(1)
+      @expected.should be_true
+    end
+
+    it 'allows pending tasks to complete' do
+      @expected = false
+      subject.post{ sleep(0.1) }
+      subject.post{ sleep(0.1); @expected = true }
+      subject.shutdown
+      subject.wait_for_termination(1)
+      @expected.should be_true
+    end
+
+    it "stops accepting/running new tasks" do
+      @expected = :start
+      subject.post{ sleep(0.1) }
+      subject.post{ sleep(0.1); @expected = :should_be_run }
+      subject.shutdown
+      subject.post{ @expected = :should_not_be_run }
+      subject.wait_for_termination(1)
+      @expected.should == :should_be_run
+    end
+  end
+
+
   context '#kill' do
 
     it 'stops accepting new tasks' do

data/spec/concurrent/scheduled_task_spec.rb

@@ -7,8 +7,6 @@ require_relative 'observable_shared'
 module Concurrent
 
   describe ScheduledTask do
-    with_full_reset
-
     context 'behavior' do
 
       # obligation
@@ -56,9 +54,9 @@ module Concurrent
       it_should_behave_like :dereferenceable
 
       # observable
-      
+
       subject{ ScheduledTask.new(0.1){ nil } }
-      
+
       def trigger_observable(observable)
         observable.execute
         sleep(0.2)

data/spec/concurrent/supervisor_spec.rb

@@ -65,6 +65,7 @@ module Concurrent
 
     after(:each) do
       subject.stop
+      kill_rogue_threads
       sleep(0.1)
     end
 
@@ -846,7 +847,7 @@ module Concurrent
           supervisor = Supervisor.new(restart_strategy: :one_for_one,
                                       monitor_interval: 0.1)
           supervisor.add_worker(error_class.new)
-          supervisor.should_receive(:exceeded_max_restart_frequency?).once.and_return(true)
+          supervisor.stub(:exceeded_max_restart_frequency?).once.and_return(true)
           future = Concurrent::Future.execute{ supervisor.run }
           future.value(1)
           supervisor.should_not be_running

data/spec/concurrent/timer_task_spec.rb

@@ -5,8 +5,6 @@ require_relative 'observable_shared'
 module Concurrent
 
   describe TimerTask do
-    with_full_reset
-
     before(:each) do
       # suppress deprecation warnings.
       Concurrent::TimerTask.any_instance.stub(:warn)

data/spec/spec_helper.rb

@@ -28,4 +28,14 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require Fil
 
 RSpec.configure do |config|
   config.order = 'random'
+
+  config.before(:each) do
+    #TODO: Better configuration management in individual test suites
+    reset_gem_configuration
+  end
+
+  config.after(:each) do
+    #TODO: Better thread management in individual test suites
+    kill_rogue_threads(false)
+  end
 end

data/spec/support/example_group_extensions.rb

@@ -22,27 +22,31 @@ module Concurrent
       RbConfig::CONFIG['ruby_install_name']=~ /^rbx$/i
     end
 
-    def reset_gem_configuration
-      Concurrent.instance_variable_set(:@configuration, Concurrent::Configuration.new)
+    def do_no_reset!
+      @do_not_reset = true
     end
 
-    extend self
-  end
-end
+    @@killed = false
 
-class RSpec::Core::ExampleGroup
-  def self.with_full_reset
-    before(:each) do
-      reset_gem_configuration
+    def reset_gem_configuration
+      Concurrent.instance_variable_get(:@configuration).value = Concurrent::Configuration.new if @@killed
+      @@killed = false
     end
 
-    after(:each) do
+    def kill_rogue_threads(warning = true)
+      return if @do_not_reset
+      warn('[DEPRECATED] brute force thread control being used -- tests need updated') if warning
       Thread.list.each do |thread|
         thread.kill unless thread == Thread.current
       end
+      @@killed = true
     end
+
+    extend self
   end
+end
 
+class RSpec::Core::ExampleGroup
   include Concurrent::TestHelpers
   extend Concurrent::TestHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jerry D'Antonio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
@@ -18,9 +18,9 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
+- LICENSE.txt
 files:
-- LICENSE
+- LICENSE.txt
 - README.md
 - lib/concurrent.rb
 - lib/concurrent/actor/actor.rb
@@ -31,7 +31,6 @@ files:
 - lib/concurrent/actress/context.rb
 - lib/concurrent/actress/core.rb
 - lib/concurrent/actress/core_delegations.rb
-- lib/concurrent/actress/doc.md
 - lib/concurrent/actress/envelope.rb
 - lib/concurrent/actress/errors.rb
 - lib/concurrent/actress/reference.rb
@@ -72,7 +71,6 @@ files:
 - lib/concurrent/executor/java_fixed_thread_pool.rb
 - lib/concurrent/executor/java_single_thread_executor.rb
 - lib/concurrent/executor/java_thread_pool_executor.rb
-- lib/concurrent/executor/one_by_one.rb
 - lib/concurrent/executor/per_thread_executor.rb
 - lib/concurrent/executor/ruby_cached_thread_pool.rb
 - lib/concurrent/executor/ruby_fixed_thread_pool.rb
@@ -80,6 +78,7 @@ files:
 - lib/concurrent/executor/ruby_thread_pool_executor.rb
 - lib/concurrent/executor/ruby_thread_pool_worker.rb
 - lib/concurrent/executor/safe_task_executor.rb
+- lib/concurrent/executor/serialized_execution.rb
 - lib/concurrent/executor/single_thread_executor.rb
 - lib/concurrent/executor/thread_pool_executor.rb
 - lib/concurrent/executor/timer_set.rb

data/lib/concurrent/actress/doc.md

@@ -1,53 +0,0 @@
-# Light-weighted implement of Actors. Inspired by Akka and Erlang.
-
-Actors are using a thread-pool by default which makes them very cheap to create and discard.
-Thousands of actors can be created allowing to brake the program to small maintainable pieces
-without breaking single responsibility principles.
-
-## Quick example
-    
-    class Counter
-      include Context
-    
-      def initialize(initial_value)
-        @count = initial_value
-      end
-    
-      def on_message(message)
-        case message
-        when Integer
-          @count += message
-        when :terminate
-          terminate!
-        else
-          raise 'unknown'
-        end
-      end
-    end
-    
-    # create new actor
-    counter = Counter.spawn(:test_counter, 5) # => a Reference
-    
-    # send messages
-    counter.tell(1) # => counter
-    counter << 1 # => counter
-    
-    # send messages getting an IVar back for synchronization
-    counter.ask(0) # => an ivar
-    counter.ask(0).value # => 7
-    
-    # terminate the actor
-    counter.ask(:terminate).wait
-    counter.terminated? # => true
-    counter.ask(5).wait.rejected? # => true
-    
-    # failure on message processing will terminate the actor
-    counter = Counter.spawn(:test_counter, 0)
-    counter.ask('boom').wait.rejected? # => true
-    counter.terminated? # => true
-
-
-    
-
-
-