weel 1.99.38 → 1.99.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22064a6ed4dc9a0b9ff995c27e2b183a9ef8551e
-  data.tar.gz: 061c59695868707b3f3bc750ae83954518ef3e0c
+  metadata.gz: 310427c12d9c134331d19fbdcee723e9afd7c11f
+  data.tar.gz: 34c0de3873cf65e306e8c936c4c4b5948ade64a4
 SHA512:
-  metadata.gz: c575d29ce1ffae4f16da3fb46a89d4809b1e1c6053090c2b632766b14ba0f57cf7ec9e96e6ee3f764b0a1cc9344d48b77314d9aff2bb7cff03b43276a2efd93c
-  data.tar.gz: 9d207543b4186664e823baecd98a6338cf45d75906b43e785d175974078bc1c10fc851b19445b555a957bce4ec137a7623af77aab3d671c35ee6cb075614552a
+  metadata.gz: ef770455e9a0648051cfbabeb1489d5b5a1e9a27ffd29b6dac4eab3b32421bb7193ecc96d6e85eff75a65e3e3fba13665c518852586fcab698054ed81330ab4e
+  data.tar.gz: b821a029edf59749c2a5f76459e838cb43af9fc311b4a093fdd9d603a8666b40bf1de77170e81b8d830f7148ff5825eceb3109463e5d8c51560c0deba337c2b6

data/lib/weel.rb

@@ -315,11 +315,11 @@ class WEEL
     # position: a unique identifier within the wf-description (may be used by the search to identify a starting point)
     # endpoint: (only with :call) ep of the service
     # parameters: (only with :call) service parameters
-    def call(position, endpoint, parameters={}, finalize=nil, update=nil, &finalizeblk)
+    def call(position, endpoint, parameters: {}, finalize: nil, update: nil, &finalizeblk)
       __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update)
     end
-    def manipulate(position, code=nil, &codeblk)
-      __weel_activity(position,:manipulate,nil,{},code||codeblk)
+    def manipulate(position, script=nil, &scriptblk)
+      __weel_activity(position,:manipulate,nil,{},script||scriptblk)
     end
 
     # Parallel DSL-Construct
@@ -435,7 +435,6 @@ class WEEL
           end
         end
       end
-      Thread.pass
     end # }}}
 
     # Choose DSL-Construct
@@ -669,7 +668,7 @@ class WEEL
                     when 1; mr.instance_exec(handlerwrapper.activity_result_value,&code)
                     when 2; mr.instance_exec(handlerwrapper.activity_result_value,(status.is_a?(Status)?status:nil),&code)
                     else
-                      mr.instance_eval(&code)
+                      mr.instance_exec(&code)
                   end
                 elsif code.is_a?(String)
                   mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)

data/test/TestHandlerWrapper.rb

@@ -18,11 +18,13 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
     end
     if @__myhandler_endpoint == 'again'
       @__myhandler_returnValue = parameters.has_key?(:result) ? parameters[:result] : 'Handler_Dummy_Result'
-      if parameters[:call].call 
-        @__myhandler_continue.continue WEEL::Signal::Again  
-      else
+      Thread.new do
+        while parameters[:again].call
+          @__myhandler_continue.continue WEEL::Signal::Again
+          sleep 1
+        end
         @__myhandler_continue.continue 
-      end  
+      end
       return
     end
     if parameters[:call]

data/test/basic/tc_parallel.rb

@@ -8,13 +8,13 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel do
         parallel_branch do
-          call :a_1, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+          call :a_1, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
         end
         parallel_branch do
-          call :a_2, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+          call :a_2, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
         end
         parallel_branch do
-          call :a_3, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+          call :a_3, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
         end
       end
     end
@@ -32,10 +32,10 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait do
         parallel_branch do
-          call :a_1, :endpoint1, :call =>  Proc.new{ sleep 0.2 }
+          call :a_1, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.2 } }
         end
         parallel_branch do
-          call :a_2, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+          call :a_2, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
         end
       end
       call :a_3, :endpoint1
@@ -50,11 +50,11 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 1 do
         parallel_branch do
+          sleep 0.5
           call :a_1, :endpoint1
-          Thread.pass 
         end
         parallel_branch do
-          call :a_2, :endpoint1, :call =>  Proc.new{ sleep 8.5 }
+          call :a_2, :endpoint1, parameters: { :call =>  Proc.new{ sleep 8.5 } }
         end
       end
       call :a_3, :endpoint1
@@ -68,10 +68,10 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 1 do
         parallel_branch do
-          call :a_1, :endpoint1, :call =>  Proc.new{ sleep 0.2 }
+          call :a_1, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.2 } }
         end
         parallel_branch do
-          call :a_2, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+          call :a_2, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
           call :a_2_2, :endpoint1
         end
       end
@@ -97,13 +97,13 @@ class TestParallel < Test::Unit::TestCase
           parallel :wait do
             parallel_branch do
               parallel :wait do
-                parallel_branch do call :a_2_1_1, :endpoint1, :call => Proc.new {sleep 0.2} end
-                parallel_branch do call :a_2_1_2, :endpoint1, :call => Proc.new {sleep 0.4}  end
+                parallel_branch do call :a_2_1_1, :endpoint1, parameters: { :call => Proc.new {sleep 0.2} } end
+                parallel_branch do call :a_2_1_2, :endpoint1, parameters: { :call => Proc.new {sleep 0.4} } end
               end
-              call :a_2_1_3, :endpoint1, :call => Proc.new {sleep 0.8} 
+              call :a_2_1_3, :endpoint1, parameters: { :call => Proc.new {sleep 0.8} }
             end
-            parallel_branch do call :a_2_2, :endpoint1, :call => Proc.new {sleep 0.8}  end
-            parallel_branch do call :a_2_3, :endpoint1, :call => Proc.new {sleep 1.0}  end
+            parallel_branch do call :a_2_2, :endpoint1, parameters: { :call => Proc.new {sleep 0.8} } end
+            parallel_branch do call :a_2_3, :endpoint1, parameters: { :call => Proc.new {sleep 1.0} } end
           end
         end
       end

data/test/basic/tc_wf_control.rb

@@ -21,7 +21,7 @@ class TestWorkflowControl < Test::Unit::TestCase
   def test_stop
     @wf.description do
       call :a_test_1_1, :endpoint1
-      call :a_test_1_2, :endpoint1, { :call => Proc.new{ sleep 0.5 } }
+      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
       call :a_test_1_3, :endpoint1
     end
     @wf.search WEEL::Position.new(:a_test_1_1, :at)
@@ -41,7 +41,7 @@ class TestWorkflowControl < Test::Unit::TestCase
   def test_continue
     @wf.description do
       call :a_test_1_1, :endpoint1
-      call :a_test_1_2, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
+      call :a_test_1_2, :endpoint1, parameters: { :call =>  Proc.new{ sleep 0.5 } }
       call :a_test_1_3, :endpoint1
     end
     @wf.start

data/test/exec/tc_again.rb

@@ -1,19 +1,21 @@
 require 'test/unit'
 require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
 
-class TestChoose < Test::Unit::TestCase
+class TestAgain < Test::Unit::TestCase
   include TestMixin
 
   def test_again
     @wf.data[:a] = 0
     @wf.description do
-      call :a_1, :again, :call => Proc.new{data.a < 2}  do
+      call :a_1, :again, parameters: { :again => Proc.new{data.a < 2} }, update: -> do
+        data.a += 1
+      end, finalize: -> do
         data.a += 1
       end
     end
     @wf.start.join
     wf_assert("CALL a_1")
-    wf_sassert("|running|Ca_1Ma_1Ca_1Ma_1Ca_1Ma_1Da_1|finished|")
+    wf_sassert("|running|Ca_1Ma_1Ma_1Ma_1Da_1|finished|")
     assert(@wf.data[:a] == 3)
   end
 

data/test/wfp_adv_branching/tc_generalsynchronizingmerge.rb

@@ -9,10 +9,10 @@ class TestWFPGeneralSynchronizingMerge < Test::Unit::TestCase
     @wf.description do
       parallel do
         parallel_branch do
-          call :a1_1, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a1_1, :endpoint1, parameters: { :call => Proc.new{sleep 0.2} }
         end
         parallel_branch do
-          call :a1_2, :endpoint1, :call => Proc.new{sleep 0.4}
+          call :a1_2, :endpoint1, parameters: { :call => Proc.new{sleep 0.4} }
         end
         choose do
           alternative(true) do
@@ -20,13 +20,13 @@ class TestWFPGeneralSynchronizingMerge < Test::Unit::TestCase
               parallel_branch do
                 call :a2_1, :endpoint1
               end  
-              call(:a2_decide, :endpoint1, :result => false) do |e|
+              call(:a2_decide, :endpoint1, parameters: { :result => false}) do |e|
                 data.break = e
               end
             end  
           end
           otherwise do
-            call :a2_2, :endpoint1, :call => Proc.new{sleep 0.1}
+            call :a2_2, :endpoint1, parameters: { :call => Proc.new{sleep 0.1} }
           end
         end
       end

data/test/wfp_adv_branching/tc_localsynchronizingmerge.rb

@@ -8,10 +8,10 @@ class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
     @wf.description do
       parallel do
         parallel_branch do
-          call :a1_1, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a1_1, :endpoint1, parameters: { :call => Proc.new{sleep 0.2} }
         end
         parallel_branch do
-          call :a1_2, :endpoint1, :call => Proc.new{sleep 0.4}
+          call :a1_2, :endpoint1, parameters: { :call => Proc.new{sleep 0.4} }
         end
         choose do
           alternative(false) do
@@ -20,7 +20,7 @@ class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
             end  
           end
           otherwise do
-            call :a2_2, :endpoint1, :call => Proc.new{sleep 0.1}
+            call :a2_2, :endpoint1, parameters: { :call => Proc.new{sleep 0.1} }
           end
         end
       end

data/test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb

@@ -33,7 +33,7 @@ class TestWFPMultiChoice < Test::Unit::TestCase
           end
           parallel_branch do
             alternative(data.x > 0) do
-              call :a1_2, :endpoint1, :call => Proc.new{sleep 0.5}
+              call :a1_2, :endpoint1, parameters: { :call => Proc.new{sleep 0.5} }
             end
           end
         end

data/test/wfp_adv_branching/tc_structured_discriminator.rb

@@ -9,11 +9,11 @@ class TestWFPStructuredDiscriminator < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 1 do
         parallel_branch do
+          sleep 0.5
           call :a_1_1, :endpoint1
-          Thread.pass
         end
         parallel_branch do
-          call :a_1_2, :endpoint1, :call => Proc.new{sleep 0.2}
+          call :a_1_2, :endpoint1, parameters: { :call => Proc.new{sleep 8.2} }
         end
       end
       call :a_2, :endpoint1

data/test/wfp_adv_branching/tc_structured_partial_join.rb

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

data/test/wfp_state_based/tc_deferredchoice.rb

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

data/weel.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.38"
+  s.version          = "1.99.39"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"
 
   s.description      = "see http://cpee.org"
 
-  s.required_ruby_version = '>=1.9.3'
+  s.required_ruby_version = '>=2.0.0'
 
   s.files            = Dir['{example/**/*,lib/weel.rb}'] + %w(COPYING Changelog FEATURES INSTALL Rakefile weel.gemspec README AUTHORS)
   s.require_path     = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.38
+  version: 1.99.39
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="