dynflow 0.2.0 → 0.3.0

data/test/support/middleware_example.rb

@@ -0,0 +1,132 @@
+module Support
+  module MiddlewareExample
+    class LogMiddleware < Dynflow::Middleware
+
+      def self.log
+        @log
+      end
+
+      def self.reset_log
+        @log = []
+      end
+
+      def log(message)
+        LogMiddleware.log << "#{self.class.name[/\w+$/]}::#{message}"
+      end
+
+      def plan(args)
+        log 'before_plan'
+        pass(args)
+        log 'after_plan'
+      end
+
+      def run(*args)
+        log 'before_run'
+        pass(*args)
+      ensure
+        log 'after_run'
+      end
+
+      def finalize
+        log 'before_finalize'
+        pass
+        log 'after_finalize'
+      end
+
+      def plan_phase
+        log 'before_plan_phase'
+        pass
+        log 'after_plan_phase'
+      end
+
+      def finalize_phase
+        log 'before_finalize_phase'
+        pass
+        log 'after_finalize_phase'
+      end
+
+    end
+
+    class LogRunMiddleware < Dynflow::Middleware
+
+      def log(message)
+        LogMiddleware.log << "#{self.class.name[/\w+$/]}::#{message}"
+      end
+
+      def run(*args)
+        log 'before_run'
+        pass(*args)
+      ensure
+        log 'after_run'
+      end
+    end
+
+    class AnotherLogRunMiddleware < LogRunMiddleware
+    end
+
+    class LoggingAction < Dynflow::Action
+
+      middleware.use LogMiddleware
+
+      def log(message)
+        LogMiddleware.log << message
+      end
+
+      def plan(input)
+        log 'plan'
+        plan_self(input)
+      end
+
+      def run
+        log 'run'
+      end
+
+      def finalize
+        log 'finalize'
+      end
+    end
+
+    class ObservingMiddleware < Dynflow::Middleware
+
+      def log(message)
+        LogMiddleware.log << message
+      end
+
+      def run(*args)
+        log("input#message:#{action.input[:message]}")
+        pass(*args)
+      ensure
+        log("output#message:#{action.output[:message]}")
+      end
+    end
+
+    class Action < Dynflow::Action
+      middleware.use LogRunMiddleware
+
+      def log(message)
+        LogMiddleware.log << message
+      end
+
+      def run
+        log("run")
+        output[:message] = "finished"
+      end
+    end
+
+    class SubAction < Action
+      middleware.use AnotherLogRunMiddleware
+    end
+
+    class SubActionBeforeRule < Action
+      middleware.use AnotherLogRunMiddleware, before: LogRunMiddleware
+    end
+
+    class SubActionReplaceRule < Action
+      middleware.use AnotherLogRunMiddleware, replace: LogRunMiddleware
+    end
+
+    class SubActionAfterRule < Action
+      middleware.use AnotherLogRunMiddleware, after: LogRunMiddleware
+    end
+  end
+end

data/test/test_helper.rb

@@ -7,10 +7,18 @@ if ENV['RM_INFO']
   MiniTest::Reporters.use!
 end
 
+load_path = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH << load_path unless $LOAD_PATH.include? load_path
+
 require 'dynflow'
 require 'dynflow/testing'
 require 'pry'
 
+require 'support/code_workflow_example'
+require 'support/middleware_example'
+
+Dynflow::Testing.logger_adapter.level = 1
+
 class TestExecutionLog
 
   include Enumerable
@@ -102,15 +110,7 @@ module WorldInstance
   end
 
   def self.logger_adapter
-    action_logger  = Logger.new($stderr).tap do |logger|
-      logger.level = Logger::FATAL
-      logger.progname = 'action'
-    end
-    dynflow_logger = Logger.new($stderr).tap do |logger|
-      logger.level = Logger::WARN
-      logger.progname = 'dynflow'
-    end
-    Dynflow::LoggerAdapters::Delegator.new(action_logger, dynflow_logger)
+    @adapter ||= Dynflow::LoggerAdapters::Simple.new $stderr, 4
   end
 
   def self.create_world
@@ -122,11 +122,13 @@ module WorldInstance
     @counter    ||= 0
     socket_path = Dir.tmpdir + "/dynflow_remote_#{@counter+=1}"
     listener    = Dynflow::Listeners::Socket.new world, socket_path
-    world       = Dynflow::SimpleWorld.new(logger_adapter: logger_adapter) do |remote_world|
-      { persistence_adapter: world.persistence.adapter,
-        executor:            Dynflow::Executors::RemoteViaSocket.new(remote_world, socket_path),
-        auto_terminate:      false }
-    end
+    world       = Dynflow::SimpleWorld.new(
+        logger_adapter:      logger_adapter,
+        auto_terminate:      false,
+        persistence_adapter: -> remote_world { world.persistence.adapter },
+        executor:            -> remote_world do
+          Dynflow::Executors::RemoteViaSocket.new(remote_world, socket_path)
+        end)
     return listener, world
   end
 
@@ -148,8 +150,8 @@ end
 
 # ensure there are no unresolved Futures at the end or being GCed
 future_tests =-> do
-  future_creations        = {}
-  non_ready_futures       = {}
+  future_creations  = {}
+  non_ready_futures = {}
 
   MiniTest.after_run do
     WorldInstance.terminate

data/test/testing_test.rb

@@ -1,9 +1,8 @@
 require_relative 'test_helper'
-require_relative 'code_workflow_example'
 
 module Dynflow
 
-  CWE = CodeWorkflowExample
+  CWE = Support::CodeWorkflowExample
 
   describe Testing do
     include Testing
@@ -135,7 +134,9 @@ module Dynflow
         end
 
         describe 'when something fails' do
-          let(:plan_input) { { commit: 'sha', ci_result: true, review_results: [true, false] } }
+          def plan_input
+            super.update review_results: [true, false]
+          end
 
           it '#runs' do
             runned_action.output.fetch(:passed).must_equal false

data/test/web_console_test.rb

@@ -1,5 +1,4 @@
 require_relative 'test_helper'
-require_relative 'code_workflow_example'
 
 ENV['RACK_ENV'] = 'test'
 require 'dynflow/web_console'
@@ -13,7 +12,7 @@ module Dynflow
     include WorldInstance
 
     let :execution_plan_id do
-      world.trigger(CodeWorkflowExample::FastCommit, 'sha' => 'abc123').
+      world.trigger(Support::CodeWorkflowExample::FastCommit, 'sha' => 'abc123').
           tap { |o| o.finished.wait }.
           id
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -281,6 +281,12 @@ files:
 - lib/dynflow/logger_adapters/formatters/exception.rb
 - lib/dynflow/logger_adapters/simple.rb
 - lib/dynflow/micro_actor.rb
+- lib/dynflow/middleware.rb
+- lib/dynflow/middleware/action.rb
+- lib/dynflow/middleware/register.rb
+- lib/dynflow/middleware/resolver.rb
+- lib/dynflow/middleware/stack.rb
+- lib/dynflow/middleware/world.rb
 - lib/dynflow/persistence.rb
 - lib/dynflow/persistence_adapters.rb
 - lib/dynflow/persistence_adapters/abstract.rb
@@ -308,10 +314,13 @@ files:
 - lib/dynflow/world.rb
 - test/action_test.rb
 - test/clock_test.rb
-- test/code_workflow_example.rb
 - test/execution_plan_test.rb
 - test/executor_test.rb
+- test/middleware_test.rb
 - test/persistance_adapters_test.rb
+- test/remote_via_socket_test.rb
+- test/support/code_workflow_example.rb
+- test/support/middleware_example.rb
 - test/test_helper.rb
 - test/testing_test.rb
 - test/web_console_test.rb
@@ -363,10 +372,13 @@ summary: DYNamic workFLOW engine
 test_files:
 - test/action_test.rb
 - test/clock_test.rb
-- test/code_workflow_example.rb
 - test/execution_plan_test.rb
 - test/executor_test.rb
+- test/middleware_test.rb
 - test/persistance_adapters_test.rb
+- test/remote_via_socket_test.rb
+- test/support/code_workflow_example.rb
+- test/support/middleware_example.rb
 - test/test_helper.rb
 - test/testing_test.rb
 - test/web_console_test.rb