ntl-orchestra 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: c39c9dc0144c1c80a6a7a2bf82769fbfb1e17603
-  data.tar.gz: b58e51cb70edf817f0ff32efd3fa09e9753e1193
-SHA512:
-  metadata.gz: b10b097ed0729846e3ff79f43798efd3ca2ce25c6dd4f3b08f6571d43ee6add23152ff87f469dd2e55bd114ae0bcffd242f3baf6ea2435356a44ad51cbf938f6
-  data.tar.gz: 94b4a02725e1a1b12dc11d864bf462882927637b98e283cef9303dab5c1f5a6e077223f158c4b4ccabb82faaa5c92d50f2a6d611ee4c8ec78e2a101000f51ed4
+--- 
+SHA1: 
+  metadata.gz: 7a3c2a8f906bac033bc49fd31c5c785d61fcc665
+  data.tar.gz: b7909a5e4a439b36f0e133a98356a176fe31f31d
+SHA512: 
+  metadata.gz: b29d023f1ec08bd492365f926d328aa2bc8568d92e67bfb030dbe9807935a465efbc15eb4a95da256aac47590ab0a23c103e07196a4d2a2526e832b46db15ea0
+  data.tar.gz: 191c785e486a990ea5a30284f14098174de61f0f55dfb416b5ca5fdee5d4ad95a7dfff89225ff4b95fdd8ca13bffacef488253e162deb37fdfc4f6a46f3afcd4

data/README.md

@@ -296,7 +296,7 @@ Orchestra::Operation.new do
 end
 ```
 
-The third is a minor variation of the second. The only difference is that the operation will always return `true`. `finally` makes sense for operations that perform side effects (e.g. Command objects), wherease `result` will make sense for queries.
+The third is a minor variation of the second. The only difference is that the operation will always return `true`. `finally` makes sense for operations that perform side effects (e.g. Command objects), whereas `result` will make sense for queries.
 
 ```ruby
 Orchestra::Operation.new do
@@ -493,7 +493,7 @@ Embedded performances will inherit the observers of the outer operation.
 
 ## Recording and playing back services
 
-The final main feature of Orchestra is the ability to record the service calls throughout an operation. These recordings can then be used to replay operations. This could be helpful, for instance, to attach to exceptions in your exception logging service so that programmers can replay failed performances on their development environments. In addition, these recordings could be used to drive integration testing. Thus, instead of using separate tools such as like ActiveRecord fixtures, FactoryGirl, and VCR for every service dependency, you can test your operations with one single setup artifact.
+The final main feature of Orchestra is the ability to record the service calls throughout an operation. These recordings can then be used to replay operations. This could be helpful, for instance, to attach to exceptions in your exception logging service so that programmers can replay failed performances on their development environments. In addition, these recordings could be used to drive integration testing. Thus, instead of using separate tools such as ActiveRecord fixtures, FactoryGirl, and VCR for every service dependency, you can test your operations with one single setup artifact.
 
 You can record a performance on any `Conductor` by calling `#record` instead of `#perform`:
 

data/lib/orchestra/thread_pool.rb

@@ -15,7 +15,7 @@ module Orchestra
     def initialize args = {}
       @timeout, _ = Util.extract_key_args args, :timeout_ms => 1000
       @threads = Set.new
-      @dead_pool = Set.new
+      @dying = Queue.new
       @pool_lock = Mutex.new
       @queue = Queue.new
       @jobs = {}
@@ -70,34 +70,49 @@ module Orchestra
     end
 
     def update event, *;
-      reap_dead_pool if event == :failed
-    end
-
-    def with_timeout &block
-      Timeout.timeout Rational(timeout, 1000), &block
+      return unless event == :failed
+      reap_thread
     end
 
     private
 
     def add_thread!
-      wait_for_thread_count_to_change do
-        thr = Thread.new &method(:thread_loop)
-        @threads << thr
-      end
+      old_count = queue.num_waiting
+      thr = Thread.new &method(:thread_loop)
+      Thread.pass while thr.status == 'run'
+      @threads << thr
       true
     end
 
-    def reap_dead_pool
-      @dead_pool.each &:join
-      @dead_pool.clear
-    end
-
     def remove_thread!
-      wait_for_thread_count_to_change do queue << :terminate end
-      sleep Rational(1, 10000) # FIXME
+      queue << :terminate
+      reap_thread
       true
     end
 
+    def reap_thread
+      thread = @dying.pop
+      @threads.delete thread
+      thread.join
+    end
+
+    def thread_loop
+      Thread.current.abort_on_exception = false
+      until (job = queue.pop) == :terminate
+        job.perform
+        Thread.pass
+      end
+    rescue => error
+      add_thread!
+      job.set_error error
+    ensure
+      @dying << Thread.current
+    end
+
+    def while_locked &block
+      @pool_lock.synchronize &block
+    end
+
     class Job
       include Observable
 
@@ -136,28 +151,5 @@ module Orchestra
       Failed = Module.new
     end
 
