weel 1.2.2.1 → 1.2.3

data/lib/weel.rb

@@ -32,7 +32,6 @@ end #}}}
 
 class WEEL
   def initialize(*args)# {{{
-    @wfsource = nil
     @dslr = DSLRealization.new
     @dslr.__weel_handlerwrapper_args = args
       
@@ -242,7 +241,7 @@ class WEEL
   def self::control(flow, &block)# {{{
     @@__weel_control_block = block
     define_method :initialize_control do
-      self.description(&(@@__weel_control_block))
+      self.description = @@__weel_control_block
     end
   end #  }}}
   def self::flow #{{{
@@ -787,44 +786,40 @@ public
   end # }}}
 
   # get/set workflow description
-  def description(code = nil,&blk) # {{{
-    bgiven = block_given?
-    if code.nil? && !bgiven
-      @wfsource
-    else
-      @wfsource = code unless bgiven
-      (class << self; self; end).class_eval do
-        define_method :__weel_control_flow do |state,final_state=:finished|
-          @dslr.__weel_positions.clear
-          @dslr.__weel_state = state
-          begin
-            if bgiven
-              @dslr.instance_eval(&blk)
-            else
-              @dslr.instance_eval(code)
-            end  
-          rescue Exception => err
-            @dslr.__weel_state = :stopping
-            handlerwrapper = @dslr.__weel_handlerwrapper.new @dslr.__weel_handlerwrapper_args
-            handlerwrapper.inform_syntax_error(err,code)
-          end
-          if @dslr.__weel_state == :running
-            @dslr.__weel_state = :finished 
-            ipc = { :unmark => [] }
-            @dslr.__weel_positions.each{|wp| ipc[:unmark] << wp.position}
-            @dslr.__weel_positions.clear
-            handlerwrapper = @dslr.__weel_handlerwrapper.new @dslr.__weel_handlerwrapper_args
-            handlerwrapper.inform_position_change(ipc)
-          end
-          if @dslr.__weel_state == :simulating
-            @dslr.__weel_state = final_state
+  def description(&blk)
+    self.description=(blk)
+  end
+  def description=(code)  # {{{
+    (class << self; self; end).class_eval do
+      define_method :__weel_control_flow do |state,final_state=:finished|
+        @dslr.__weel_positions.clear
+        @dslr.__weel_state = state
+        begin
+          if code.is_a? Proc
+            @dslr.instance_eval(&code)
+          else  
+            @dslr.instance_eval(code)
           end  
-          if @dslr.__weel_state == :stopping
-            @dslr.__weel_finalize
-          end
+        rescue Exception => err
+          @dslr.__weel_state = :stopping
+          handlerwrapper = @dslr.__weel_handlerwrapper.new @dslr.__weel_handlerwrapper_args
+          handlerwrapper.inform_syntax_error(err,code)
+        end
+        if @dslr.__weel_state == :running
+          @dslr.__weel_state = :finished 
+          ipc = { :unmark => [] }
+          @dslr.__weel_positions.each{|wp| ipc[:unmark] << wp.position}
+          @dslr.__weel_positions.clear
+          handlerwrapper = @dslr.__weel_handlerwrapper.new @dslr.__weel_handlerwrapper_args
+          handlerwrapper.inform_position_change(ipc)
+        end
+        if @dslr.__weel_state == :simulating
+          @dslr.__weel_state = final_state
+        end  
+        if @dslr.__weel_state == :stopping
+          @dslr.__weel_finalize
         end
       end
-      bgiven ? blk : code
     end
   end # }}}
 

data/test/basic/tc_parallel.rb

@@ -33,6 +33,7 @@ class TestParallel < Test::Unit::TestCase
       parallel :wait do
         parallel_branch do
           activity :a_1, :call, :endpoint1
+          Thread.pass 
         end
         parallel_branch do
           activity :a_2, :call, :endpoint1, :call =>  Proc.new{ sleep 0.5 }
@@ -51,6 +52,7 @@ class TestParallel < Test::Unit::TestCase
       parallel :wait => 1 do
         parallel_branch do
           activity :a_1, :call, :endpoint1
+          Thread.pass 
         end
         parallel_branch do
           activity :a_2, :call, :endpoint1, :call =>  Proc.new{ sleep 8.5 }
@@ -67,8 +69,7 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait => 1 do
         parallel_branch do
-          activity :a_1, :call, :endpoint1
-          Thread.pass
+          activity :a_1, :call, :endpoint1, :call =>  Proc.new{ sleep 0.2 }
         end
         parallel_branch do
           activity :a_2, :call, :endpoint1, :call =>  Proc.new{ sleep 0.5 }

data/test/wfp_state_based/tc_deferredchoice.rb

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

data/weel.gemspec

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.2.2.1
+  version: 1.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies: []
 description: Workflow Execution Engine Library (WEEL)
 email: juergen.mangler@gmail.com
@@ -33,89 +34,88 @@ files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestMixin.rb
-- test/simulation_v0.0.1.tgz
 - test/TestWorkflow.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.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/wfp_state_based/tc_interleavedparallelrouting.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.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_generalizedjoin.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_structured_partial_join.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_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/basic/tc_handler.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_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_structured_discriminator.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.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
+- test/complex/tc_parallel_stop.rb
 homepage: http://cpee.org
 licenses:
 - LGPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestMixin.rb
-- test/simulation_v0.0.1.tgz
 - test/TestWorkflow.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.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/wfp_state_based/tc_interleavedparallelrouting.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.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_generalizedjoin.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_structured_partial_join.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_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/basic/tc_handler.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_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_structured_discriminator.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.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
+- test/complex/tc_parallel_stop.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0afac7e70b100b14f6dcc5767504b4369fa10d77
-  data.tar.gz: 2934fe54b8ec839199fb5be441d07b2b94d9ff66
-SHA512:
-  metadata.gz: 0c986c2fb9799c77b762456e8f1b042bc7325be909ea6b6102750c84fb24f3c2b63510310f3ff4333661a51304359195851b1094413956c2efddf463296bb5f1
-  data.tar.gz: a676145e30b041e188f3c3bbd8810762d9e56f1b17c22f424b552da510bdcf8c93ec45f82229fcd2f2a318c42ffbfc3a6443cc02fd7e5e2bd64d426436506145