dynflow 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a92e48caa3237c278bd91fe10690740859ae29fc
-  data.tar.gz: 79b17f3f3119f954c58e6d2544f3a9725d51778d
+SHA256:
+  metadata.gz: 496dae66a524bd0ede6a777b555b2cd38488fbe31db105d1fb0d8f71d765038e
+  data.tar.gz: 696856cee44db5d23f0ca4a3b139397ab942a31c573f133aac1f5c2115852833
 SHA512:
-  metadata.gz: 58e2dab7d4634009ba158642d3959c60e2633d9ebdbe3b0c6afaa3c3b9f338868fb788e0ec4c55a9bc66032ff2e420375e496bc1c77c970edde83a57c965fe77
-  data.tar.gz: d9f22b6954465c5c08f9a0f9fdd059e8a9e4ebeb04f21ee2791b27597edf2b5697f7b7ee4926412b85d9095d29ff6e4c47a8258d03252745af0f2d25b9d1f233
+  metadata.gz: 27cf8a56c6a94d0407051542dfbe495c67e46ca5a0b1c6558835f37cf8ba0335c9c3e249866d9dfa45247c54ed64cf7b355f759147150546b7b885b3ad521581
+  data.tar.gz: c40e8eaa9977fa076cf86281d84dd05dc90335260b97453a50a60dc9e05fe45534204ca0d89530c94fdcc2c9dc81f9e3fbfd0f363f0e9085aed3a43b05def968

data/lib/dynflow/execution_plan.rb

@@ -120,7 +120,7 @@ module Dynflow
         @ended_at       = Time.now
         @real_time      = @ended_at - @started_at unless @started_at.nil?
         @execution_time = compute_execution_time
-        hooks_to_run << (error? ? :failure : :success)
+        hooks_to_run << (failure? ? :failure : :success)
         unlock_all_singleton_locks!
       when :paused
         unlock_all_singleton_locks!
@@ -165,6 +165,10 @@ module Dynflow
       result == :error
     end
 
+    def failure?
+      [:error, :warning, :cancelled].include?(result)
+    end
+
     def error_in_plan?
       steps_in_state(:error).any? { |step| step.is_a? Steps::PlanStep }
     end

data/lib/dynflow/rails/daemon.rb

@@ -44,11 +44,8 @@ module Dynflow
         end
 
         require rails_env_file
-        world_id = if ::Rails.application.dynflow.initialized?
-                     ::Rails.application.dynflow.world.id
-                   else
-                     nil
-                   end
+        ::Rails.application.dynflow.initialize!
+        world_id = ::Rails.application.dynflow.world.id
         STDOUT.puts("Everything ready for world: #{world_id}")
         sleep
       ensure

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/test/daemon_test.rb

@@ -15,6 +15,7 @@ class DaemonTest < ActiveSupport::TestCase
     )
     @world_class = mock('dummy world factory')
     @dummy_world = ::Dynflow::Testing::DummyWorld.new
+    @dummy_world.stubs(:id => '123')
     @dummy_world.stubs(:auto_execute)
     @dummy_world.stubs(:perform_validity_checks)
     @event = Concurrent.event
@@ -28,6 +29,7 @@ class DaemonTest < ActiveSupport::TestCase
     ::Rails.stubs(:root).returns('support/rails')
     ::Rails.stubs(:logger).returns(Logging.logger(STDOUT))
     @dynflow.require!
+    @dynflow.config.stubs(:increase_db_pool_size? => false)
     @daemon.stubs(:sleep).returns(true) # don't pause the execution
     @current_folder = File.expand_path('../support/rails/', __FILE__)
     ::ActiveRecord::Base.configurations = { 'development' => {} }

data/test/execution_plan_hooks_test.rb

@@ -46,12 +46,19 @@ module Dynflow
         execution_plan_hooks.use :controlled_failure, :on => :stopped
       end
 
+      class ActionOnFailure < ::Dynflow::Action
+        include FlagHook
+
+        execution_plan_hooks.use :raise_flag, :on => :failure
+      end
+
       class Inherited < ActionWithHooks; end
       class Overriden < ActionWithHooks
         execution_plan_hooks.do_not_use :raise_flag
       end
 
       before { Flag.lower! }
+      after { world.persistence.delete_delayed_plans({}) }
 
       it 'runs the on_success hook' do
         refute Flag.raised?
@@ -60,6 +67,15 @@ module Dynflow
         assert Flag.raised?
       end
 
+      it 'runs the on_failure hook on cancel' do
+        refute Flag.raised?
+        @start_at = Time.now.utc + 180
+        delay = world.delay(ActionOnFailure, { :start_at => @start_at })
+        delayed_plan = world.persistence.load_delayed_plan(delay.execution_plan_id)
+        delayed_plan.execution_plan.cancel.each(&:wait)
+        assert Flag.raised?
+      end
+
       it 'does not alter the execution plan when exception happens in the hook' do
         refute Flag.raised?
         plan = world.plan(ActionOnStop)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -602,7 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine