RubyGems - ruote - Versions diffs - 2.2.0 → 2.3.0 - Mend

ruote 2.2.0 → 2.3.0

Files changed (305) hide show

data/CHANGELOG.txt +166 -1
data/CREDITS.txt +36 -17
data/LICENSE.txt +1 -1
data/README.rdoc +1 -7
data/Rakefile +38 -29
data/TODO.txt +93 -52
data/lib/ruote-fs.rb +3 -0
data/lib/ruote.rb +5 -1
data/lib/ruote/context.rb +140 -35
data/lib/ruote/dashboard.rb +1247 -0
data/lib/ruote/{engine → dboard}/process_error.rb +22 -2
data/lib/ruote/dboard/process_status.rb +587 -0
data/lib/ruote/engine.rb +6 -871
data/lib/ruote/exp/command.rb +7 -2
data/lib/ruote/exp/commanded.rb +2 -2
data/lib/ruote/exp/condition.rb +38 -13
data/lib/ruote/exp/fe_add_branches.rb +1 -1
data/lib/ruote/exp/fe_apply.rb +1 -1
data/lib/ruote/exp/fe_await.rb +357 -0
data/lib/ruote/exp/fe_cancel_process.rb +17 -3
data/lib/ruote/exp/fe_command.rb +8 -4
data/lib/ruote/exp/fe_concurrence.rb +218 -18
data/lib/ruote/exp/fe_concurrent_iterator.rb +71 -10
data/lib/ruote/exp/fe_cron.rb +3 -10
data/lib/ruote/exp/fe_cursor.rb +14 -4
data/lib/ruote/exp/fe_define.rb +3 -1
data/lib/ruote/exp/fe_echo.rb +1 -1
data/lib/ruote/exp/fe_equals.rb +1 -1
data/lib/ruote/exp/fe_error.rb +1 -1
data/lib/ruote/exp/fe_filter.rb +163 -4
data/lib/ruote/exp/fe_forget.rb +21 -4
data/lib/ruote/exp/fe_given.rb +1 -1
data/lib/ruote/exp/fe_if.rb +1 -1
data/lib/ruote/exp/fe_inc.rb +102 -35
data/lib/ruote/exp/fe_iterator.rb +47 -12
data/lib/ruote/exp/fe_listen.rb +96 -11
data/lib/ruote/exp/fe_lose.rb +31 -4
data/lib/ruote/exp/fe_noop.rb +1 -1
data/lib/ruote/exp/fe_on_error.rb +109 -0
data/lib/ruote/exp/fe_once.rb +10 -19
data/lib/ruote/exp/fe_participant.rb +90 -28
data/lib/ruote/exp/fe_read.rb +69 -0
data/lib/ruote/exp/fe_redo.rb +3 -2
data/lib/ruote/exp/fe_ref.rb +57 -27
data/lib/ruote/exp/fe_registerp.rb +1 -3
data/lib/ruote/exp/fe_reserve.rb +1 -1
data/lib/ruote/exp/fe_restore.rb +6 -6
data/lib/ruote/exp/fe_save.rb +12 -19
data/lib/ruote/exp/fe_sequence.rb +38 -2
data/lib/ruote/exp/fe_set.rb +143 -40
data/lib/ruote/exp/{fe_let.rb → fe_stall.rb} +7 -38
data/lib/ruote/exp/fe_subprocess.rb +8 -2
data/lib/ruote/exp/fe_that.rb +1 -1
data/lib/ruote/exp/fe_undo.rb +40 -4
data/lib/ruote/exp/fe_unregisterp.rb +1 -3
data/lib/ruote/exp/fe_wait.rb +12 -25
data/lib/ruote/exp/{flowexpression.rb → flow_expression.rb} +375 -229
data/lib/ruote/exp/iterator.rb +2 -2
data/lib/ruote/exp/merge.rb +78 -17
data/lib/ruote/exp/ro_attributes.rb +46 -36
data/lib/ruote/exp/ro_filters.rb +34 -8
data/lib/ruote/exp/ro_on_x.rb +431 -0
data/lib/ruote/exp/ro_persist.rb +19 -7
data/lib/ruote/exp/ro_timers.rb +123 -0
data/lib/ruote/exp/ro_variables.rb +90 -29
data/lib/ruote/fei.rb +57 -3
data/lib/ruote/fs.rb +3 -0
data/lib/ruote/id/mnemo_wfid_generator.rb +30 -7
data/lib/ruote/id/wfid_generator.rb +17 -38
data/lib/ruote/log/default_history.rb +23 -9
data/lib/ruote/log/fancy_printing.rb +265 -0
data/lib/ruote/log/storage_history.rb +23 -13
data/lib/ruote/log/wait_logger.rb +224 -17
data/lib/ruote/observer.rb +82 -0
data/lib/ruote/part/block_participant.rb +65 -28
data/lib/ruote/part/code_participant.rb +81 -0
data/lib/ruote/part/engine_participant.rb +7 -2
data/lib/ruote/part/local_participant.rb +221 -21
data/lib/ruote/part/no_op_participant.rb +1 -1
data/lib/ruote/part/null_participant.rb +1 -1
data/lib/ruote/part/participant.rb +50 -0
data/lib/ruote/part/rev_participant.rb +178 -0
data/lib/ruote/part/smtp_participant.rb +2 -2
data/lib/ruote/part/storage_participant.rb +228 -60
data/lib/ruote/part/template.rb +1 -1
data/lib/ruote/participant.rb +2 -0
data/lib/ruote/reader.rb +205 -68
data/lib/ruote/reader/json.rb +49 -0
data/lib/ruote/reader/radial.rb +303 -0
data/lib/ruote/reader/ruby_dsl.rb +44 -9
data/lib/ruote/reader/xml.rb +11 -8
data/lib/ruote/receiver/base.rb +98 -45
data/lib/ruote/storage/base.rb +104 -35
data/lib/ruote/storage/composite_storage.rb +50 -60
data/lib/ruote/storage/fs_storage.rb +25 -34
data/lib/ruote/storage/hash_storage.rb +38 -36
data/lib/ruote/svc/dispatch_pool.rb +104 -35
data/lib/ruote/svc/dollar_sub.rb +10 -8
data/lib/ruote/svc/error_handler.rb +108 -52
data/lib/ruote/svc/expression_map.rb +3 -3
data/lib/ruote/svc/participant_list.rb +160 -55
data/lib/ruote/svc/tracker.rb +31 -31
data/lib/ruote/svc/treechecker.rb +28 -16
data/lib/ruote/tree_dot.rb +1 -1
data/lib/ruote/util/deep.rb +143 -0
data/lib/ruote/util/filter.rb +125 -18
data/lib/ruote/util/hashdot.rb +15 -13
data/lib/ruote/util/look.rb +1 -1
data/lib/ruote/util/lookup.rb +60 -22
data/lib/ruote/util/misc.rb +63 -18
data/lib/ruote/util/mpatch.rb +53 -0
data/lib/ruote/util/ometa.rb +1 -2
data/lib/ruote/util/process_observer.rb +177 -0
data/lib/ruote/util/subprocess.rb +1 -1
data/lib/ruote/util/time.rb +2 -2
data/lib/ruote/util/tree.rb +64 -2
data/lib/ruote/version.rb +3 -2
data/lib/ruote/worker.rb +421 -92
data/lib/ruote/workitem.rb +157 -22
data/ruote.gemspec +15 -9
data/test/bm/ci.rb +0 -2
data/test/bm/ici.rb +0 -2
data/test/bm/load_26c.rb +0 -3
data/test/bm/mega.rb +0 -2
data/test/functional/base.rb +57 -43
data/test/functional/concurrent_base.rb +16 -13
data/test/functional/ct_0_concurrence.rb +7 -11
data/test/functional/ct_1_iterator.rb +9 -11
data/test/functional/ct_2_cancel.rb +28 -17
data/test/functional/eft_0_flow_expression.rb +35 -0
data/test/functional/eft_10_cancel_process.rb +1 -1
data/test/functional/eft_11_wait.rb +13 -13
data/test/functional/eft_12_listen.rb +199 -66
data/test/functional/eft_13_iterator.rb +95 -29
data/test/functional/eft_14_cursor.rb +74 -24
data/test/functional/eft_15_loop.rb +7 -7
data/test/functional/eft_16_if.rb +1 -1
data/test/functional/eft_17_equals.rb +1 -1
data/test/functional/eft_18_concurrent_iterator.rb +156 -68
data/test/functional/eft_19_reserve.rb +15 -15
data/test/functional/eft_1_echo.rb +1 -1
data/test/functional/eft_20_save.rb +51 -9
data/test/functional/eft_21_restore.rb +1 -1
data/test/functional/eft_22_noop.rb +1 -1
data/test/functional/eft_23_apply.rb +1 -1
data/test/functional/eft_24_add_branches.rb +7 -8
data/test/functional/eft_25_command.rb +1 -1
data/test/functional/eft_26_error.rb +11 -11
data/test/functional/eft_27_inc.rb +111 -67
data/test/functional/eft_28_once.rb +16 -16
data/test/functional/eft_29_cron.rb +9 -9
data/test/functional/eft_2_sequence.rb +23 -4
data/test/functional/eft_30_ref.rb +36 -24
data/test/functional/eft_31_registerp.rb +24 -24
data/test/functional/eft_32_lose.rb +46 -20
data/test/functional/eft_34_given.rb +1 -1
data/test/functional/eft_35_filter.rb +161 -7
data/test/functional/eft_36_read.rb +97 -0
data/test/functional/{eft_0_process_definition.rb → eft_37_process_definition.rb} +4 -4
data/test/functional/eft_38_on_error.rb +195 -0
data/test/functional/eft_39_stall.rb +35 -0
data/test/functional/eft_3_participant.rb +77 -22
data/test/functional/eft_40_await.rb +297 -0
data/test/functional/eft_4_set.rb +110 -11
data/test/functional/eft_5_subprocess.rb +27 -5
data/test/functional/eft_6_concurrence.rb +299 -60
data/test/functional/eft_7_forget.rb +24 -22
data/test/functional/eft_8_undo.rb +52 -15
data/test/functional/eft_9_redo.rb +18 -20
data/test/functional/ft_0_worker.rb +122 -13
data/test/functional/ft_10_dollar.rb +77 -16
data/test/functional/ft_11_recursion.rb +9 -9
data/test/functional/ft_12_launchitem.rb +7 -9
data/test/functional/ft_13_variables.rb +125 -22
data/test/functional/ft_14_re_apply.rb +112 -56
data/test/functional/ft_15_timeout.rb +64 -33
data/test/functional/ft_16_participant_params.rb +59 -6
data/test/functional/ft_17_conditional.rb +68 -2
data/test/functional/ft_18_kill.rb +48 -30
data/test/functional/ft_19_participant_code.rb +67 -0
data/test/functional/ft_1_process_status.rb +222 -150
data/test/functional/ft_20_storage_participant.rb +445 -44
data/test/functional/ft_21_forget.rb +21 -26
data/test/functional/ft_22_process_definitions.rb +8 -6
data/test/functional/ft_23_load_defs.rb +29 -5
data/test/functional/ft_24_block_participant.rb +199 -20
data/test/functional/ft_25_receiver.rb +98 -46
data/test/functional/ft_26_participant_rtimeout.rb +34 -26
data/test/functional/ft_27_var_indirection.rb +40 -5
data/test/functional/ft_28_null_noop_participants.rb +5 -5
data/test/functional/ft_29_part_template.rb +2 -2
data/test/functional/ft_2_errors.rb +106 -74
data/test/functional/ft_30_smtp_participant.rb +7 -7
data/test/functional/ft_31_part_blocking.rb +11 -11
data/test/functional/ft_32_scope.rb +50 -0
data/test/functional/ft_33_participant_subprocess_priority.rb +3 -3
data/test/functional/ft_34_cursor_rewind.rb +14 -14
data/test/functional/ft_35_add_service.rb +67 -9
data/test/functional/ft_36_storage_history.rb +92 -24
data/test/functional/ft_37_default_history.rb +35 -23
data/test/functional/ft_38_participant_more.rb +189 -32
data/test/functional/ft_39_wait_for.rb +25 -25
data/test/functional/ft_3_participant_registration.rb +235 -107
data/test/functional/ft_40_wait_logger.rb +105 -18
data/test/functional/ft_41_participants.rb +13 -12
data/test/functional/ft_42_storage_copy.rb +12 -12
data/test/functional/ft_43_participant_on_reply.rb +85 -11
data/test/functional/ft_44_var_participant.rb +5 -5
data/test/functional/ft_45_participant_accept.rb +3 -3
data/test/functional/ft_46_launch_single.rb +17 -17
data/test/functional/ft_47_wfids.rb +41 -0
data/test/functional/ft_48_lose.rb +19 -25
data/test/functional/ft_49_engine_on_error.rb +54 -70
data/test/functional/ft_4_cancel.rb +84 -26
data/test/functional/ft_50_engine_config.rb +4 -4
data/test/functional/ft_51_misc.rb +12 -12
data/test/functional/ft_52_case.rb +17 -17
data/test/functional/ft_53_engine_on_terminate.rb +18 -21
data/test/functional/ft_54_patterns.rb +18 -16
data/test/functional/ft_55_engine_participant.rb +55 -55
data/test/functional/ft_56_filter_attribute.rb +90 -52
data/test/functional/ft_57_rev_participant.rb +252 -0
data/test/functional/ft_58_workitem.rb +150 -0
data/test/functional/ft_59_pause.rb +329 -0
data/test/functional/ft_5_on_error.rb +430 -77
data/test/functional/ft_60_code_participant.rb +65 -0
data/test/functional/ft_61_trailing_fields.rb +34 -0
data/test/functional/ft_62_exp_name_and_dollar_substitution.rb +35 -0
data/test/functional/ft_63_participants_221.rb +458 -0
data/test/functional/ft_64_stash.rb +41 -0
data/test/functional/ft_65_timers.rb +313 -0
data/test/functional/ft_66_flank.rb +133 -0
data/test/functional/ft_67_radial_misc.rb +34 -0
data/test/functional/ft_68_reput.rb +72 -0
data/test/functional/ft_69_worker_info.rb +56 -0
data/test/functional/ft_6_on_cancel.rb +189 -36
data/test/functional/ft_70_take_and_discard_attributes.rb +94 -0
data/test/functional/ft_71_retries.rb +144 -0
data/test/functional/ft_72_on_terminate.rb +60 -0
data/test/functional/ft_73_raise_msg.rb +107 -0
data/test/functional/ft_74_respark.rb +106 -0
data/test/functional/ft_75_context.rb +66 -0
data/test/functional/ft_76_observer.rb +53 -0
data/test/functional/ft_77_process_observer.rb +157 -0
data/test/functional/ft_78_part_participant.rb +37 -0
data/test/functional/ft_7_tags.rb +238 -50
data/test/functional/ft_8_participant_consumption.rb +27 -21
data/test/functional/ft_9_subprocesses.rb +48 -18
data/test/functional/restart_base.rb +4 -6
data/test/functional/rt_0_wait.rb +10 -10
data/test/functional/rt_1_listen.rb +6 -6
data/test/functional/rt_2_errors.rb +12 -12
data/test/functional/rt_3_once.rb +17 -12
data/test/functional/rt_4_cron.rb +17 -17
data/test/functional/rt_5_timeout.rb +13 -13
data/test/functional/signals.rb +103 -0
data/test/functional/storage.rb +730 -0
data/test/functional/storage_helper.rb +48 -35
data/test/functional/test.rb +6 -2
data/test/misc/idle.rb +21 -0
data/test/misc/light.rb +29 -0
data/test/path_helper.rb +1 -1
data/test/test.rb +2 -5
data/test/test_helper.rb +13 -0
data/test/unit/test.rb +1 -4
data/test/unit/ut_0_ruby_reader.rb +25 -9
data/test/unit/ut_10_participants.rb +47 -0
data/test/unit/ut_11_lookup.rb +59 -2
data/test/unit/ut_12_wait_logger.rb +123 -0
data/test/unit/ut_14_is_uri.rb +1 -1
data/test/unit/ut_15_util.rb +1 -1
data/test/unit/ut_16_reader.rb +136 -14
data/test/unit/ut_17_merge.rb +155 -0
data/test/unit/ut_19_part_template.rb +1 -1
data/test/unit/ut_1_fei.rb +11 -2
data/test/unit/ut_20_composite_storage.rb +27 -1
data/test/unit/{ut_21_participant_list.rb → ut_21_svc_participant_list.rb} +2 -3
data/test/unit/ut_22_filter.rb +231 -10
data/test/unit/ut_23_svc_tracker.rb +48 -0
data/test/unit/ut_24_radial_reader.rb +458 -0
data/test/unit/ut_25_process_status.rb +143 -0
data/test/unit/ut_26_deep.rb +131 -0
data/test/unit/ut_2_dashboard.rb +114 -0
data/test/unit/ut_3_worker.rb +54 -0
data/test/unit/ut_4_expmap.rb +1 -1
data/test/unit/ut_5_tree.rb +23 -23
data/test/unit/ut_6_condition.rb +71 -29
data/test/unit/ut_7_workitem.rb +18 -4
data/test/unit/ut_8_tree_to_dot.rb +1 -1
data/test/unit/ut_9_xml_reader.rb +1 -1
metadata +142 -63
data/jruby_issue.txt +0 -32
data/lib/ruote/engine/process_status.rb +0 -403
data/lib/ruote/log/pretty.rb +0 -165
data/lib/ruote/log/test_logger.rb +0 -204
data/lib/ruote/util/serializer.rb +0 -103
data/phil.txt +0 -14
data/test/functional/eft_33_let.rb +0 -31
data/test/functional/ft_19_alias.rb +0 -33
data/test/functional/ft_47_wfid_generator.rb +0 -54
data/test/unit/storage.rb +0 -403
data/test/unit/storages.rb +0 -37
data/test/unit/ut_13_serializer.rb +0 -65
data/test/unit/ut_18_engine.rb +0 -47
data/test/unit/ut_3_wait_logger.rb +0 -39

data/test/functional/ft_14_re_apply.rb CHANGED

@@ -5,7 +5,7 @@
 # Thu Jun 25 13:31:26 JST 2009
 #
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 class FtReApplyTest < Test::Unit::TestCase
@@ -20,29 +20,29 @@ class FtReApplyTest < Test::Unit::TestCase
   def test_re_apply
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(PDEF)
+    wfid = @dashboard.launch(PDEF)
     wait_for(:alpha)
     id0 = alpha.first.object_id
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
-    @engine.re_apply(stalled_exp.fei)
+    @dashboard.re_apply(stalled_exp.fei)
     wait_for(:alpha)
     assert_equal 1, alpha.size
     assert_not_equal id0, alpha.first.object_id
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(wfid)
@@ -51,29 +51,29 @@ class FtReApplyTest < Test::Unit::TestCase
   def test_cancel_and_re_apply
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(PDEF)
+    wfid = @dashboard.launch(PDEF)
     wait_for(:alpha)
     id0 = alpha.first.object_id
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
-    @engine.re_apply(stalled_exp.fei)
+    @dashboard.re_apply(stalled_exp.fei)
     wait_for(:alpha)
     assert_equal 1, alpha.size
     assert_not_equal id0, alpha.first.object_id
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(wfid)
@@ -82,11 +82,11 @@ class FtReApplyTest < Test::Unit::TestCase
   def test_update_expression_and_re_apply
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(PDEF)
+    wfid = @dashboard.launch(PDEF)
     wait_for(:alpha)
     sleep 0.350 # threaded dispatch
@@ -95,7 +95,7 @@ class FtReApplyTest < Test::Unit::TestCase
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
@@ -104,13 +104,13 @@ class FtReApplyTest < Test::Unit::TestCase
     #p [ :stalled, stalled_exp.h['_rev'] ]
     stalled_exp.persist
-    @engine.re_apply(stalled_exp.fei)
+    @dashboard.re_apply(stalled_exp.fei)
     wait_for(:alpha)
     assert_equal 'mow lawn', alpha.first.fields['params']['activity']
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(wfid)
@@ -126,29 +126,29 @@ class FtReApplyTest < Test::Unit::TestCase
       end
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:alpha)
     id0 = alpha.first.object_id
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
-    @engine.re_apply(stalled_exp.fei, :fields => { 'x' => 'nada' })
+    @dashboard.re_apply(stalled_exp.fei, :fields => { 'x' => 'nada' })
     wait_for(:alpha)
     assert_equal 1, alpha.size
     assert_not_equal id0, alpha.first.object_id
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(wfid)
@@ -164,29 +164,29 @@ class FtReApplyTest < Test::Unit::TestCase
       end
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef, { 'y' => 'nemo' })
+    wfid = @dashboard.launch(pdef, { 'y' => 'nemo' })
     wait_for(:alpha)
     id0 = alpha.first.object_id
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
-    @engine.re_apply(stalled_exp.fei, :merge_in_fields => { 'x' => 'nada' })
+    @dashboard.re_apply(stalled_exp.fei, :merge_in_fields => { 'x' => 'nada' })
     wait_for(:alpha)
     assert_equal 1, alpha.size
     assert_not_equal id0, alpha.first.object_id
-    alpha.reply(alpha.first)
+    alpha.proceed(alpha.first)
     wait_for(wfid)
@@ -195,22 +195,22 @@ class FtReApplyTest < Test::Unit::TestCase
   def test_re_apply_with_new_tree
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(PDEF)
+    wfid = @dashboard.launch(PDEF)
     wait_for(:alpha)
     id0 = alpha.first.object_id
     # ... flow stalled ...
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
-    @engine.re_apply(
+    @dashboard.re_apply(
       stalled_exp.fei, :tree => [ 'echo', { 're_applied' => nil }, [] ])
     wait_for(wfid)
@@ -220,77 +220,133 @@ class FtReApplyTest < Test::Unit::TestCase
   def test_new_tree_and_process_status_current_tree
-    @engine.register_participant '.+', Ruote::StorageParticipant
+    #@dashboard.noisy = true
-    wfid = @engine.launch(Ruote.define { alpha })
+    @dashboard.register_participant '.+', Ruote::StorageParticipant
-    @engine.wait_for(:alpha)
+    wfid = @dashboard.launch(Ruote.define { alpha })
+    @dashboard.wait_for(:alpha)
     assert_equal(
       [ 'define', {}, [ [ 'participant', { 'ref' => 'alpha' }, [] ] ] ],
-      @engine.process(wfid).current_tree)
+      @dashboard.process(wfid).current_tree)
-    fei = @engine.storage_participant.first.fei
+    fei = @dashboard.storage_participant.first.fei
-    @engine.re_apply(fei, :tree => [ 'bravo', {}, [] ])
+    @dashboard.re_apply(fei, :tree => [ 'bravo', {}, [] ])
-    @engine.wait_for(:bravo)
+    @dashboard.wait_for(:bravo)
     assert_equal(
       'bravo',
-      @engine.storage_participant.first.participant_name)
+      @dashboard.storage_participant.first.participant_name)
     assert_equal(
       [ 'participant', { 'ref' => 'bravo', '_triggered' => 'on_re_apply' }, [] ],
-      @engine.process(wfid).expressions.last.tree)
+      @dashboard.process(wfid).expressions.last.tree)
     assert_equal(
       [ 'define', {}, [ [ 'participant', { 'ref' => 'bravo', '_triggered' => 'on_re_apply' }, [] ] ] ],
-      @engine.process(wfid).current_tree)
+      @dashboard.process(wfid).current_tree)
   end
   # Issue reported by Brett Anthoine
   #
   def test_re_apply_root
-    @engine.register_participant '.+', Ruote::StorageParticipant
+    @dashboard.register_participant '.+', Ruote::StorageParticipant
-    wfid = @engine.launch(Ruote.define { alpha })
+    wfid = @dashboard.launch(Ruote.define { alpha })
-    @engine.wait_for(:alpha)
-    at0 = @engine.storage_participant.first.dispatched_at
+    @dashboard.wait_for(:alpha)
+    at0 = @dashboard.storage_participant.first.dispatched_at
-    root = @engine.process(wfid).root_expression
-    @engine.re_apply(root.fei)
+    root = @dashboard.process(wfid).root_expression
+    @dashboard.re_apply(root.fei)
-    @engine.wait_for(:alpha)
-    at1 = @engine.storage_participant.first.dispatched_at
+    @dashboard.wait_for(:alpha)
+    at1 = @dashboard.storage_participant.first.dispatched_at
     assert at1 > at0
   end
   def test_re_apply_define
-    @engine.register_participant '.+', Ruote::StorageParticipant
+    @dashboard.register_participant '.+', Ruote::StorageParticipant
-    wfid = @engine.launch(Ruote.define do
+    wfid = @dashboard.launch(Ruote.define do
       sub0
       define 'sub0' do
         alpha
       end
     end)
-    @engine.wait_for(:alpha)
-    at0 = @engine.storage_participant.first.dispatched_at
+    @dashboard.wait_for(:alpha)
+    at0 = @dashboard.storage_participant.first.dispatched_at
-    exp = @engine.process(wfid).expressions[1]
+    exp = @dashboard.process(wfid).expressions[1]
-    @engine.re_apply(exp.fei)
+    @dashboard.re_apply(exp.fei)
-    @engine.wait_for(:alpha)
-    at1 = @engine.storage_participant.first.dispatched_at
+    @dashboard.wait_for(:alpha)
+    at1 = @dashboard.storage_participant.first.dispatched_at
     assert at1 > at0
   end
+  def test_re_apply_chunk
+    @dashboard.register_participant '.+', Ruote::StorageParticipant
+    wfid = @dashboard.launch(Ruote.define do
+      alpha
+    end)
+    @dashboard.wait_for(:alpha)
+    at0 = @dashboard.storage_participant.first.dispatched_at
+    exp = @dashboard.process(wfid).expressions.last
+    t = Ruote.tree do
+      alpha :take => two
+    end
+    @dashboard.re_apply(exp)
+    @dashboard.wait_for(:alpha)
+    wi1 = @dashboard.storage_participant.first
+    at1 = wi1.dispatched_at
+    assert at1 > at0
+    assert_equal 'on_re_apply', wi1.params['_triggered']
+  end
+  # Making sure re_apply nukes errors
+  #
+  def test_re_apply_error
+    #@dashboard.noisy = true
+    @dashboard.register_participant '.+', Ruote::StorageParticipant
+    wfid = @dashboard.launch(Ruote.define do
+      error "X"
+    end)
+    @dashboard.wait_for(wfid)
+    fei = @dashboard.ps(wfid).expressions.last.fei
+    @dashboard.re_apply(fei, :tree => [ 'alpha', {}, [] ])
+    @dashboard.wait_for(:alpha)
+    ps = @dashboard.ps(wfid)
+    assert_equal 0, ps.errors.size
+    assert_equal Ruote::Exp::ParticipantExpression, ps.expressions.last.class
+  end
 end

data/test/functional/ft_15_timeout.rb CHANGED

@@ -5,7 +5,7 @@
 # Sun Jun 28 16:45:57 JST 2009
 #
-require File.join(File.dirname(__FILE__), 'base')
+require File.expand_path('../base', __FILE__)
 class FtTimeoutTest < Test::Unit::TestCase
@@ -20,21 +20,27 @@ class FtTimeoutTest < Test::Unit::TestCase
       end
     end
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    sto = @engine.register_participant :bravo, Ruote::StorageParticipant
+    @dashboard.register_participant :alpha, Ruote::StorageParticipant
+    sto = @dashboard.register_participant :bravo, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(:bravo)
     assert_equal 1, sto.size
     assert_equal 'bravo', sto.first.participant_name
     assert_equal 2, logger.log.select { |e| e['flavour'] == 'timeout' }.size
-    assert_equal 0, @engine.storage.get_many('schedules').size
+    assert_equal 0, @dashboard.storage.get_many('schedules').size
-    assert_not_nil sto.first.fields['__timed_out__']
+    assert_equal wfid, sto.first.fields['__timed_out__'][0]['wfid']
+    assert_equal '0_0_0', sto.first.fields['__timed_out__'][0]['expid']
+    assert_equal 'participant', sto.first.fields['__timed_out__'][2]
+    assert_equal(
+      { 'timeout' => '1.1', 'ref' => 'alpha' },
+      sto.first.fields['__timed_out__'][3])
   end
   def test_cancel_timeout
@@ -46,24 +52,24 @@ class FtTimeoutTest < Test::Unit::TestCase
       end
     end
-    @engine.register_participant :alpha, Ruote::StorageParticipant
-    sto = @engine.register_participant :bravo, Ruote::StorageParticipant
+    @dashboard.register_participant :alpha, Ruote::StorageParticipant
+    sto = @dashboard.register_participant :bravo, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(6)
     assert_equal 1, sto.size
     assert_equal 'alpha', sto.first.participant_name
-    @engine.cancel_expression(sto.first.fei)
+    @dashboard.cancel_expression(sto.first.fei)
     wait_for(:bravo)
     assert_equal 1, sto.size
     assert_equal 'bravo', sto.first.participant_name
-    assert_equal 0, @engine.storage.get_many('schedules').size
+    assert_equal 0, @dashboard.storage.get_many('schedules').size
   end
   def test_on_timeout_redo
@@ -82,11 +88,11 @@ class FtTimeoutTest < Test::Unit::TestCase
       alpha :timeout => '1.1', :on_timeout => 'redo'
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(8)
     #logger.log.each { |e| p e['flavour'] }
@@ -94,12 +100,12 @@ class FtTimeoutTest < Test::Unit::TestCase
     3.times do
       Thread.pass
-      @engine.cancel_process(wfid)
+      @dashboard.cancel_process(wfid)
     end
     wait_for(wfid)
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
   end
   def test_on_timeout_cancel_nested
@@ -113,16 +119,16 @@ class FtTimeoutTest < Test::Unit::TestCase
       end
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
     assert_equal 'timed out', @tracer.to_s
-    assert_equal 0, @engine.context.storage.get_many('expressions').size
+    assert_equal 0, @dashboard.context.storage.get_many('expressions').size
     assert_equal 0, alpha.size
   end
@@ -132,21 +138,21 @@ class FtTimeoutTest < Test::Unit::TestCase
       alpha :timeout => '1.1', :on_timeout => 'error'
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     assert_equal 1, ps.errors.size
     err = ps.errors.first
     err.tree = [ 'alpha', {}, [] ]
-    @engine.replay_at_error(err)
+    @dashboard.replay_at_error(err)
     wait_for(:alpha)
     assert_equal 1, alpha.size
@@ -161,18 +167,43 @@ class FtTimeoutTest < Test::Unit::TestCase
       end
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(wfid)
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     assert_equal 1, ps.errors.size
     assert_equal 0, alpha.size
     assert_equal 2, ps.expressions.size
   end
+  def test_on_timeout_jump
+    pdef = Ruote.define do
+      cursor do
+        alpha :timeout => '1.1', :on_timeout => 'jump to charly'
+        bravo
+        charly
+      end
+    end
+    @dashboard.register_participant 'alpha' do |wi|
+      sleep 60
+    end
+    @dashboard.register_participant '.+' do |wi|
+      tracer << wi.participant_name + "\n"
+    end
+    #@dashboard.noisy = true
+    wfid = @dashboard.launch(pdef)
+    @dashboard.wait_for(wfid)
+    assert_equal 'charly', @tracer.to_s
+  end
   def test_timeout_then_error
     pdef = Ruote.process_definition do
@@ -183,14 +214,14 @@ class FtTimeoutTest < Test::Unit::TestCase
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     wait_for(4)
-    ps = @engine.process(wfid)
+    ps = @dashboard.process(wfid)
     assert_equal 1, ps.errors.size
-    assert_equal 0, @engine.storage.get_many('schedules').size
+    assert_equal 0, @dashboard.storage.get_many('schedules').size
   end
   def test_timeout_at
@@ -203,18 +234,18 @@ class FtTimeoutTest < Test::Unit::TestCase
       end
     end
-    alpha = @engine.register_participant :alpha, Ruote::StorageParticipant
+    alpha = @dashboard.register_participant :alpha, Ruote::StorageParticipant
     #noisy
-    wfid = @engine.launch(pdef)
+    wfid = @dashboard.launch(pdef)
     #wait_for(9)
     wait_for(wfid)
-    assert_nil @engine.process(wfid)
+    assert_nil @dashboard.process(wfid)
     assert_equal 0, alpha.size
-    assert_equal 0, @engine.storage.get_many('schedules').size
+    assert_equal 0, @dashboard.storage.get_many('schedules').size
   end
 end