-    def thread_loop
-      Thread.current.abort_on_exception = false
-      until (job = queue.pop) == :terminate
-        job.perform
-      end
-    rescue => error
-      add_thread!
-      job.set_error error
-    ensure
-      @threads.delete Thread.current
-      @dead_pool << Thread.current
-    end
-
-    def wait_for_thread_count_to_change
-      old_count = queue.num_waiting
-      yield
-    ensure
-      Thread.pass while queue.num_waiting == old_count
-    end
-
-    def while_locked &block
-      @pool_lock.synchronize do with_timeout &block end
-    end
   end
 end

data/lib/orchestra/version.rb

@@ -1,3 +1,3 @@
 module Orchestra
-  VERSION = "0.9.1" unless defined? VERSION
+  VERSION = "0.9.2" unless defined? VERSION
 end

data/test/integration/multithreading_test.rb

@@ -20,15 +20,19 @@ class MultithreadingTest < Minitest::Test
   end
 
   def test_multithreading
-    list = (1..100).to_a
+    list = (1..1000).to_a
 
     thread_ids = @conductor.perform @operation, :list => list
 
-    assert thread_ids.uniq.size > 2, "performance must be spread across threads"
+    assert_equal(
+      @conductor.thread_count,
+      thread_ids.uniq.size,
+      "performance must be spread across threads",
+    )
   end
 
   def test_exception_during_multithreading
-    list = (1..100).to_a
+    list = (1..50).to_a
     list[23] = :blow_up
 
     assert_raises CustomError do

data/test/unit/thread_pool_test.rb

@@ -2,6 +2,7 @@ class ThreadPoolTest < Minitest::Test
   def setup
     @thread_pool = Orchestra::ThreadPool.new
     @thread_pool.count = 5
+    @iterations = Integer(ENV['THREAD_POOL_ITERATIONS'] || 50)
   end
 
   def teardown
@@ -14,7 +15,7 @@ class ThreadPoolTest < Minitest::Test
   end
 
   def test_shutting_down
-    100.times do |idx|
+    @iterations.times do |idx|
       assert_equal 5, @thread_pool.count
       begin
         @thread_pool.shutdown
@@ -28,23 +29,26 @@ class ThreadPoolTest < Minitest::Test
   end
 
   def test_adjusting_thread_count_is_robust
-    iterate = lambda { |delta|
+    iterate = lambda { |delta, idx|
       old_count = @thread_pool.count
       new_count = old_count + delta
-      expected_status = ['sleep'] * new_count
       @thread_pool.count = new_count
-      assert_equal expected_status, @thread_pool.status, "going from #{old_count} ⇒ #{new_count}"
+      assert_equal(
+        new_count,
+        @thread_pool.count,
+        "going from #{old_count} ⇒ #{new_count}; size is #{@thread_pool.count}, idx=#{idx}",
+      )
     }
 
-    # Add 100 times
-    100.times do iterate.call 1 end
-
-    # Remove 100 times
-    100.times do iterate.call -1 end
+    # Add/remove @iteration times
+    @iterations.times do |idx|
+      iterate.call  1, idx
+      iterate.call -1, idx
+    end
   end
 
   def test_performing_work
-    100.times do
+    @iterations.times do
       result = @thread_pool.perform do :deadbeef end
 
       assert_equal :deadbeef, result
@@ -52,22 +56,22 @@ class ThreadPoolTest < Minitest::Test
   end
 
   def test_enqueueing_work
-    jobs = 100.times.map do |num|
+    jobs = @iterations.times.map do |num|
       @thread_pool.enqueue do (num + 1) * 2 end
     end
 
     result = jobs.map &:wait
 
-    assert_equal 100, result.uniq.size
-    assert_equal 2,   result.first
-    assert_equal 200, result.last
+    assert_equal @iterations,     result.uniq.size
+    assert_equal 2,               result.first
+    assert_equal @iterations * 2, result.last
   end
 
   def test_handling_exceptions
     Thread.current.abort_on_exception = false
     old_thread_count = @thread_pool.count
 
-    input = 100.times.to_a
+    input = @iterations.times.to_a
     input << nil
 
     10.times do
@@ -78,7 +82,7 @@ class ThreadPoolTest < Minitest::Test
       end
     end
 
-    assert_equal ['sleep'] * old_thread_count, @thread_pool.status
+    assert_equal old_thread_count, @thread_pool.count
   end
 
   def test_observing_jobs

metadata

@@ -1,80 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ntl-orchestra
-version: !ruby/object:Gem::Version
-  version: 0.9.1
+version: !ruby/object:Gem::Version 
+  version: 0.9.2
 platform: ruby
-authors:
+authors: 
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-12-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id003 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  prerelease: false
   name: invokr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id001
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.6"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+  version_requirements: *id002
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id004
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "10.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  version_requirements: *id005
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-description: Orchestra is an orchestration framework for designing complex operations
-  in an object oriented fashion.
-email:
+description: Orchestra is an orchestration framework for designing complex operations in an object oriented fashion.
+email: 
 - nathanladd+github@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -117,30 +103,29 @@ files:
 - test/unit/util_test.rb
 - tmp/.keep
 homepage: https://github.com/ntl/orchestra
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Orchestrate complex operations with ease.
-test_files:
+test_files: 
 - test/examples/fizz_buzz.rb
 - test/examples/invitation_service.rb
 - test/integration/multithreading_test.rb