dynflow 0.6.2 → 0.7.0

data/test/test_helper.rb

@@ -16,6 +16,7 @@ require 'pry'
 
 require 'support/code_workflow_example'
 require 'support/middleware_example'
+require 'support/rescue_example'
 
 class TestExecutionLog
 
@@ -111,9 +112,11 @@ module WorldInstance
     @adapter ||= Dynflow::LoggerAdapters::Simple.new $stderr, 4
   end
 
-  def self.create_world
-    Dynflow::SimpleWorld.new logger_adapter: logger_adapter,
-                             auto_terminate: false
+  def self.create_world(options = {})
+    options = { logger_adapter: logger_adapter,
+                auto_terminate: false,
+                auto_rescue: false }.merge(options)
+    Dynflow::SimpleWorld.new(options)
   end
 
   def self.create_remote_world(world)

data/web/assets/stylesheets/application.css

@@ -63,6 +63,10 @@ table.flow table {
   width: 100%;
 }
 
+ul.plan-step p.step-label {
+  cursor: pointer;
+}
+
 table.flow td.success span.step-label {
   color: #468847;
 }

data/web/views/flow_step.erb

@@ -11,9 +11,13 @@
     [ <%= duration_to_s(step.real_time) %> / <%= duration_to_s(step.execution_time) %> ]
   <% end %>
 </span>
-<% if @plan.state == :paused && step.state == :error %>
+<% if @plan.state == :paused && step.skippable? %>
   <a href="<%= url("/#{@plan.id}/skip/#{step.id}") %>" class="postlink">Skip</a>
 <% end %>
+<% if step.cancellable? %>
+  <a href="<%= url("/#{@plan.id}/cancel/#{step.id}") %>" class="postlink">Cancel</a>
+<% end %>
+
 <div class="action">
   <% unless @plan.state == :pending %>
     <p><b>Started at:</b> <%= h(step.started_at) %></p>

data/web/views/show.erb

@@ -1,4 +1,6 @@
-<p id="notice"><%= h(@notice) %></p>
+<% if @notice %>
+  <div id="notice" class="alert alert-warning"><%= h(@notice) %></div>
+<% end %>
 
 
 <p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -218,21 +218,24 @@ files:
 - README.md
 - Rakefile
 - doc/images/logo.png
+- doc/images/screenshot.png
 - dynflow.gemspec
-- examples/generate_work_for_daemon.rb
+- examples/example_helper.rb
 - examples/orchestrate.rb
-- examples/run_daemon.rb
-- examples/web_console.rb
+- examples/orchestrate_evented.rb
+- examples/remote_executor.rb
 - lib/dynflow.rb
 - lib/dynflow/action.rb
-- lib/dynflow/action/cancellable_polling.rb
+- lib/dynflow/action/cancellable.rb
 - lib/dynflow/action/format.rb
 - lib/dynflow/action/missing.rb
 - lib/dynflow/action/polling.rb
 - lib/dynflow/action/progress.rb
+- lib/dynflow/action/rescue.rb
 - lib/dynflow/action/suspended.rb
 - lib/dynflow/clock.rb
 - lib/dynflow/daemon.rb
+- lib/dynflow/errors.rb
 - lib/dynflow/execution_plan.rb
 - lib/dynflow/execution_plan/dependency_graph.rb
 - lib/dynflow/execution_plan/output_reference.rb
@@ -314,8 +317,10 @@ files:
 - test/middleware_test.rb
 - test/persistance_adapters_test.rb
 - test/remote_via_socket_test.rb
+- test/rescue_test.rb
 - test/support/code_workflow_example.rb
 - test/support/middleware_example.rb
+- test/support/rescue_example.rb
 - test/test_helper.rb
 - test/testing_test.rb
 - test/web_console_test.rb
@@ -372,8 +377,10 @@ test_files:
 - test/middleware_test.rb
 - test/persistance_adapters_test.rb
 - test/remote_via_socket_test.rb
+- test/rescue_test.rb
 - test/support/code_workflow_example.rb
 - test/support/middleware_example.rb
+- test/support/rescue_example.rb
 - test/test_helper.rb
 - test/testing_test.rb
 - test/web_console_test.rb

data/examples/generate_work_for_daemon.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-root_path    = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-dynflow_path = File.join(root_path, 'lib')
-$LOAD_PATH << dynflow_path unless $LOAD_PATH.include? dynflow_path
-
-require 'dynflow'
-require 'tmpdir'
-
-socket_path         = File.join(Dir.tmpdir, 'dynflow_socket')
-persistence_adapter = Dynflow::PersistenceAdapters::Sequel.new ARGV[0] || 'sqlite://db.sqlite'
-
-world = Dynflow::SimpleWorld.new do |world|
-  { persistence_adapter: persistence_adapter,
-    executor:            Dynflow::Executors::RemoteViaSocket.new(world, socket_path) }
-end
-
-load File.join(root_path, 'test', 'code_workflow_example.rb')
-
-loop do
-  world.trigger Dynflow::CodeWorkflowExample::Slow, 1
-  sleep 0.5
-  p 'tick'
-end

data/examples/run_daemon.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-root_path    = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-dynflow_path = File.join(root_path, 'lib')
-$LOAD_PATH << dynflow_path unless $LOAD_PATH.include? dynflow_path
-
-require 'dynflow'
-require 'tmpdir'
-
-socket              = File.join(Dir.tmpdir, 'dynflow_socket')
-persistence_adapter = Dynflow::PersistenceAdapters::Sequel.new ARGV[0] || 'sqlite://db.sqlite'
-world               = Dynflow::SimpleWorld.new persistence_adapter: persistence_adapter
-listener            = Dynflow::Listeners::Socket.new world, socket
-
-load File.join(root_path, 'test', 'code_workflow_example.rb')
-
-Dynflow::Daemon.new(listener, world).run

data/examples/web_console.rb

@@ -1,29 +0,0 @@
-# Demo for Dynflow web console
-# usage: ruby web_console.rb
-
-$:.unshift(File.expand_path('../../lib', __FILE__))
-
-require 'dynflow'
-require_relative 'orchestrate'
-
-world = Dynflow::SimpleWorld.new
-
-require 'dynflow/web_console'
-dynflow_console = Dynflow::WebConsole.setup do
-  set :world, world
-end
-
-3.times do
-  Thread.new do
-    3.times do
-      world.trigger(Orchestrate::CreateInfrastructure)
-    end
-  end
-end
-
-puts <<MESSAGE
-=============================================
-  See the console at http://localhost:4567/
-=============================================
-MESSAGE
-dynflow_console.run!