dynflow 0.7.4 → 0.7.5

data/lib/dynflow/action.rb

@@ -49,9 +49,9 @@ module Dynflow
       nil
     end
 
-    ERROR   = Object.new
-    SUSPEND = Object.new
-    Phase   = Algebrick.type do
+    ERROR         = Object.new
+    SUSPEND       = Object.new
+    Phase         = Algebrick.type do
       Executable = type do
         variants Plan     = atom,
                  Run      = atom,
@@ -140,10 +140,11 @@ module Dynflow
       end
     end
 
-    def set_plan_context(execution_plan, trigger)
+    def set_plan_context(execution_plan, trigger, from_subscription)
       phase! Plan
-      @execution_plan = Type! execution_plan, ExecutionPlan
-      @trigger        = Type! trigger, Action, NilClass
+      @execution_plan    = Type! execution_plan, ExecutionPlan
+      @trigger           = Type! trigger, Action, NilClass
+      @from_subscription = Type! from_subscription, TrueClass, FalseClass
     end
 
     def trigger
@@ -151,6 +152,11 @@ module Dynflow
       @trigger
     end
 
+    def from_subscription?
+      phase! Plan
+      @from_subscription
+    end
+
     def execution_plan
       phase! Plan, Present
       @execution_plan
@@ -271,7 +277,7 @@ module Dynflow
     # Use #plan_self and #plan_action methods to plan actions.
     # It can use DB in this phase.
     def plan(*args)
-      if trigger
+      if from_subscription?
         # if the action is triggered by subscription, by default use the
         # input of parent action.
         # should be replaced by referencing the input from input format
@@ -340,7 +346,7 @@ module Dynflow
 
     def plan_action(action_class, *args)
       phase! Plan
-      @execution_plan.add_plan_step(action_class, self).execute(@execution_plan, nil, *args)
+      @execution_plan.add_plan_step(action_class, self).execute(@execution_plan, self, false, *args)
     end
 
     # DSL for run phase
@@ -358,7 +364,7 @@ module Dynflow
       throw ERROR
     end
 
-    def with_error_handling(&block)
+    def with_error_handling(propagate_error = nil, &block)
       raise "wrong state #{self.state}" unless [:skipping, :running].include?(self.state)
 
       begin
@@ -378,6 +384,10 @@ module Dynflow
       else
         raise "wrong state #{self.state}"
       end
+
+      if propagate_error && self.state == :error
+        raise(@step.error.exception)
+      end
     end
 
     def set_error(error)
@@ -392,7 +402,10 @@ module Dynflow
       phase! Plan
       self.state = :running
       save_state
-      with_error_handling do
+
+      # when the error occurred inside the planning, catch that
+      # before getting out of the planning phase
+      with_error_handling(!root_action?) do
         concurrence do
           world.middleware.execute(:plan, self, *args) do |*new_args|
             plan(*new_args)
@@ -407,7 +420,7 @@ module Dynflow
           @execution_plan.switch_flow(Flows::Concurrence.new([trigger_flow].compact)) do
             subscribed_actions.each do |action_class|
               new_plan_step = @execution_plan.add_plan_step(action_class, self)
-              new_plan_step.execute(@execution_plan, self, *args)
+              new_plan_step.execute(@execution_plan, self, true, *args)
             end
           end
         end
@@ -475,5 +488,9 @@ module Dynflow
       value.replace not_serializable: true
       raise e
     end
+
+    def root_action?
+      @trigger.nil?
+    end
   end
 end

data/lib/dynflow/execution_plan.rb

@@ -152,7 +152,7 @@ module Dynflow
       world.transaction_adapter.transaction do
         world.middleware.execute(:plan_phase, root_plan_step.action_class) do
           with_planning_scope do
-            root_plan_step.execute(self, nil, *args)
+            root_plan_step.execute(self, nil, false, *args)
 
             if @dependency_graph.unresolved?
               raise "Some dependencies were not resolved: #{@dependency_graph.inspect}"

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

@@ -36,11 +36,11 @@ module Dynflow
       end
 
       # @return [Action]
-      def execute(execution_plan, trigger, *args)
+      def execute(execution_plan, trigger, from_subscription, *args)
         unless @action
           raise "The action was not initialized, you might forgot to call initialize_action method"
         end
-        @action.set_plan_context(execution_plan, trigger)
+        @action.set_plan_context(execution_plan, trigger, from_subscription)
         Type! execution_plan, ExecutionPlan
         with_meta_calculation(@action) do
           @action.execute(*args)

data/lib/dynflow/testing/dummy_planned_action.rb

@@ -10,7 +10,7 @@ module Dynflow
             Testing.get_id.to_s, Testing.get_id, Testing.get_id)
       end
 
-      def execute(execution_plan, event, *args)
+      def execute(execution_plan, event, from_subscription, *args)
         @plan_input = args
         self
       end

data/lib/dynflow/testing/factories.rb

@@ -16,7 +16,7 @@ module Dynflow
               run_step_id:       nil,
               finalize_step_id:  nil },
             execution_plan.world).tap do |action|
-          action.set_plan_context(execution_plan, trigger)
+          action.set_plan_context(execution_plan, trigger, false)
         end
       end
 

data/lib/dynflow/testing/mimic.rb

@@ -18,6 +18,9 @@ module Dynflow
 
       def mimic!(*types)
         define =-> _ do
+          define_method :mimic_types do
+            types
+          end
           define_method :kind_of? do |type|
             types.any? { |t| t <= type } || super(type)
           end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/test/execution_plan_test.rb

@@ -166,6 +166,16 @@ module Dynflow
 
         end
 
+        describe 'error in planning phase' do
+          let :execution_plan do
+            world.plan(Support::CodeWorkflowExample::IncomingIssues, [:fail] + issues_data)
+          end
+
+          it 'stops the planning right after the first error occurred' do
+            execution_plan.steps.size.must_equal 2
+          end
+        end
+
         describe 'multi dependencies' do
           let :execution_plan do
             world.plan(Support::CodeWorkflowExample::Commit, 'sha' => 'abc123')

data/test/support/code_workflow_example.rb

@@ -50,6 +50,7 @@ module Support
     class IncomingIssue < Dynflow::Action
 
       def plan(issue)
+        raise "You want me to fail" if issue == :fail
         plan_self(issue)
         plan_action(Triage, issue)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport