dynflow 0.8.5 → 0.8.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODU2NmY4ZjI5Nzg1OGYzM2MwOGU5ZGUzZjIzOWE2ZGI3ODUwMTQ3NQ==
+    YWQyYzY3YTljZmEwZmFjODNjYTQ2ZDcxODhjOTIyNjIzMjU3MWQxOQ==
   data.tar.gz: !binary |-
-    NmMxZDNmOTIzZGJlMzIwZDE5YjZkMWIwNjQ3MTJmYzhjZTVkZTI1NA==
+    NmU1MDM2NWM3YTk2NmE2NGExZWRhNzUxNzg3YmNmZTg5M2EzOTQ5Mg==
 SHA512:
   metadata.gz: !binary |-
-    NWM4ZDAyMmM5M2U2MjNjZmI4MzkyZGQxMDM4Nzc2YmE3NWU3Njc0OGY4NGMw
-    MDQ5YzMzZjFjODljNjRjYmMyM2E2ZTljYTM5NjY3YmRlMjA2MTkzNzBjZDE0
-    YTk1MTQ1ZDczNTcxYmZlYzAyOTNkYTBmNmE2NjJlYTU3NjAzOWI=
+    Nzk0NjlhYTAwNzQ4NzU0NDIwNzFiYWQ2NjliZGQxYzJiODAxZTMwOWM4ZDI0
+    MWNhYTI2NzA2YWE4YTVjZWYwYTY0YmNmZmU2M2I1NWEzYjQ5MTM0ODliYTYw
+    ZWQ4MmY1ZGE0MTgzYzM3ZWRhZjhjMjRlYWVhNTM1MmZiNWNjYWI=
   data.tar.gz: !binary |-
-    OWI4OWIyOWYzNjg4YjU3YmE0OTFiMjYxNzk5ZjE4NDdhYzU0NWUxZDYyNjgy
-    ODAzYzQ3ZTJhZWNmNDE1ZDc3NmY3NWMwMDQzMDlmOTRlM2ZmYTQwMzYxOGY2
-    N2E4ZmVlMzBhMDU2MTNhOTUxMDAwNjlkYTgzNzg2YjcwY2ZlNGY=
+    MmViMjEzZDliZjg2ZThkNDgzMjQ1ZWU5MTNlN2ZlM2JkYjMwYzBmMGE1MDhj
+    Yjc3ZWU0ZmYxOGU3ZTA2MzgxMTAxZjdjMmE3YjVlZGUxYmQxNGUyYWZmOGZj
+    ODM0Yjg3ODQ0MTVmMGM4NTNlZGE5ZWJlY2Q3ZGVjMjc2ZDhjMTc=

data/lib/dynflow/execution_plan/steps/plan_step.rb

@@ -37,6 +37,7 @@ module Dynflow
 
       def delay(delay_options, args)
         @action.execute_delay(delay_options, *args)
+        persistence.save_action(execution_plan_id, @action)
         @action.serializer
       ensure
         save

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -93,7 +93,7 @@ module Dynflow
 
       def find_past_delayed_plans(time)
         table(:delayed)
-          .where('start_at <= ?', time)
+          .where('start_at <= ? OR (start_before IS NOT NULL AND start_before <= ?)', time, time)
           .order_by(:start_at)
           .all
           .map { |plan| load_data(plan) }

data/lib/dynflow/serializers/abstract.rb

@@ -20,19 +20,19 @@ module Dynflow
       end
 
       def perform_serialization!
-        @serialized_args = serialize
+        @serialized_args = args.map { |arg| serialize arg }
       end
 
       def perform_deserialization!
         raise "@serialized_args not set" if @serialized_args.nil?
-        @args = deserialize
+        @args = serialized_args.map { |arg| deserialize arg }
       end
 
-      def serialize
+      def serialize(arg)
         raise NotImplementedError
       end
 
-      def deserialize
+      def deserialize(arg)
         raise NotImplementedError
       end
 

data/lib/dynflow/serializers/noop.rb

@@ -2,12 +2,12 @@ module Dynflow
   module Serializers
     class Noop < Abstract
 
-      def serialize
-        args
+      def serialize(arg)
+        arg
       end
 
-      def deserialize
-        serialized_args
+      def deserialize(arg)
+        arg
       end
 
     end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/test/middleware_test.rb

