dynflow 1.3.0 → 1.4.0

data/lib/dynflow/semaphores.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Semaphores
     require 'dynflow/semaphores/abstract'

data/lib/dynflow/semaphores/abstract.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Semaphores
     class Abstract

data/lib/dynflow/semaphores/aggregating.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Semaphores
     class Aggregating < Abstract

data/lib/dynflow/semaphores/dummy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Semaphores
     class Dummy < Abstract

data/lib/dynflow/semaphores/stateful.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Semaphores
     class Stateful < Abstract

data/lib/dynflow/serializable.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+require 'date'
 module Dynflow
   class Serializable
+    TIME_FORMAT = '%Y-%m-%d %H:%M:%S.%L'
+    LEGACY_TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+
     def self.from_hash(hash, *args)
       check_class_key_present hash
       constantize(hash[:class]).new_from_hash(hash, *args)
@@ -58,15 +63,19 @@ module Dynflow
     def self.string_to_time(string)
       return if string.nil?
       return string if string.is_a?(Time)
-      _, year, month, day, hour, min, sec =
-          */(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/.match(string)
-      Time.utc(year.to_i, month.to_i, day.to_i, hour.to_i, min.to_i, sec.to_i)
+      time = begin
+               DateTime.strptime(string, TIME_FORMAT)
+             rescue ArgumentError => _
+               DateTime.strptime(string, LEGACY_TIME_FORMAT)
+             end
+
+      time.to_time.utc
     end
 
     def time_to_str(time)
       return if time.nil?
       Type! time, Time
-      time.utc.strftime '%Y-%m-%d %H:%M:%S'
+      time.utc.strftime(TIME_FORMAT)
     end
 
     def self.hash_to_error(hash)

data/lib/dynflow/serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'algebrick/serializer'
 
 module Dynflow
@@ -10,6 +11,24 @@ module Dynflow
     ARBITRARY_TYPE_KEY = :class
     MARSHAL_KEY        = :marshaled
 
+    def load(data, options = {})
+      case data
+      when ::Array
+        data.collect { |v| load(v) }
+      else
+        super
+      end
+    end
+
+    def dump(object, options = {})
+      case object
+      when ::Array
+        object.collect { |v| dump(v) }
+      else
+        super
+      end
+    end
+
     protected
 
     def parse_other(other, options = {})
@@ -19,6 +38,9 @@ module Dynflow
         end
 
         if (type_name = other[ARBITRARY_TYPE_KEY] || other[ARBITRARY_TYPE_KEY.to_s])
+          if type_name == 'Time' && ( time_str = other['value'] )
+            return Serializable.send(:string_to_time, time_str)
+          end
           type = Utils.constantize(type_name) rescue nil
           if type && type.respond_to?(:from_hash)
             return type.from_hash other
@@ -35,6 +57,8 @@ module Dynflow
                object.to_h
              when object.respond_to?(:to_hash)
                object.to_hash
+             when object.is_a?(Time) && !options[:marshaled_time]
+               { ARBITRARY_TYPE_KEY => 'Time', 'value' => object.utc.strftime(Serializable::TIME_FORMAT) }
              else
                { ARBITRARY_TYPE_KEY => object.class.to_s,
                  MARSHAL_KEY        => Base64.strict_encode64(Marshal.dump(object)) }

data/lib/dynflow/serializers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Serializers
 

data/lib/dynflow/serializers/abstract.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Serializers
     # @abstract

data/lib/dynflow/serializers/noop.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Serializers
     class Noop < Abstract

data/lib/dynflow/stateful.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Stateful
     def self.included(base)

data/lib/dynflow/telemetry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'dynflow/telemetry_adapters/abstract'
 require 'dynflow/telemetry_adapters/dummy'
 require 'dynflow/telemetry_adapters/statsd'

data/lib/dynflow/telemetry_adapters/abstract.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TelemetryAdapters
     class Abstract

data/lib/dynflow/telemetry_adapters/dummy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TelemetryAdapters
     # Telemetry adapter which does not evaluate blocks passed to {#with_instance}.

data/lib/dynflow/telemetry_adapters/statsd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TelemetryAdapters
     class StatsD < Abstract

data/lib/dynflow/testing.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     extend Algebrick::TypeCheck

data/lib/dynflow/testing/assertions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     module Assertions
@@ -48,8 +49,8 @@ module Dynflow
       def assert_run_phase(action, input = nil, &block)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        action.execution_plan.planned_run_steps.must_include action
-        action.input.must_equal Utils.stringify_keys(input) if input
+        _(action.execution_plan.planned_run_steps).must_include action
+        _(action.input).must_equal Utils.stringify_keys(input) if input
         block.call action.input if block
       end
 
@@ -57,21 +58,21 @@ module Dynflow
       def refute_run_phase(action)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        action.execution_plan.planned_run_steps.wont_include action
+        _(action.execution_plan.planned_run_steps).wont_include action
       end
 
       # assert that +action+ has finalize-phase planned
       def assert_finalize_phase(action)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        action.execution_plan.planned_finalize_steps.must_include action
+        _(action.execution_plan.planned_finalize_steps).must_include action
       end
 
       # refute that +action+ has finalize-phase planned
       def refute_finalize_phase(action)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        action.execution_plan.planned_finalize_steps.wont_include action
+        _(action.execution_plan.planned_finalize_steps).wont_include action
       end
 
     end

data/lib/dynflow/testing/dummy_execution_plan.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class DummyExecutionPlan

data/lib/dynflow/testing/dummy_executor.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class DummyExecutor
-      attr_reader :world
+      attr_reader :world, :events_to_process
 
       def initialize(world)
         @world             = world
@@ -12,6 +13,22 @@ module Dynflow
         @events_to_process << [execution_plan_id, step_id, event, future]
       end
 
+      def delayed_event(director_event)
+        @events_to_process << [director_event.execution_plan_id, director_event.step_id, director_event.event, director_event.result]
+      end
+
+      def plan_events(delayed_events)
+        delayed_events.each do |event|
+          world.plan_event(event.execution_plan_id, event.step_id, event.event, event.time)
+        end
+      end
+
+      def execute(action, event = nil)
+        action.execute event
+        plan_events(action.delayed_events.dup)
+        action.delayed_events.clear
+      end
+
       # returns true if some event was processed.
       def progress
         events = @events_to_process.dup
@@ -21,7 +38,7 @@ module Dynflow
           if event && world.action.state != :suspended
             return false
           end
-          world.action.execute event
+          execute(world.action, event)
         end
       end
 

data/lib/dynflow/testing/dummy_planned_action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class DummyPlannedAction

data/lib/dynflow/testing/dummy_step.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class DummyStep
@@ -12,7 +13,8 @@ module Dynflow
         @id    = Testing.get_id
       end
 
-      def save
+      def save(_options = {})
+        1
       end
     end
   end

data/lib/dynflow/testing/dummy_world.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class DummyWorld
@@ -34,6 +35,14 @@ module Dynflow
         executor.event execution_plan_id, step_id, event, future
       end
 
+      def plan_event(execution_plan_id, step_id, event, time, accepted = Concurrent::Promises.resolvable_future)
+        if time.nil? || time < Time.now
+          event(execution_plan_id, step_id, event, accepted)
+        else
+          clock.ping(executor, time, Director::Event[SecureRandom.uuid, execution_plan_id, step_id, event, accepted], :delayed_event)
+        end
+      end
+
       def persistence
         nil
       end

data/lib/dynflow/testing/factories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     module Factories
@@ -47,6 +48,10 @@ module Dynflow
         plan_action create_action(action_class), *args, &block
       end
 
+      def plan_events(world, delayed_events)
+        delayed_events.each { |event| world.plan_event(event.execution_plan_id, event.step_id, event.event, event.time) }
+      end
+
       # @return [Action::RunPhase]
       def run_action(plan_action, event = nil, &stubbing)
         Match! plan_action.phase, Action::Plan, Action::Run
@@ -70,7 +75,7 @@ module Dynflow
         run_action.world.action ||= run_action
         run_action.world.clock.clear
         stubbing.call run_action if stubbing
-        run_action.execute event
+        run_action.world.executor.execute(run_action, event)
         raise run_action.error if run_action.error
         run_action
       end

data/lib/dynflow/testing/in_thread_executor.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
-    class InThreadExecutor < Dynflow::Executors::Abstract
+    class InThreadExecutor
       def initialize(world)
         @world = world
         @director = Director.new(@world)
@@ -20,25 +21,43 @@ module Dynflow
         end
       end
 
+      def plan_events(delayed_events)
+        delayed_events.each do |event|
+          @world.plan_event(event.execution_plan_id, event.step_id, event.event, event.time)
+        end
+      end
+
       def handle_work(work_item)
         work_item.execute
+        step = work_item.step if work_item.is_a?(Director::StepWorkItem)
+        plan_events(step && step.delayed_events) if step && step.delayed_events
         @director.work_finished(work_item)
       end
 
       def event(execution_plan_id, step_id, event, future = Concurrent::Promises.resolvable_future)
-        event = (Director::Event[execution_plan_id, step_id, event, future])
+        event = (Director::Event[SecureRandom.uuid, execution_plan_id, step_id, event, future])
         @director.handle_event(event).each do |work_item|
           @work_items << work_item
         end
         future
       end
 
+      def delayed_event(director_event)
+        @director.handle_event(director_event).each do |work_item|
+          @work_items << work_item
+        end
+        director_event.result
+      end
+
       def clock_tick
         @world.clock.progress_all([:periodic_check_inbox])
       end
 
       def feed_queue(work_items)
-        work_items.each { |work_item| @work_items.push(work_item) }
+        work_items.each do |work_item|
+          work_item.world = @world
+          @work_items.push(work_item)
+        end
       end
 
       def terminate(future = Concurrent::Promises.resolvable_future)

data/lib/dynflow/testing/in_thread_world.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class InThreadWorld < Dynflow::World
@@ -60,6 +61,14 @@ module Dynflow
       def event(execution_plan_id, step_id, event, done = Concurrent::Promises.resolvable_future)
         @executor.event(execution_plan_id, step_id, event, done)
       end
+
+      def plan_event(execution_plan_id, step_id, event, time, done = Concurrent::Promises.resolvable_future)
+        if time.nil? || time < Time.now
+          event(execution_plan_id, step_id, event, done)
+        else
+          clock.ping(executor, time, Director::Event[SecureRandom.uuid, execution_plan_id, step_id, event, done], :delayed_event)
+        end
+      end
     end
   end
 end

data/lib/dynflow/testing/managed_clock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
     class ManagedClock

data/lib/dynflow/testing/mimic.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Testing
 

data/lib/dynflow/throttle_limiter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   class ThrottleLimiter
 

data/lib/dynflow/transaction_adapters.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TransactionAdapters
 

data/lib/dynflow/transaction_adapters/abstract.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TransactionAdapters
     class Abstract

data/lib/dynflow/transaction_adapters/active_record.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TransactionAdapters
     class ActiveRecord < Abstract

data/lib/dynflow/transaction_adapters/none.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module TransactionAdapters
     class None < Abstract

data/lib/dynflow/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Utils
 

data/lib/dynflow/utils/indifferent_hash.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Dynflow
   module Utils
     # Heavily inpired by ActiveSupport::HashWithIndifferentAccess,