dynflow 0.8.9 → 0.8.10

data/test/future_execution_test.rb

@@ -69,11 +69,11 @@ module Dynflow
           execution_plan.result.must_equal :pending
           assert_planning_success execution_plan
           history_names.call(execution_plan).must_equal ['delay']
-          executed = delayed_plan.execute
-          executed.wait
-          executed.value.state.must_equal :stopped
-          executed.value.result.must_equal :success
-          executed.value.execution_history.count.must_equal 3
+          delayed_plan.execute.future.wait
+          executed = world.persistence.load_execution_plan(delayed_plan.execution_plan_uuid)
+          executed.state.must_equal :stopped
+          executed.result.must_equal :success
+          executed.execution_history.count.must_equal 3
         end
 
         it 'expired plans can be failed' do

data/test/middleware_test.rb

@@ -15,7 +15,7 @@ module Dynflow
         delay = world.delay(Support::MiddlewareExample::LoggingAction, { :start_at => Time.now.utc - 60 }, {})
         plan = world.persistence.load_delayed_plan delay.execution_plan_id
         plan.plan
-        plan.execute.wait
+        plan.execute.future.wait
         log.must_equal %w[LogMiddleware::before_delay
                           delay
                           LogMiddleware::after_delay
@@ -125,7 +125,7 @@ module Dynflow
         delay = world.delay(Support::MiddlewareExample::Action, { :start_at => Time.now - 60 })
         plan = world.persistence.load_delayed_plan delay.execution_plan_id
         plan.plan
-        plan.execute.wait
+        plan.execute.future.wait
         log.must_equal ["delay#set-input:#{world.id}",
                         "plan#input:#{world.id}",
                         "input#message:#{world.id}",

data/test/prepare_travis_env.sh

@@ -31,5 +31,5 @@ if [ "$CONCURRENT_RUBY_EXT" = "true" ]; then
   echo "Enabling concurrent-ruby-ext"
   sed -i 's/:concurrent_ruby_ext//'g $BUNDLE_CONFIG
 fi
-
+gem update bundler
 bundle install

data/test/semaphores_test.rb

@@ -0,0 +1,98 @@
+require_relative 'test_helper'
+
+module Dynflow
+  module SemaphoresTest
+    describe ::Dynflow::Semaphores::Stateful do
+
+      let(:semaphore_class) { ::Dynflow::Semaphores::Stateful }
+      let(:tickets_count) { 5 }
+
+      it 'can be used as counter' do
+        expected_state = { :tickets => tickets_count, :free => 4, :meta => {} }
+        semaphore = semaphore_class.new(tickets_count)
+        semaphore.tickets.must_equal tickets_count
+        semaphore.free.must_equal tickets_count
+        semaphore.waiting.must_be_empty
+        semaphore.get.must_equal 1
+        semaphore.free.must_equal tickets_count - 1
+        semaphore.get(3).must_equal 3
+        semaphore.free.must_equal tickets_count - (3 + 1)
+        semaphore.drain.must_equal 1
+        semaphore.free.must_equal tickets_count - (3 + 1 + 1)
+        semaphore.release
+        semaphore.free.must_equal tickets_count - (3 + 1)
+        semaphore.release 3
+        semaphore.free.must_equal tickets_count - 1
+        semaphore.to_hash.must_equal expected_state
+      end
+
+      it 'can have things waiting on it' do
+        semaphore = semaphore_class.new 1
+        allowed = semaphore.wait(1)
+        allowed.must_equal true
+        semaphore.free.must_equal 0
+        allowed = semaphore.wait(2)
+        allowed.must_equal false
+        allowed = semaphore.wait(3)
+        allowed.must_equal false
+        waiting = semaphore.get_waiting
+        waiting.must_equal 2
+        waiting = semaphore.get_waiting
+        waiting.must_equal 3
+      end
+      
+    end
+
+    describe ::Dynflow::Semaphores::Dummy do
+      let(:semaphore_class) { ::Dynflow::Semaphores::Dummy }
+
+      it 'always has free' do
+        semaphore = semaphore_class.new
+        semaphore.free.must_equal 1
+        semaphore.get(5).must_equal 5
+        semaphore.free.must_equal 1
+      end
+
+      it 'cannot have things waiting on it' do
+        semaphore = semaphore_class.new
+        semaphore.wait(1).must_equal true
+        semaphore.has_waiting?.must_equal false
+      end
+    end
+
+    describe ::Dynflow::Semaphores::Aggregating do
+      let(:klass) { ::Dynflow::Semaphores::Aggregating }
+      let(:child_class) { ::Dynflow::Semaphores::Stateful }
+      let(:children) do
+        {
+          :child_A => child_class.new(3),
+          :child_B => child_class.new(2)
+        }
+      end
+
+      def assert_semaphore_state(semaphore, state_A, state_B)
+        semaphore.children[:child_A].free.must_equal state_A
+        semaphore.children[:child_B].free.must_equal state_B
+        semaphore.free.must_equal [state_A, state_B].min
+      end
+
+      it 'can be used as counter' do
+        semaphore = klass.new(children)
+        assert_semaphore_state semaphore, 3, 2
+        semaphore.get.must_equal 1
+        assert_semaphore_state semaphore, 2, 1
+        semaphore.get.must_equal 1
+        assert_semaphore_state semaphore, 1, 0
+        semaphore.get.must_equal 0
+        assert_semaphore_state semaphore, 1, 0
+        semaphore.release
+        assert_semaphore_state semaphore, 2, 1
+        semaphore.release(1, :child_B)
+        assert_semaphore_state semaphore, 2, 2
+        semaphore.drain.must_equal 2
+        assert_semaphore_state semaphore, 0, 0
+      end
+    end
+    
+  end
+end

data/test/test_helper.rb

@@ -166,7 +166,7 @@ module TestHelpers
       return ret if ret
       sleep 0.3
     end
-    raise 'waiting for something to happend was not successful'
+    raise 'waiting for something to happen was not successful'
   end
 
   def executor_id_for_plan(execution_plan_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,7 @@ files:
 - examples/orchestrate.rb
 - examples/orchestrate_evented.rb
 - examples/remote_executor.rb
+- examples/sub_plan_concurrency_control.rb
 - examples/sub_plans.rb
 - lib/dynflow.rb
 - lib/dynflow/action.rb
@@ -420,6 +421,11 @@ files:
 - lib/dynflow/persistence_adapters/sequel_migrations/007_future_execution.rb
 - lib/dynflow/persistence_adapters/sequel_migrations/008_rename_scheduled_plans_to_delayed_plans.rb
 - lib/dynflow/round_robin.rb
+- lib/dynflow/semaphores.rb
+- lib/dynflow/semaphores/abstract.rb
+- lib/dynflow/semaphores/aggregating.rb
+- lib/dynflow/semaphores/dummy.rb
+- lib/dynflow/semaphores/stateful.rb
 - lib/dynflow/serializable.rb
 - lib/dynflow/serializer.rb
 - lib/dynflow/serializers.rb
@@ -436,6 +442,7 @@ files:
 - lib/dynflow/testing/factories.rb
 - lib/dynflow/testing/managed_clock.rb
 - lib/dynflow/testing/mimic.rb
+- lib/dynflow/throttle_limiter.rb
 - lib/dynflow/transaction_adapters.rb
 - lib/dynflow/transaction_adapters/abstract.rb
 - lib/dynflow/transaction_adapters/active_record.rb
@@ -452,6 +459,7 @@ files:
 - test/abnormal_states_recovery_test.rb
 - test/action_test.rb
 - test/clock_test.rb
+- test/concurrency_control_test.rb
 - test/coordinator_test.rb
 - test/dispatcher_test.rb
 - test/execution_plan_test.rb
@@ -462,6 +470,7 @@ files:
 - test/prepare_travis_env.sh
 - test/rescue_test.rb
 - test/round_robin_test.rb
+- test/semaphores_test.rb
 - test/support/code_workflow_example.rb
 - test/support/dummy_example.rb
 - test/support/middleware_example.rb
@@ -519,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine
@@ -527,6 +536,7 @@ test_files:
 - test/abnormal_states_recovery_test.rb
 - test/action_test.rb
 - test/clock_test.rb
+- test/concurrency_control_test.rb
 - test/coordinator_test.rb
 - test/dispatcher_test.rb
 - test/execution_plan_test.rb
@@ -537,6 +547,7 @@ test_files:
 - test/prepare_travis_env.sh
 - test/rescue_test.rb
 - test/round_robin_test.rb
+- test/semaphores_test.rb
 - test/support/code_workflow_example.rb
 - test/support/dummy_example.rb
 - test/support/middleware_example.rb