@@ -110,6 +110,21 @@ module Dynflow
                           run
                           output#message:finished]
       end
+
+      it "allows modification of the running action when delaying execution" do
+        world = WorldFactory.create_world
+        world.middleware.use(Support::MiddlewareExample::AnotherObservingMiddleware,
+                             replace: Support::MiddlewareExample::LogRunMiddleware)
+        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
+        log.must_equal ["delay#set-input:#{world.id}",
+                        "plan#input:#{world.id}",
+                        "input#message:#{world.id}",
+                        'run',
+                        'output#message:finished']
+      end
     end
   end
 end

data/test/persistence_test.rb

@@ -8,7 +8,8 @@ module Dynflow
       let :execution_plans_data do
         [{ id: 'plan1', state: 'paused' },
          { id: 'plan2', state: 'stopped' },
-         { id: 'plan3', state: 'paused' }]
+         { id: 'plan3', state: 'paused' },
+         { id: 'plan4', state: 'paused' }]
       end
 
       let :action_data do
@@ -132,7 +133,7 @@ module Dynflow
             adapter.load_step('plan2', step_data[:id])
 
             prepare_plans_with_steps
-            adapter.delete_execution_plans('state' => 'paused').must_equal 2
+            adapter.delete_execution_plans('state' => 'paused').must_equal 3
             -> { adapter.load_execution_plan('plan1') }.must_raise KeyError
             adapter.load_execution_plan('plan2') # nothing raised
             -> { adapter.load_execution_plan('plan3') }.must_raise KeyError
@@ -167,6 +168,21 @@ module Dynflow
             loaded_step.must_equal(Utils.stringify_keys(step_data))
           end
         end
+
+        describe '#find_past_delayed_plans' do
+          it 'finds plans with start_before in past' do
+            start_time = Time.now
+            prepare_plans
+            fmt =->(time) { time.strftime('%Y-%m-%d %H:%M:%S') }
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :start_at => fmt.call(start_time + 60), :start_before => fmt.call(start_time - 60))
+            adapter.save_delayed_plan('plan2', :execution_plan_uuid => 'plan2', :start_at => fmt.call(start_time - 60))
+            adapter.save_delayed_plan('plan3', :execution_plan_uuid => 'plan3', :start_at => fmt.call(start_time + 60))
+            adapter.save_delayed_plan('plan4', :execution_plan_uuid => 'plan4', :start_at => fmt.call(start_time - 60), :start_before => fmt.call(start_time - 60))
+            plans = adapter.find_past_delayed_plans(start_time)
+            plans.length.must_equal 3
+            plans.map { |plan| plan[:execution_plan_uuid] }.must_equal %w(plan2 plan4 plan1)
+          end
+        end
       end
 
       describe Dynflow::PersistenceAdapters::Sequel do

data/test/support/dummy_example.rb

@@ -6,16 +6,10 @@ module Support
       def run; end
     end
 
-    class MySerializer < Dynflow::Serializers::Abstract
-      def serialize
-        if args.first == :fail
-          raise 'Enforced serializer failure'
-        end
-        args
-      end
-
-      def deserialize
-        serialized_args
+    class MySerializer < Dynflow::Serializers::Noop
+      def serialize(arg)
+        raise 'Enforced serializer failure' if arg == :fail
+        super arg
       end
     end
 

data/test/support/middleware_example.rb

@@ -111,6 +111,22 @@ module Support
       end
     end
 
+    class AnotherObservingMiddleware < ObservingMiddleware
+
+      def delay(*args)
+        pass(*args).tap do
+          log("delay#set-input:#{action.world.id}")
+          action.input[:message] = action.world.id
+        end
+      end
+
+      def plan(*args)
+        log("plan#input:#{action.input[:message]}")
+        pass(*args)
+      end
+
+    end
+
     class Action < Dynflow::Action
       middleware.use LogRunMiddleware
 

data/test/test_helper.rb

@@ -1,11 +1,9 @@
 require 'bundler/setup'
+require 'minitest/reporters'
 require 'minitest/autorun'
 require 'minitest/spec'
 
-if ENV['RM_INFO']
-  require 'minitest/reporters'
-  MiniTest::Reporters.use!
-end
+MiniTest::Reporters.use! if ENV['RM_INFO']
 
 load_path = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH << load_path unless $LOAD_PATH.include? load_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json