dynflow 0.7.8 → 0.7.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTk4YWEzYzI4ZGUxYmEzYmRiZmYwZGUwN2I3ZjgzY2NlNmNjMDQ2OA==
+  data.tar.gz: !binary |-
+    OTFjZmY1OGE4MDI3MmIwY2YyYTIwYjZiOWI1YjljMTNiN2JhN2FhMA==
+SHA512:
+  metadata.gz: !binary |-
+    ZGRlZGI5Njc4ZDA4ZmFkNzMxMTdkMGM0M2E5Y2ZlNjljYjUxNzc5MDY0ZWY5
+    MWJmNWQzYjZjOGVhMTM2ODRiZjZlM2JkMTZhY2MwMzUwNDM4M2FlN2VmZjA3
+    ODIwODIzYjdkZGE2NGI1NGYzNzEzODQ4OTdjOWQyMTc0ZTI5YmQ=
+  data.tar.gz: !binary |-
+    OTllZWM0M2U2M2ZiN2I1MjA0MTQzM2ZlYzdiNzUxMzZjMTg2Mzg5ODRiOTcw
+    MWQwNTdmMjYxN2Q3ZWFlOGRmOTVmZjJhNjIyYTNlMjZiNWI4NTc2ZWNlODg4
+    MTUyNmMwNGY5MWFiZjc4MTU5YWRjMmEwYTllNzcwM2QzMWMxNDE=

data/doc/pages/source/documentation/index.md

@@ -486,7 +486,7 @@ def plan
   # so it's added to the above sequence to be executed as 4th.
   action1 = plan_action AnAction, actions_executed_sequentially.last.output
 
-  # It's planed in default plan's concurrency scope it's executed concurrently
+  # It's planned in default plan's concurrency scope it's executed concurrently
   # to about four actions.
   action2 = plan_action AnAction
 end

data/lib/dynflow/action.rb

@@ -246,6 +246,12 @@ module Dynflow
       @step.state
     end
 
+    # @override to define more descriptive state information for the
+    # action: used in Dynflow console
+    def humanized_state
+      state.to_s
+    end
+
     def error
       phase! Executable
       @step.error

data/lib/dynflow/testing/assertions.rb

@@ -3,7 +3,7 @@ module Dynflow
     module Assertions
       # assert that +assert_actioned_plan+ was planned by +action+ with arguments +plan_input+
       # alternatively plan-input can be asserted with +block+
-      def assert_action_planed_with(action, planned_action_class, *plan_input, &block)
+      def assert_action_planned_with(action, planned_action_class, *plan_input, &block)
         found_classes = assert_action_planed(action, planned_action_class)
         found         = found_classes.select do |a|
           if plan_input.empty?
@@ -20,7 +20,7 @@ module Dynflow
       end
 
       # assert that +assert_actioned_plan+ was planned by +action+
-      def assert_action_planed(action, planned_action_class)
+      def assert_action_planned(action, planned_action_class)
         Match! action.phase, Action::Plan
         Match! action.state, :success
         found = action.execution_plan.planned_plan_steps.
@@ -30,7 +30,7 @@ module Dynflow
         found
       end
 
-      def refute_action_planed(action, planned_action_class)
+      def refute_action_planned(action, planned_action_class)
         Match! action.phase, Action::Plan
         Match! action.state, :success
         found = action.execution_plan.planned_plan_steps.
@@ -40,6 +40,10 @@ module Dynflow
         found
       end
 
+      alias :assert_action_planed_with :assert_action_planned_with
+      alias :assert_action_planed :assert_action_planned
+      alias :refute_action_planed :refute_action_planned
+
       # assert that +action+ has run-phase planned
       def assert_run_phase(action, input = nil, &block)
         Match! action.phase, Action::Plan

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 end

data/lib/dynflow/web_console.rb

@@ -1,6 +1,6 @@
 require 'dynflow'
 require 'pp'
-require 'sinatra'
+require 'sinatra/base'
 require 'yaml'
 
 module Dynflow

data/test/action_test.rb

@@ -91,6 +91,32 @@ module Dynflow
       end
     end
 
+    describe '#humanized_state' do
+      include WorldInstance
+      include Testing
+
+      class ActionWithHumanizedState < Dynflow::Action
+        def run(event = nil)
+          suspend unless event
+        end
+
+        def humanized_state
+          case state
+          when :suspended
+            "waiting"
+          else
+            super
+          end
+        end
+      end
+
+      it 'is customizable from an action' do
+        plan   = create_and_plan_action ActionWithHumanizedState, {}
+        action = run_action(plan)
+        action.humanized_state.must_equal "waiting"
+      end
+    end
+
     describe 'polling action' do
       CWE = Support::CodeWorkflowExample
       include Dynflow::Testing

data/test/testing_test.rb

@@ -20,8 +20,8 @@ module Dynflow
         action.state.must_equal :success
         assert_run_phase action
         assert_finalize_phase action
-        assert_action_planed action, CWE::DummySuspended
-        refute_action_planed action, CWE::DummyAnotherTrigger
+        assert_action_planned action, CWE::DummySuspended
+        refute_action_planned action, CWE::DummyAnotherTrigger
       end
 
       specify 'stub_plan_action' do
@@ -103,11 +103,11 @@ module Dynflow
           refute_run_phase action
           refute_finalize_phase action
 
-          assert_action_planed action, CWE::Ci
-          assert_action_planed_with action, CWE::Review do |_, name, _|
+          assert_action_planned action, CWE::Ci
+          assert_action_planned_with action, CWE::Review do |_, name, _|
             name == 'Morfeus'
           end
-          assert_action_planed_with action, CWE::Review, sha, 'Neo', true
+          assert_action_planned_with action, CWE::Review, sha, 'Neo', true
         end
       end
 

data/web/views/flow_step.erb

@@ -6,7 +6,7 @@
 
 <span class="step-label">
   <%= h(step.id) %>: <%= h(step.action_class.name) %>
-  (<%= h(step.state) %>)
+  (<%= h(action.humanized_state) %>)
   <% unless step.state == :pending %>
     [ <%= duration_to_s(step.real_time) %> / <%= duration_to_s(step.execution_time) %> ]
   <% end %>

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.7.8
-  prerelease: 
+  version: 0.7.9
 platform: ruby
 authors:
 - Ivan Necas
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: apipie-params
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -143,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -151,7 +133,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -159,7 +140,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,7 +147,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -175,7 +154,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -183,7 +161,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -466,27 +443,26 @@ files:
 homepage: http://github.com/Dynflow/dynflow
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DYNamic workFLOW engine
 test_files:
 - test/action_test.rb