dynflow 0.4.0 → 0.4.1

data/README.md

@@ -28,13 +28,19 @@ implementations as well).
 * [Related projects](#related-projects)
 
 Current status
--------------
+--------------
 
 Dynflow has been under heavy development for several months to be able
 to support the services orchestration in the
 [Katello](http://katello.org) and [Foreman](http://theforeman.org/)
 projects, getting to production-ready state in couple of weeks.
 
+Requirements
+------------
+
+-   Ruby MRI 1.9.3, 2.0, or 2.1.
+-   It does not work on JRuby nor Rubinius yet.
+
 How it works
 ------------
 

data/lib/dynflow/action.rb

@@ -64,6 +64,12 @@ module Dynflow
       end
     end
 
+    module Phase
+      def to_s_humanized
+        to_s.split('::').last
+      end
+    end
+
     def self.constantize(action_name)
       super action_name
     rescue NameError
@@ -159,7 +165,7 @@ module Dynflow
     end
 
     def steps
-      [plan_step, run_step, finalize_step_id]
+      [plan_step, run_step, finalize_step]
     end
 
     def to_hash
@@ -215,7 +221,10 @@ module Dynflow
 
     def state=(state)
       phase! Executable
-      @world.logger.debug "step #{execution_plan_id}:#{@step.id} #{self.state} >> #{state}"
+      @world.logger.debug format('%13s %s:%2d %9s >> %9s in phase %8s %s',
+                                 'Step', execution_plan_id, @step.id,
+                                 self.state, state,
+                                 phase.to_s_humanized, self.class)
       @step.state = state
     end
 
@@ -276,7 +285,8 @@ module Dynflow
 
     def plan_self(input)
       phase! Plan
-      self.input = input
+      self.input.update input
+
       if self.respond_to?(:run)
         run_step          = @execution_plan.add_run_step(self)
         @run_step_id      = run_step.id
@@ -367,7 +377,8 @@ module Dynflow
 
     def execute_run(event)
       phase! Run
-      @world.logger.debug "step #{execution_plan_id}:#{@step.id} got event #{event}" if event
+      @world.logger.debug format('%13s %s:%2d got event %s',
+                                 'Step', execution_plan_id, @step.id, event) if event
       @input = OutputReference.dereference @input, world.persistence
 
       case

data/lib/dynflow/execution_plan.rb

@@ -73,7 +73,8 @@ module Dynflow
       else
         # ignore
       end
-      logger.debug "execution plan #{id} #{original} >> #{state}"
+      logger.debug format('%13s %s    %9s >> %9s',
+                          'ExecutionPlan', id, original, state)
       self.save
     end
 

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

@@ -62,7 +62,7 @@ module Dynflow
       end
 
       def to_s
-        "[#{self.class.name}:#{execution_plan_id}:#{id}]"
+        "#<#{self.class.name}:#{execution_plan_id}:#{id}>"
       end
 
       def to_hash
@@ -86,6 +86,12 @@ module Dynflow
         raise NotImplementedError, "Expected to be implemented in RunStep and FinalizeStep"
       end
 
+      def action(execution_plan)
+        attributes = world.persistence.adapter.load_action(execution_plan_id, action_id)
+        Action.from_hash(attributes.update(phase: Action::Present, execution_plan: execution_plan),
+                         world)
+      end
+
       protected
 
       def self.new_from_hash(hash, execution_plan_id, world)

data/lib/dynflow/testing/assertions.rb

@@ -14,7 +14,8 @@ module Dynflow
         end
 
         assert(!found.empty?,
-               "Action #{planned_action_class} with plan_input #{plan_input} was not planned, there were only #{found_classes.map(&:plan_input)}")
+               "Action #{planned_action_class} with plan_input #{plan_input} was not planned, " +
+                   "there were only #{found_classes.map(&:plan_input)}")
         found
       end
 

data/lib/dynflow/testing/factories.rb

@@ -63,7 +63,7 @@ module Dynflow
 
       # @return [Action::FinalizePhase]
       def finalize_action(run_action, &stubbing)
-        Match! run_action.phase, Action::Run
+        Match! run_action.phase, Action::Plan, Action::Run
         step            = DummyStep.new
         finalize_action = run_action.class.new(
             { step:              step,

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/web/assets/javascripts/application.js

@@ -1,25 +1,30 @@
-(function($) {
-    $.fn.extend({
-        postlink: function(options) {
-            return this.each(function() {
-                $(this).click(function(e) {
-                    var frm = $("<form>");
-                    frm.attr({'action':$(this).attr('href'), 'method': 'post'});
-                    frm.appendTo("body");
-                    frm.submit();
-                    e.preventDefault();
-                });
-            });
-        }
-    });
+(function ($) {
+  $.fn.extend({
+    postlink: function (options) {
+      return this.each(function () {
+        $(this).click(function (e) {
+          var frm = $("<form>");
+          frm.attr({'action': $(this).attr('href'), 'method': 'post'});
+          frm.appendTo("body");
+          frm.submit();
+          e.preventDefault();
+        });
+      });
+    }
+  });
 
-    $(function() {
-        $('.postlink').postlink();
+  $(function () {
+    $('.postlink').postlink();
 
-        $('table.flow span.step-label').click(function (e) {
-            var stepData = $(this).siblings('div.action');
-            stepData.slideToggle();
-        });
+    $('table.flow span.step-label').click(function (e) {
+      var stepData = $(this).siblings('div.action');
+      stepData.slideToggle();
+    });
+
+    $('.plan-step .step-label').click(function (e) {
+      var stepData = $(this).siblings('div.action');
+      stepData.slideToggle();
     });
+  });
 
 })(jQuery);

data/web/assets/stylesheets/application.css

@@ -1,9 +1,9 @@
 body {
-    margin: 1em;
+  margin: 1em;
 }
 
 pre {
-    white-space: pre;
+  white-space: pre;
 }
 
 div.tab-pane {
@@ -25,77 +25,81 @@ ul.plan-step span.error {
 table.flow td.flow.sequence,
 table.flow td.flow.concurrence,
 table.flow-hint td.border {
-    border-style: solid;
-    border-width: 4px;
+  border-style: solid;
+  border-width: 4px;
 }
 
 table.flow-hint td {
-    width: 6em;
-    padding: 0.3em;
+  width: 6em;
+  padding: 0.3em;
 }
 
 table.flow-hint {
-    margin: 1em 0 1em 0;
+  margin: 1em 0 1em 0;
 }
 
 table.flow td.sequence, table.flow-hint td.sequence {
-    border-color: #FF6600;
+  border-color: #FF6600;
 }
 
 table.flow td.concurrence, table.flow-hint td.concurrence {
-    border-color: #005CE6;
+  border-color: #005CE6;
 }
 
 td.atom {
-    padding: 0;
+  padding: 0;
 }
 
 table.flow div.atom {
-    margin-bottom: -1.6em;
-    position: relative;
-    height: 2.1em;
-    top: 0;
-    left: 0;
-    z-index:-1;
+  margin-bottom: -1.6em;
+  position: relative;
+  height: 2.1em;
+  top: 0;
+  left: 0;
+  z-index: -1;
 }
 
 table.flow table {
-    width: 100%;
+  width: 100%;
 }
 
 table.flow td.success span.step-label {
-    color: #468847;
+  color: #468847;
 }
 
 table.flow div.success {
-    background-color: #DFF0D8;
+  background-color: #DFF0D8;
 }
 
 table.flow div.error {
-    background-color: #FF9D9D;
+  background-color: #FF9D9D;
 }
 
 table.flow td.skipped span.step-label {
-    color: #C09853;
+  color: #C09853;
 }
 
 table.flow div.skipped {
-    background-color: #FCF8E3;
+  background-color: #FCF8E3;
 }
 
 table.flow span.step-label {
-    cursor: pointer;
-    margin-left: 4px;
-    display: inline-block;
-    height: 1.5em;
+  cursor: pointer;
+  margin-left: 4px;
+  display: inline-block;
+  height: 1.5em;
+}
+
+.plan-step div.action {
+  display: none;
 }
 
 table.flow div.action {
-    background-color: white;
-    padding: 10px;
-    display: none;
+  background-color: white;
+  padding: 10px;
+  display: none;
 }
 
 table.flow td.error div.step-data {
-    display: block;
+  display: block;
 }

data/web/views/plan_step.erb

@@ -1,9 +1,13 @@
 <ul class="plan-step">
   <li>
-    <p>
+    <p class="step-label">
       <span class="label label-<%= step_css_class(step) %>"><%= h("#{step.action_class}") %></span>
     </p>
-    <%= step_error(step) %>
+    <div class="action">
+      <% action = step.action @plan %>
+      <%= show_action_data("Input:", action.input) %>
+      <%= step_error(step) %>
+    </div>
     <% step.children.each do |sub_step_id| %>
       <%= erb :plan_step, locals: { step: @plan.steps[sub_step_id] } %>
     <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport