weel 1.2.6 → 1.99.2

data/test/wfp_adv_branching/tc_localsynchronizingmerge.rb

@@ -8,23 +8,23 @@ class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
     @wf.description do
       parallel do
         parallel_branch do
-          activity :a1_1, :call, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a1_1, :endpoint1, :call => Proc.new{sleep 0.2}
         end
         parallel_branch do
-          activity :a1_2, :call, :endpoint1, :call => Proc.new{sleep 0.4}
+          call :a1_2, :endpoint1, :call => Proc.new{sleep 0.4}
         end
         choose do
           alternative(false) do
             parallel_branch do
-              activity :a2_1, :call, :endpoint1
+              call :a2_1, :endpoint1
             end  
           end
           otherwise do
-            activity :a2_2, :call, :endpoint1, :call => Proc.new{sleep 0.1}
+            call :a2_2, :endpoint1, :call => Proc.new{sleep 0.1}
           end
         end
       end
-      activity :a3, :call, :endpoint1
+      call :a3, :endpoint1
     end
     @wf.start.join
     wf_sassert('|running|Ca2_2Da2_2')

data/test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb

@@ -9,13 +9,13 @@ class TestWFPMultiChoice < Test::Unit::TestCase
     @wf.description do
       choose do
         alternative(data.x == 1) do
-          activity :a1_1, :call, :endpoint1
+          call :a1_1, :endpoint1
         end
         alternative(data.x > 0) do
-          activity :a1_2, :call, :endpoint1
+          call :a1_2, :endpoint1
         end
       end
-      activity :a2, :call, :endpoint1
+      call :a2, :endpoint1
     end
     @wf.start.join
     wf_sassert('|running|Ca1_1Da1_1Ca1_2Da1_2Ca2Da2|finished|')
@@ -27,18 +27,18 @@ class TestWFPMultiChoice < Test::Unit::TestCase
         parallel do
           parallel_branch do
             alternative(data.x == 1) do
-              activity :a1_1, :call, :endpoint1
+              call :a1_1, :endpoint1
               Thread.pass
             end
           end
           parallel_branch do
             alternative(data.x > 0) do
-              activity :a1_2, :call, :endpoint1, :call => Proc.new{sleep 0.5}
+              call :a1_2, :endpoint1, :call => Proc.new{sleep 0.5}
             end
           end
         end
       end
-      activity :a2, :call, :endpoint1
+      call :a2, :endpoint1
     end
     @wf.start.join
     wf_assert('CALL a1_1')

data/test/wfp_adv_branching/tc_structured_discriminator.rb

@@ -9,14 +9,14 @@ class TestWFPStructuredDiscriminator < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 1 do
         parallel_branch do
-          activity :a_1_1, :call, :endpoint1
+          call :a_1_1, :endpoint1
           Thread.pass
         end
         parallel_branch do
-          activity :a_1_2, :call, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a_1_2, :endpoint1, :call => Proc.new{sleep 0.2}
         end
       end
-      activity :a_2, :call, :endpoint1
+      call :a_2, :endpoint1
     end
     t = @wf.start.join
     wf_assert("CALL a_1_1:")

data/test/wfp_adv_branching/tc_structured_partial_join.rb

@@ -9,22 +9,22 @@ class TestWFPCancellingStructuredPartialJoin < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 3 do
         parallel_branch do
-          activity :a_1, :call, :endpoint1
+          call :a_1, :endpoint1
         end
         parallel_branch do
-          activity :a_2, :call, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a_2, :endpoint1, :call => Proc.new{sleep 0.2}
         end
         parallel_branch do
-          activity :a_3, :call, :endpoint1
+          call :a_3, :endpoint1
         end
         parallel_branch do
-          activity :a_4, :call, :endpoint1, :call => Proc.new{sleep 0.6}
+          call :a_4, :endpoint1, :call => Proc.new{sleep 0.6}
         end
         parallel_branch do
-          activity :a_5, :call, :endpoint1
+          call :a_5, :endpoint1
         end
       end
-      activity :a_6, :call, :endpoint1, :call => Proc.new{sleep 0.2}
+      call :a_6, :endpoint1, :call => Proc.new{sleep 0.2}
     end
     t = @wf.start.join
     wf_assert("CALL a_1:")

data/test/wfp_basic/tc_exclusivechoice_simplemerge.rb

@@ -8,10 +8,10 @@ class TestWFPExclusiveChoice < Test::Unit::TestCase
     @wf.description do
       choose do
         alternative(true) do
-          activity :a1_1, :call, :endpoint1
+          call :a1_1, :endpoint1
         end
         otherwise do
-          activity :a1_2, :call, :endpoint1
+          call :a1_2, :endpoint1
         end
       end
     end

data/test/wfp_basic/tc_parallelsplit_synchronization.rb

@@ -8,13 +8,13 @@ class TestWFPParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait do
         parallel_branch do
-          activity :a1_1, :call, :endpoint1
+          call :a1_1, :endpoint1
         end
         parallel_branch do
-          activity :a1_2, :call, :endpoint1
+          call :a1_2, :endpoint1
         end
       end
-      activity :a2, :call, :endpoint1
+      call :a2, :endpoint1
     end
     @wf.start.join
     wf_assert('CALL a1_1')

data/test/wfp_basic/tc_sequence.rb

@@ -6,9 +6,9 @@ class TestWFPSequence < Test::Unit::TestCase
 
   def test_sequence
     @wf.description do
-      activity :a1_1, :call, :endpoint1
-      activity :a1_2, :call, :endpoint1
-      activity :a1_3, :call, :endpoint1
+      call :a1_1, :endpoint1
+      call :a1_2, :endpoint1
+      call :a1_3, :endpoint1
     end
     @wf.start.join
     wf_sassert('|running|Ca1_1Da1_1Ca1_2Da1_2Ca1_3Da1_3|finished|')

data/test/wfp_iteration/tc_structuredloop.rb

@@ -7,15 +7,15 @@ class TestWFPInterleavedParallelRouting < Test::Unit::TestCase
 
   def test_loop
     @wf.description do
-      activity :a1, :manipulate do
+      manipulate :a1 do
         data.x = 0
       end
       loop pre_test{data.x < 3} do
-        activity :a2, :call, :endpoint1 do
+        call :a2, :endpoint1 do
           data.x += 1
         end
       end
-      activity :a3, :call, :endpoint1
+      call :a3, :endpoint1
     end
     @wf.start.join
     wf_sassert('|running|Ma1Da1Ca2Ma2Da2Ca2Ma2Da2Ca2Ma2Da2Ca3Da3|finished|');
@@ -24,16 +24,16 @@ class TestWFPInterleavedParallelRouting < Test::Unit::TestCase
   end
   def test_loop_search
     @wf.description do
-      activity :a1, :manipulate do
+      manipulate :a1 do
         data.x = 0
       end
       loop pre_test{data.x < 3} do
-        activity :a2_1, :call, :endpoint1
-        activity :a2_2, :manipulate do
+        call :a2_1, :endpoint1
+        manipulate :a2_2 do
           data.x += 1
         end
       end
-      activity :a3, :call, :endpoint1
+      call :a3, :endpoint1
     end
     @wf.search WEEL::Position.new(:a2_2, :at)
     @wf.data :x => 2
@@ -44,16 +44,16 @@ class TestWFPInterleavedParallelRouting < Test::Unit::TestCase
   end
   def test_loop_jump_over
     @wf.description do
-      activity :a1, :manipulate do
+      manipulate :a1 do
         data.x = 0
       end
       loop pre_test{data.x < 3} do
-        activity :a2_1, :call, :endpoint1
-        activity :a2_2, :manipulate do
+        call :a2_1, :endpoint1
+        manipulate :a2_2 do
           data.x += 1
         end
       end
-      activity :a3, :call, :endpoint1
+      call :a3, :endpoint1
     end
     @wf.search WEEL::Position.new(:a3, :at)
     @wf.data :x => 0

data/test/wfp_state_based/tc_deferredchoice.rb

@@ -9,23 +9,23 @@ class TestWFPDeferredChoice < Test::Unit::TestCase
     @wf.description do
       parallel :wait=>1 do
         parallel_branch do
-          activity :a1_1, :call, :endpoint1, :call => Proc.new{sleep 0.5} do
+          call :a1_1, :endpoint1, :call => Proc.new{sleep 0.5} do
             data.choice = 1
           end
           Thread.pass
         end
         parallel_branch do
-          activity(:a1_2, :call, :endpoint1, :call => Proc.new{sleep 1.0}) do
+          call(:a1_2, :endpoint1, :call => Proc.new{sleep 1.0}) do
             data.choice = 2
           end
         end
       end
       choose do
         alternative(data.choice == 1) do
-          activity :a2_1, :call, :endpoint1
+          call :a2_1, :endpoint1
         end
         alternative(data.choice == 2) do
-          activity :a2_2, :call, :endpoint1
+          call :a2_2, :endpoint1
         end
       end
     end

data/test/wfp_state_based/tc_interleavedparallelrouting.rb

@@ -10,15 +10,15 @@ class TestWFPInterleavedParallelRouting < Test::Unit::TestCase
       parallel do
         parallel_branch do
           critical(:section1) do
-            activity :a1, :call, :endpoint1
+            call :a1, :endpoint1
           end
           critical(:section1) do
-            activity :a3, :call, :endpoint1
+            call :a3, :endpoint1
           end
         end
         parallel_branch do
           critical(:section1) do
-            activity :a2, :call, :endpoint1
+            call :a2, :endpoint1
           end
         end
       end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.2.6"
+  s.version          = "1.99.2"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.99.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
@@ -33,34 +33,36 @@ files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestWorkflow.rb
 - test/TestMixin.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_state_based/tc_deferredchoice.rb
+- test/simulation_v0.0.1.tgz
+- test/TestWorkflow.rb
 - test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_state_based/tc_deferredchoice.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_parallel.rb
-- test/basic/tc_codereplace.rb
-- test/basic/tc_data.rb
-- test/basic/tc_search.rb
-- test/basic/tc_state.rb
-- test/basic/tc_handler.rb
+- test/exec/tc_exec.rb
 - test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
 - test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
 - test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
+- test/wfp_adv_branching/tc_multimerge.rb
 - test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/basic/tc_codereplace.rb
+- test/basic/tc_data.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_parallel.rb
+- test/basic/tc_search.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_wf_control.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_state.rb
 - test/complex/tc_parallel_stop.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
 homepage: http://cpee.org/
 licenses:
 - LGPL-3
@@ -71,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
@@ -89,31 +91,33 @@ test_files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestWorkflow.rb
 - test/TestMixin.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_state_based/tc_deferredchoice.rb
+- test/simulation_v0.0.1.tgz
+- test/TestWorkflow.rb
 - test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_state_based/tc_deferredchoice.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_parallel.rb
-- test/basic/tc_codereplace.rb
-- test/basic/tc_data.rb
-- test/basic/tc_search.rb
-- test/basic/tc_state.rb
-- test/basic/tc_handler.rb
+- test/exec/tc_exec.rb
 - test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
 - test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
 - test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
+- test/wfp_adv_branching/tc_multimerge.rb
 - test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/basic/tc_codereplace.rb
+- test/basic/tc_data.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_parallel.rb
+- test/basic/tc_search.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_wf_control.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_state.rb
 - test/complex/tc_parallel_stop.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb