concurrent-ruby 0.1.1.pre.5 → 0.1.1

data/spec/concurrent/fixed_thread_pool_spec.rb

@@ -41,7 +41,7 @@ module Concurrent
     context '#kill' do
 
       it 'kills all threads' do
-        Thread.should_receive(:kill).at_least(5).times
+        Thread.should_receive(:kill).exactly(5).times
         pool = FixedThreadPool.new(5)
         pool.kill
         sleep(0.1)
@@ -74,9 +74,10 @@ module Concurrent
       it 'restarts threads that experience exception' do
         pool = FixedThreadPool.new(5)
         3.times{ pool << proc{ raise StandardError } }
-        sleep(5)
+        sleep(2)
         pool.size.should eq 5
         pool.status.should_not include(nil)
+        #pool.status.include?(nil).should be_false
       end
     end
   end

data/spec/concurrent/future_spec.rb

@@ -9,7 +9,7 @@ module Concurrent
     let!(:rejected_reason) { StandardError.new('mojo jojo') }
 
     let(:pending_subject) do
-      Future.new{ sleep(3); fulfilled_value }
+      Future.new{ sleep(2) }
     end
 
     let(:fulfilled_subject) do
@@ -21,7 +21,7 @@ module Concurrent
     end
 
     before(:each) do
-      Future.thread_pool = FixedThreadPool.new(1)
+      $GLOBAL_THREAD_POOL = CachedThreadPool.new
     end
 
     it_should_behave_like Obligation
@@ -40,7 +40,7 @@ module Concurrent
     context '#initialize' do
 
       it 'spawns a new thread when a block is given' do
-        Future.thread_pool.should_receive(:post).once.with(any_args())
+        $GLOBAL_THREAD_POOL.should_receive(:post).once.with(any_args())
         Future.new{ nil }
       end
 
@@ -102,6 +102,13 @@ module Concurrent
         it 'aliases #deref for #value' do
           fulfilled_subject.deref.should eq fulfilled_value
         end
+
+        it 'aliases Kernel#future for Future.new' do
+          future().should be_a(Future)
+          future(){ nil }.should be_a(Future)
+          future(1, 2, 3).should be_a(Future)
+          future(1, 2, 3){ nil }.should be_a(Future)
+        end
       end
     end
   end

data/spec/concurrent/goroutine_spec.rb

@@ -48,20 +48,5 @@ module Concurrent
       sleep(0.1)
       @expected.should eq [1,2,3]
     end
-
-    it 'accepts an alternate thread pool as the first argument' do
-      pool = Concurrent::FixedThreadPool.new(2)
-      pool.should_receive(:post).with(no_args())
-      go(pool){ sleep(0.1) }
-      sleep(0.2)
-    end
-
-    it 'passes all other arguments to the block when a thread pool is given' do
-      @expected = nil
-      pool = Concurrent::FixedThreadPool.new(2)
-      go(pool, 1, 2, 3){|a, b, c| @expected = [c, b, a] }
-      sleep(0.1)
-      @expected.should eq [3, 2, 1]
-    end
   end
 end

data/spec/concurrent/obligation_shared.rb

@@ -37,7 +37,7 @@ module Concurrent
       it 'returns nil when reaching the optional timeout value' do
         f = pending_subject
         sleep(0.1)
-        f.value(0).should be_nil
+        f.value(0.1).should be_nil
         f.should be_pending
       end
 
@@ -49,22 +49,8 @@ module Concurrent
         f.should be_pending
       end
 
-      it 'returns the value when fulfilled before timeout' do
-        f = pending_subject
-        sleep(0.1)
-        f.value(10).should be_true
-        f.should be_fulfilled
-      end
-
-      it 'returns nil when timeout reached' do
-        f = pending_subject
-        sleep(0.1)
-        f.value(0.1).should be_nil
-        f.should be_pending
-      end
-
       it 'is nil when :pending' do
-        expected = pending_subject.value(0)
+        expected = pending_subject.value
         expected.should be_nil
       end
 

data/spec/concurrent/promise_spec.rb

@@ -9,7 +9,7 @@ module Concurrent
     let!(:rejected_reason) { StandardError.new('mojo jojo') }
 
     let(:pending_subject) do
-      Promise.new{ sleep(3); fulfilled_value }
+      Promise.new{ sleep(1) }
     end
 
     let(:fulfilled_subject) do
@@ -22,7 +22,7 @@ module Concurrent
     end
 
     before(:each) do
-      Promise.thread_pool = FixedThreadPool.new(1)
+      $GLOBAL_THREAD_POOL = CachedThreadPool.new
     end
 
     it_should_behave_like Obligation
@@ -163,9 +163,10 @@ module Concurrent
       end
 
       it 'recursively rejects all children' do
-        p = Promise.new{ raise StandardError.new('Boom!') }
+        p = Promise.new{ Thread.pass; raise StandardError.new('Boom!') }
         promises = 10.times.collect{ p.then{ true } }
         sleep(0.1)
+
         10.times.each{|i| promises[i].should be_rejected }
       end
 
@@ -182,7 +183,7 @@ module Concurrent
           rescue(StandardError){|ex| @expected = 1 }.
           rescue(StandardError){|ex| @expected = 2 }.
           rescue(StandardError){|ex| @expected = 3 }
-        sleep(0.1)
+          sleep(0.1)
         @expected.should eq 1
       end
 
@@ -197,8 +198,6 @@ module Concurrent
       end
 
       it 'searches associated rescue handlers in order' do
-        Promise.thread_pool = CachedThreadPool.new
-
         @expected = nil
         Promise.new{ raise ArgumentError }.
           rescue(ArgumentError){|ex| @expected = 1 }.
@@ -264,7 +263,7 @@ module Concurrent
 
       it 'calls matching rescue handlers on all children' do
         @expected = []
-        Promise.new{ raise StandardError }.
+        Promise.new{ Thread.pass; raise StandardError }.
           then{ sleep(0.1) }.rescue{ @expected << 'Boom!' }.
           then{ sleep(0.1) }.rescue{ @expected << 'Boom!' }.
           then{ sleep(0.1) }.rescue{ @expected << 'Boom!' }.
@@ -274,14 +273,6 @@ module Concurrent
 
         @expected.length.should eq 5
       end
-
-      it 'matches a rescue handler added after rejection' do
-        @expected = false
-        p = Promise.new{ raise StandardError }
-        sleep(0.1)
-        p.rescue(StandardError){ @expected = true }
-        @expected.should be_true
-      end
     end
 
     context 'aliases' do
@@ -307,6 +298,13 @@ module Concurrent
         sleep(0.1)
         @expected.should be_true
       end
+
+      it 'aliases Kernel#promise for Promise.new' do
+        promise().should be_a(Promise)
+        promise(){ nil }.should be_a(Promise)
+        promise(1, 2, 3).should be_a(Promise)
+        promise(1, 2, 3){ nil }.should be_a(Promise)
+      end
     end
   end
 end

data/spec/concurrent/thread_pool_shared.rb

@@ -29,9 +29,8 @@ module Concurrent
 
     context '#shutdown?' do
 
-      it 'returns true if #shutdown is complete' do
+      it 'returns true if #shutdown has been called' do
         subject.shutdown
-        sleep(0.1)
         subject.should be_shutdown
       end
 
@@ -82,9 +81,10 @@ module Concurrent
       end
 
       it 'allows threads to exit normally' do
-        subject.shutdown
+        pool = FixedThreadPool.new(5)
+        pool.shutdown
         sleep(1)
-        subject.status.should be_empty
+        pool.status.should be_empty
       end
     end
 
@@ -139,7 +139,7 @@ module Concurrent
       it 'returns false when shutdown fails to complete before timeout' do
         subject.post{ sleep(1) }
         subject.shutdown
-        subject.wait_for_termination(0.5).should be_false
+        subject.wait_for_termination(0.5).should be_true
       end
     end
 

data/spec/concurrent/utilities_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'thread'
 
 describe 'utilities' do
 
@@ -27,7 +26,7 @@ describe 'utilities' do
     it 'raises an exception if no block is given' do
       lambda {
         atomic()
-      }.should raise_error(ArgumentError)
+      }.should raise_error
     end
 
     it 'creates a new Fiber' do
@@ -43,32 +42,4 @@ describe 'utilities' do
       atomic{ 'foo' }
     end
   end
-
-  context Mutex do
-
-     context '#sync_with_timeout' do
-
-       it 'returns the result of the block if a lock is obtained before timeout' do
-         mutex = Mutex.new
-         result = mutex.sync_with_timeout(30){ 42 }
-         result.should eq 42
-       end
-
-       it 'raises Timeout::Error if the timeout is exceeded' do
-         mutex = Mutex.new
-         thread = Thread.new{ mutex.synchronize{ sleep(30) } }
-         sleep(0.1)
-         lambda {
-           mutex.sync_and_wait(1)
-         }.should raise_error(NoMethodError)
-         Thread.kill(thread)
-       end
-
-       it 'raises an exception if no block given' do
-         lambda {
-           Mutex.new.sync_with_timeout()
-         }.should raise_error(ArgumentError)
-       end
-     end
-  end
 end

data/spec/spec_helper.rb

@@ -1,36 +1,11 @@
-require 'simplecov'
-SimpleCov.start do
-  project_name 'concurrent-ruby'
-  add_filter '/md/'
-  add_filter '/pkg/'
-  add_filter '/spec/'
-  add_filter '/tasks/'
-end
-
 require 'eventmachine'
 
 require 'concurrent'
-require 'concurrent/functions'
-
-require 'rbconfig'
-
-def mri?
-  RbConfig::CONFIG['ruby_install_name'] =~ /^ruby$/i
-end
-
-def jruby?
-  RbConfig::CONFIG['ruby_install_name'] =~ /^jruby$/i
-end
-
-def rbx?
-  RbConfig::CONFIG['ruby_install_name'] =~ /^rbx$/i
-end
 
 # import all the support files
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }
 
 RSpec.configure do |config|
-  config.order = 'random'
 
   config.before(:suite) do
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Jerry D'Antonio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: functional-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -54,18 +54,12 @@ files:
 - lib/concurrent/defer.rb
 - lib/concurrent/event.rb
 - lib/concurrent/event_machine_defer_proxy.rb
-- lib/concurrent/executor.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/reactor/drb_async_demux.rb
-- lib/concurrent/reactor/tcp_sync_demux.rb
-- lib/concurrent/reactor.rb
 - lib/concurrent/thread_pool.rb
 - lib/concurrent/utilities.rb
 - lib/concurrent/version.rb
@@ -74,7 +68,6 @@ files:
 - md/agent.md
 - md/defer.md
 - md/event.md
-- md/executor.md
 - md/future.md
 - md/goroutine.md
 - md/obligation.md
@@ -85,18 +78,11 @@ files:
 - spec/concurrent/defer_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/reactor/drb_async_demux_spec.rb
-- spec/concurrent/reactor/tcp_sync_demux_spec.rb
-- spec/concurrent/reactor_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/utilities_spec.rb
 - spec/spec_helper.rb
@@ -115,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Erlang, Clojure, and Go inspired concurrent programming tools for Ruby.
@@ -130,18 +116,11 @@ test_files:
 - spec/concurrent/defer_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/reactor/drb_async_demux_spec.rb
-- spec/concurrent/reactor/tcp_sync_demux_spec.rb
-- spec/concurrent/reactor_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/utilities_spec.rb
 - spec/spec_helper.rb

data/lib/concurrent/executor.rb

@@ -1,95 +0,0 @@
-require 'thread'
-
-module Concurrent
-
-  module Executor
-    extend self
-
-    class ExecutionContext
-      attr_reader :name
-      attr_reader :execution_interval
-      attr_reader :timeout_interval
-
-      protected
-
-      def initialize(name, execution_interval, timeout_interval, thread)
-        @name = name
-        @execution_interval = execution_interval
-        @timeout_interval = timeout_interval
-        @thread = thread
-        @thread[:stop] = false
-      end
-
-      public
-
-      def status
-        return @thread.status unless @thread.nil?
-      end
-
-      def join(limit = nil)
-        if @thread.nil?
-          return nil
-        elsif limit.nil?
-          return @thread.join
-        else
-          return @thread.join(limit)
-        end
-      end
-
-      def stop
-        @thread[:stop] = true
-      end
-
-      def kill
-        unless @thread.nil?
-          stop
-          Thread.kill(@thread)
-          @thread = nil
-        end
-      end
-      alias_method :terminate, :kill
-    end
-
-    EXECUTION_INTERVAL = 60
-    TIMEOUT_INTERVAL = 30
-
-    STDOUT_LOGGER = proc do |name, level, msg|
-      print "%5s (%s) %s: %s\n" % [level.upcase, Time.now.strftime("%F %T"), name, msg]
-    end
-
-    def run(name, opts = {})
-      raise ArgumentError.new('no block given') unless block_given?
-
-      execution_interval = opts[:execution] || opts[:execution_interval] || EXECUTION_INTERVAL
-      timeout_interval = opts[:timeout] || opts[:timeout_interval] || TIMEOUT_INTERVAL
-      run_now = opts[:now] || opts[:run_now] || false
-      logger = opts[:logger] || STDOUT_LOGGER
-      block_args = opts[:args] || opts [:arguments] || []
-
-      executor = Thread.new(*block_args) do |*args|
-        sleep(execution_interval) unless run_now == true
-        loop do
-          break if Thread.current[:stop]
-          begin
-            worker = Thread.new{ yield(*args) }
-            worker.abort_on_exception = false
-            if worker.join(timeout_interval).nil?
-              logger.call(name, :warn, "execution timed out after #{timeout_interval} seconds")
-            else
-              logger.call(name, :info, 'execution completed successfully')
-            end
-          rescue Exception => ex
-            logger.call(name, :error, "execution failed with error '#{ex}'")
-          ensure
-            Thread.kill(worker)
-            worker = nil
-          end
-          break if Thread.current[:stop]
-          sleep(execution_interval)
-        end
-      end
-
-      return ExecutionContext.new(name, execution_interval, timeout_interval, executor)
-    end
-  end
-end