dynflow 0.8.7 → 0.8.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTRkNzg1OTljZjRkYzMyMzg3OTlmYzc0Y2I1OWI2MTZjNGY4ZmQ1ZA==
-  data.tar.gz: !binary |-
-    Yzg4NmU2OGNkOWMxM2RmZWUxZWE2ZjQyODYzMWEzNGU4ZGUyNDcyNQ==
+SHA1:
+  metadata.gz: a7b3c98ca442720d5347a919d9f6eeb19047c733
+  data.tar.gz: b8608c8e122217bf72ca17e8567203c3da175ebe
 SHA512:
-  metadata.gz: !binary |-
-    ZmNiMjdjYTg5ZmI0NTcwYjcyOTRkMDI4OGRhM2I5ZDc2MmRjMjdjOWUxZmVl
-    ZDQxZDM4MzhiZjk1MjljMjFlNTg2ZTA4Njc5ZTY3YmNjOGRkNzQ4NDA4MDRl
-    NjkzOTJmZjBmZDIxYTFjYjJkNjg1ZDcwMGI0ZWFlMjk2NDQ3OTU=
-  data.tar.gz: !binary |-
-    ZTJiZGRjOTY2ODdhZjMzMTBhNDEzMDhjYjQ2ZGZiYmU0MzU5ZGI1ZjBmZDBi
-    ODM4MDJkNDAxYWJkMDhlY2NlMGEzY2RjNzkyNDBlZTI1NmU1MGFkZTMwNDFh
-    ZTQyYzJiODM0Y2Y3NDRlM2M3NmQ0NDhkZmY2MDQ0MDBjOWFmMTc=
+  metadata.gz: 9b74f383903ae4ee7487c1273718305302180b6a42f4b6311ab0fe23b57620bd6a3e8b2b67870e5b9a7b23e6fcd7296b5fd0c18dcf3ec4c7cb033885e6088d8c
+  data.tar.gz: 401a024d25af878b4cff93e30d8be55c372e3427442aa1d8aa4ab75fac0f538d513721f5d8924494b756020f1b57d44123c2ad33474ae398421d6888a1cd277b

data/lib/dynflow/action.rb

@@ -282,8 +282,8 @@ module Dynflow
 
     def execute_delay(delay_options, *args)
       with_error_handling(true) do
-        world.middleware.execute(:delay, self, delay_options, *args) do
-          @serializer = delay(delay_options, *args).tap do |serializer|
+        world.middleware.execute(:delay, self, delay_options, *args) do |*new_args|
+          @serializer = delay(*new_args).tap do |serializer|
             serializer.perform_serialization!
           end
         end

data/lib/dynflow/execution_plan.rb

@@ -182,22 +182,18 @@ module Dynflow
 
     def plan(*args)
       update_state(:planning)
-      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, false, *args)
-
-            if @dependency_graph.unresolved?
-              raise "Some dependencies were not resolved: #{@dependency_graph.inspect}"
-            end
-          end
-        end
+      world.middleware.execute(:plan_phase, root_plan_step.action_class, self) do
+        with_planning_scope do
+          root_plan_step.execute(self, nil, false, *args)
 
-        if @run_flow.size == 1
-          @run_flow = @run_flow.sub_flows.first
+          if @dependency_graph.unresolved?
+            raise "Some dependencies were not resolved: #{@dependency_graph.inspect}"
+          end
         end
+      end
 
-        world.transaction_adapter.rollback if error?
+      if @run_flow.size == 1
+        @run_flow = @run_flow.sub_flows.first
       end
       steps.values.each(&:save)
       update_state(error? ? :stopped : :planned)

data/lib/dynflow/executors/parallel/sequential_manager.rb

@@ -21,14 +21,10 @@ module Dynflow
       def finalize
         reset_finalize_steps
         unless execution_plan.error?
-          world.transaction_adapter.transaction do
-            step_id = execution_plan.finalize_flow.all_step_ids.first
-            action_class = execution_plan.steps[step_id].action_class
-            world.middleware.execute(:finalize_phase, action_class) do
-              unless dispatch(execution_plan.finalize_flow)
-                world.transaction_adapter.rollback
-              end
-            end
+          step_id = execution_plan.finalize_flow.all_step_ids.first
+          action_class = execution_plan.steps[step_id].action_class
+          world.middleware.execute(:finalize_phase, action_class, execution_plan) do
+            dispatch(execution_plan.finalize_flow)
           end
         end
         @done = true

data/lib/dynflow/middleware.rb

@@ -4,6 +4,7 @@ module Dynflow
     require 'dynflow/middleware/world'
     require 'dynflow/middleware/resolver'
     require 'dynflow/middleware/stack'
+    require 'dynflow/middleware/common/transaction'
 
     include Algebrick::TypeCheck
 

data/lib/dynflow/middleware/common/transaction.rb

@@ -0,0 +1,24 @@
+module Dynflow
+  module Middleware::Common
+    class Transaction < Middleware
+      def plan_phase(execution_plan)
+        rollback_on_error(execution_plan)
+      end
+
+      def finalize_phase(execution_plan)
+        rollback_on_error(execution_plan)
+      end
+
+      private
+
+      def rollback_on_error(execution_plan)
+        execution_plan.world.transaction_adapter.transaction do
+          pass(execution_plan)
+          if execution_plan.error?
+            execution_plan.world.transaction_adapter.rollback
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dynflow/middleware/register.rb

@@ -22,6 +22,10 @@ module Dynflow
       end
     end
 
+    def do_not_use(middleware_class)
+      use nil, :replace => middleware_class
+    end
+
     def merge!(register)
       Type! register, Middleware::Register
       register.rules.each do |klass, rules|

data/lib/dynflow/middleware/resolver.rb

@@ -48,7 +48,7 @@ module Dynflow
         middleware_deps.reject! { |dep| !deps.has_key?(dep) }
       end
 
-      return deps
+      return deps.delete_if {|klass, _| klass.nil? }
     end
 
     def tsort_each_node(&block)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/lib/dynflow/world.rb

@@ -24,6 +24,7 @@ module Dynflow
       @exit_on_terminate      = config_for_world.exit_on_terminate
       @connector              = config_for_world.connector
       @middleware             = Middleware::World.new
+      @middleware.use Middleware::Common::Transaction if @transaction_adapter
       @client_dispatcher      = spawn_and_wait(Dispatcher::ClientDispatcher, "client-dispatcher", self)
       @meta                   = config_for_world.meta
       @auto_validity_check    = config_for_world.auto_validity_check

data/test/middleware_test.rb

@@ -99,6 +99,13 @@ module Dynflow
                               AnotherLogRunMiddleware::after_run]
           end
         end
+
+        describe "remove" do
+          specify do
+            world.trigger(Support::MiddlewareExample::SubActionDoNotUseRule, {}).finished.wait
+            log.must_equal %w[run]
+          end
+        end
       end
 
       it "allows access the running action" do

data/test/support/middleware_example.rb

@@ -39,13 +39,13 @@ module Support
         log 'after_finalize'
       end
 
-      def plan_phase
+      def plan_phase(*_)
         log 'before_plan_phase'
         pass
         log 'after_plan_phase'
       end
 
-      def finalize_phase
+      def finalize_phase(*_)
         log 'before_finalize_phase'
         pass
         log 'after_finalize_phase'
@@ -152,6 +152,12 @@ module Support
       middleware.use AnotherLogRunMiddleware, replace: LogRunMiddleware
     end
 
+    class SubActionDoNotUseRule < Action
+      middleware.use AnotherLogRunMiddleware
+      middleware.do_not_use AnotherLogRunMiddleware
+      middleware.do_not_use LogRunMiddleware
+    end
+
     class SubActionAfterRule < Action
       middleware.use AnotherLogRunMiddleware, after: LogRunMiddleware
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,174 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: apipie-params
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: algebrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby workflow/orchestration engine
@@ -186,8 +186,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -402,6 +402,7 @@ files:
 - lib/dynflow/logger_adapters/formatters/exception.rb
 - lib/dynflow/logger_adapters/simple.rb
 - lib/dynflow/middleware.rb
+- lib/dynflow/middleware/common/transaction.rb
 - lib/dynflow/middleware/register.rb
 - lib/dynflow/middleware/resolver.rb
 - lib/dynflow/middleware/stack.rb
@@ -508,17 +509,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine
@@ -545,4 +546,3 @@ test_files:
 - test/testing_test.rb
 - test/web_console_test.rb
 - test/world_test.rb
-has_rdoc: