ruote 2.3.0.1 → 2.3.0.2

data/lib/ruote/util/mpatch.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/ometa.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/subprocess.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/time.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -69,7 +69,7 @@ module Ruote
       #
       # date
 
-      Rufus.to_ruby_time(s)# rescue nil
+      DateTime.parse(s)
 
     else
       #
@@ -87,7 +87,7 @@ module Ruote
 
   # Waiting for a better implementation of it in rufus-scheduler 2.0.4
   #
-  def self.is_cron_string(s)
+  def self.cron_string?(s)
 
     ss = s.split(' ')
 

data/lib/ruote/util/tree.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,10 @@ module Ruote
   #   end
   #
   #   p pdef
-  #     # => ["define", {"name"=>"def0"}, [["sequence", {}, [["alpha", {}, []], ["bravo", {}, []]]]]]
+  #     # => ["define", {"name"=>"def0"}, [
+  #     #      ["sequence", {}, [
+  #     #        ["alpha", {}, []],
+  #     #        ["bravo", {}, []]]]]]
   #
   #   puts Ruote.tree_to_s(pdef)
   #     # =>
@@ -55,7 +58,43 @@ module Ruote
     s
   end
 
-  # Used by Ruote::ProcessStatus.
+  # Compacts
+  #
+  #   [ 'participant', { 'ref' => 'sam' }, [] ] # and
+  #   [ 'subprocess', { 'ref' => 'compute_prime' }, [] ]
+  #
+  # into
+  #
+  #   [ 'sam', {}, [] ] # and
+  #   [ 'compute_prime', {}, [] ]
+  #
+  # to simplify tree comparisons.
+  #
+  def self.compact_tree(tree)
+
+    tree = tree.dup
+
+    if %w[ participant subprocess ].include?(tree[0])
+
+      ref =
+        tree[1].delete('ref') ||
+        begin
+          kv = tree[1].find { |k, v| v == nil }
+          tree[1].delete(kv[0])
+          kv[0]
+        end
+
+      tree[0] = ref
+
+    else
+
+      tree[2] = tree[2].collect { |t| compact_tree(t) }
+    end
+
+    tree
+  end
+
+  # Used by some projects, used to be called from Ruote::ProcessStatus.
   #
   # Given a tree
   #
@@ -81,7 +120,7 @@ module Ruote
     h
   end
 
-  # Used by Ruote::ProcessStatus.
+  # Used by some projects, used to be called from Ruote::ProcessStatus.
   #
   # Given a decomposed tree like
   #

data/lib/ruote/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,6 @@
 
 module Ruote
 
-  VERSION = '2.3.0.1'
+  VERSION = '2.3.0.2'
 end
 

data/lib/ruote/worker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,21 @@ require 'ruote/fei'
 
 module Ruote
 
+  # A helper for the #worker method, it returns that dummy worker
+  # when there is no reference to the calling worker in the current
+  # thread's local variables.
+  #
+  DUMMY_WORKER = OpenStruct.new(
+    :name => 'worker', :identity => 'unknown', :state => 'running')
+
+  # Warning, this is not equivalent to doing @context.worker, this method
+  # fetches the worker from the local thread variables.
+  #
+  def self.current_worker
+
+    Thread.current['ruote_worker'] || DUMMY_WORKER
+  end
+
   #
   # Workers fetch 'msgs' and 'schedules' from the storage and process them.
   #
@@ -339,10 +354,10 @@ module Ruote
     #
     def turn_schedule_to_msg(schedule)
 
-      msg = Ruote.fulldup(schedule['msg'])
-
       return false unless @storage.reserve(schedule)
 
+      msg = Ruote.fulldup(schedule['msg'])
+
       @storage.put_msg(msg.delete('action'), msg)
 
       true
@@ -390,7 +405,7 @@ module Ruote
 
           when 'raise'
 
-            handle_msg_error(msg['msg'], msg['error'])
+            @context.error_handler.msg_handle(msg['msg'], msg['error'])
 
           when 'respark'
 
@@ -406,7 +421,7 @@ module Ruote
 
       rescue => err
 
-        handle_msg_error(msg, err)
+        @context.error_handler.msg_handle(msg, err)
       end
 
       @context.storage.done(msg) if @context.storage.respond_to?(:done)
@@ -417,15 +432,6 @@ module Ruote
       true
     end
 
-    # Passes the msg and the err it resulted in to the error_handler.
-    #
-    # Some storage/worker implementation may want to override this.
-    #
-    def handle_msg_error(msg, err)
-
-      @context.error_handler.msg_handle(msg, err)
-    end
-
     # Works for both the 'launch' and the 'apply' msgs.
     #
     # Creates a new expression, gives and applies it with the
@@ -439,8 +445,8 @@ module Ruote
 
       exp_class = @context.expmap.expression_class(tree.first)
 
-      # msg['wfid'] only : it's a launch
-      # msg['fei'] : it's a sub launch (a supplant ?)
+      # msg['wfid'] only:  it's a launch
+      # msg['fei']:        it's a sub launch (a supplant ?)
 
       if is_launch?(msg, exp_class)
 
@@ -457,21 +463,27 @@ module Ruote
       end
 
       exp_hash = {
+
         'fei' => msg['fei'] || {
           'engine_id' => @context.engine_id,
           'wfid' => msg['wfid'],
           'subid' => Ruote.generate_subid(msg.inspect),
           'expid' => msg['expid'] || '0' },
+
         'parent_id' => msg['parent_id'],
         'variables' => variables,
         'applied_workitem' => wi,
+
         'forgotten' => msg['forgotten'],
         'lost' => msg['lost'],
         'flanking' => msg['flanking'],
+        'attached' => msg['attached'],
+        'supplanted' => msg['supplanted'],
+
         'stash' => msg['stash'],
         'trigger' => msg['trigger'],
-        'on_reply' => msg['on_reply'],
-        'supplanted' => msg['supplanted'] }
+        'on_reply' => msg['on_reply']
+      }
 
       if not exp_class
 

data/lib/ruote/workitem.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/ruote.gemspec

@@ -24,9 +24,13 @@ ruote is an open source Ruby workflow engine
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
+  s.add_runtime_dependency 'ruby_parser', '~> 2.3'
+    # ruby_parser 3.x is very different,
+    # will rather go the ripper way (full 19 or even 20)...
+
   s.add_runtime_dependency 'blankslate', '2.1.2.4'
-  s.add_runtime_dependency 'parslet', '>= 1.4.0'
-    # blankslate 2.1.2.3 is to avoid...
+  s.add_runtime_dependency 'parslet', '1.4.0'
+    # not yet Parslet 1.5.x ready
 
   s.add_runtime_dependency 'sourcify', '0.5.0'
   s.add_runtime_dependency 'rufus-json', '>= 1.0.1'

data/test/functional/base.rb

@@ -139,7 +139,6 @@ module FunctionalBase
 
   def noisy(on=true)
 
-    puts "\nnoisy " + caller[0] if on
     @dashboard.context.logger.noisy = true
   end
 

data/test/functional/concurrent_base.rb

@@ -79,7 +79,7 @@ module ConcurrentBase
 
     @dashboard1.context.logger.color = '32' # green
 
-    noisy if ARGV.include?('-N')
+    noisy if ENV['NOISY'] == 'true'
   end
 
   def teardown

data/test/functional/eft_14_cursor.rb

@@ -20,8 +20,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace('', pdef)
   end
 
@@ -34,8 +32,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a b ], pdef)
   end
 
@@ -50,8 +46,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a c ], pdef)
   end
 
@@ -65,8 +59,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace('a', pdef)
   end
 
@@ -80,8 +72,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace('a', pdef)
   end
 
@@ -95,8 +85,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace('a', pdef)
   end
 
@@ -105,14 +93,12 @@ class EftCursorTest < Test::Unit::TestCase
     pdef = Ruote.process_definition :name => 'test' do
       cursor do
         echo 'a'
-        jump :to => 'c'
+        jump :to => 'ctag'
         echo 'b'
-        echo 'c', :tag => 'c'
+        echo 'c', :tag => 'ctag'
       end
     end
 
-    #noisy
-
     assert_trace(%w[ a c ], pdef)
   end
 
@@ -121,18 +107,14 @@ class EftCursorTest < Test::Unit::TestCase
     pdef = Ruote.process_definition :name => 'test' do
       cursor do
         echo 'a'
-        jump :to => 'd'
+        set :var => 'v0', :val => 'ctag'
+        jump :to => '${v:v0}'
         echo 'b'
-        set :var => 'v0', :val => 'd'
-        jump :to => 'd'
-        echo 'c'
-        echo 'd', :tag => '${v:v0}'
+        echo 'c', :tag => '${v:v0}'
       end
     end
 
-    #noisy
-
-    assert_trace(%w[ a b d ], pdef)
+    assert_trace(%w[ a c ], pdef)
   end
 
   def test_rewind_if
@@ -153,8 +135,6 @@ class EftCursorTest < Test::Unit::TestCase
       tracer << "a\n"
     end
 
-    #noisy
-
     assert_trace(%w[ a ] * 5, pdef)
   end
 
@@ -182,12 +162,46 @@ class EftCursorTest < Test::Unit::TestCase
       tracer << "p\n"
     end
 
-    #noisy
-
     assert_trace %w[ a r a r a r p ], pdef
       # ARP nostalgy....
   end
 
+  def test_jump_to_participant_name
+
+    @dashboard.register '.+' do |workitem|
+      tracer << workitem.participant_name + "\n"
+    end
+
+    pdef = Ruote.define do
+      cursor do
+        participant 'a'
+        jump :to => 'c'
+        participant 'b'
+        participant 'c'
+      end
+    end
+
+    assert_trace %w[ a c ], pdef
+  end
+
+  def test_jump_to_participant_ref_name
+
+    @dashboard.register '.+' do |workitem|
+      tracer << workitem.participant_name + "\n"
+    end
+
+    pdef = Ruote.define do
+      cursor do
+        participant :ref => 'a'
+        jump :to => 'c'
+        participant :ref => 'b'
+        participant :ref => 'c'
+      end
+    end
+
+    assert_trace %w[ a c ], pdef
+  end
+
   def test_deep_rewind
 
     pdef = Ruote.process_definition :name => 'test' do
@@ -200,8 +214,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     wfid = @dashboard.launch(pdef)
 
     wait_for(14)
@@ -228,8 +240,6 @@ class EftCursorTest < Test::Unit::TestCase
 
     @dashboard.register_participant :alpha, Ruote::NoOpParticipant
 
-    #noisy
-
     wfid = @dashboard.launch(pdef)
 
     wait_for(:alpha)
@@ -255,8 +265,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #noisy
-
     assert_trace %w[ a b ], pdef
   end
 
@@ -269,8 +277,6 @@ class EftCursorTest < Test::Unit::TestCase
       echo 'done.'
     end
 
-    #noisy
-
     assert_trace 'done.', pdef
   end
 
@@ -283,8 +289,6 @@ class EftCursorTest < Test::Unit::TestCase
       echo 'done.'
     end
 
-    #noisy
-
     assert_trace 'done.', pdef
   end
 
@@ -317,8 +321,6 @@ class EftCursorTest < Test::Unit::TestCase
       echo 'done.'
     end
 
-    #noisy
-
     @dashboard.register do
       alpha EftCursorTest::Alpha
       bravo EftCursorTest::Bravo
@@ -335,8 +337,6 @@ class EftCursorTest < Test::Unit::TestCase
       end
     end
 
-    #@dashboard.noisy = true
-
     wfid = @dashboard.launch(pdef)
 
     @dashboard.wait_for(9)
@@ -369,8 +369,6 @@ class EftCursorTest < Test::Unit::TestCase
 
   def test_workitem_command_and_jump_array
 
-    #noisy
-
     @dashboard.register do
       charly EftCursorTest::Charly, 'command' => [ 'jump', 'delta' ]
       catchall Ruote::NoOpParticipant
@@ -381,8 +379,6 @@ class EftCursorTest < Test::Unit::TestCase
 
   def test_workitem_command_and_jump_string
 
-    #noisy
-
     @dashboard.register do
       charly EftCursorTest::Charly, 'command' => 'jump delta'
       catchall Ruote::NoOpParticipant
@@ -393,8 +389,6 @@ class EftCursorTest < Test::Unit::TestCase
 
   def test_workitem_command_and_jump_to_string
 
-    #noisy
-
     @dashboard.register do
       charly EftCursorTest::Charly, 'command' => 'jump to delta'
       catchall Ruote::NoOpParticipant
@@ -415,8 +409,6 @@ class EftCursorTest < Test::Unit::TestCase
 
     @dashboard.register { catchall }
 
-    #@dashboard.noisy = true
-
     wfid = @dashboard.launch(pdef)
     @dashboard.wait_for(:alpha)
 
@@ -440,8 +432,6 @@ class EftCursorTest < Test::Unit::TestCase
 
     @dashboard.register { catchall }
 
-    #@dashboard.noisy = true
-
     wfid = @dashboard.launch(pdef)
     @dashboard.wait_for(:alpha)