weel 1.99.63 → 1.99.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5f745a2024b3ed2b47b155c6d40b66319c954fe
-  data.tar.gz: 786fe98233947f51db04cfb73ad64738935c7949
+SHA256:
+  metadata.gz: d509cca69d8c41ca70105391066463aa1fc139d3631a8b20d4b4b21f5b671913
+  data.tar.gz: a84dbad4cf7e34896e2551bfd0ee7ac151635b03217589ae02621265cae8235f
 SHA512:
-  metadata.gz: 6ed3ed69b2221a52bc2155938b33a770083783240d8b98d08c86d9492a690474b1484381fb6bea01b7825b525719dcace7fe43c3899200c8fabe91ef0dd65ef0
-  data.tar.gz: be8391e5c7a9785a02781adf91107b3d4dc8aa44c75f90c0db75a2670ab1f4168a3a5e7a7b2f4a869163632cdefa5700c3e4f2ff71f6dac2e37ddaa07710c772
+  metadata.gz: 0013422f53f87a18650ace689857a4cb294e2c6d6e150326319a5e138014fe5174f9f3487627c27c595a8bc1dd9b93eddf486c2e0e0d2fcdbf1b4418e75c851a
+  data.tar.gz: deeacccc2f333c0376509bd2ec00ec67fb21c19acd9adda904671e3198c27ece6c446bc0d40338ff3a68f12bfff6ae5ef8a985d10be70185d7dc37aeb86bd7db

data/lib/weel.rb

@@ -180,7 +180,7 @@ class WEEL
       @nudge.clear
       @nudge.push(nil)
     end
-    def nudged?
+    def wait_until_nudged!
       @nudge.pop
     end
     attr_reader :id, :message
@@ -319,7 +319,7 @@ class WEEL
   end #}}}
 
   class DSLRealization # {{{
-    def initialize
+    def  initialize #{{{
       @__weel_search_positions = {}
       @__weel_positions = Array.new
       @__weel_main = nil
@@ -330,7 +330,7 @@ class WEEL
       @__weel_state = :ready
       @__weel_status = Status.new(0,"undefined")
       @__weel_sim = -1
-    end
+    end #}}}
     attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_handlerwrapper, :__weel_handlerwrapper_args
     attr_reader :__weel_state, :__weel_status
 
@@ -339,17 +339,17 @@ 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
+    end #}}}
     # when two params, second param always script
     # when block and two params, parameters stays
-    def manipulate(position, parameters=nil, script=nil, &scriptblk)
+    def manipulate(position, parameters=nil, script=nil, &scriptblk) #{{{
       if scriptblk.nil? && script.nil? && !parameters.nil?
         script, parameters = parameters, nil
       end
       __weel_activity(position,:manipulate,nil,parameters||{},script||scriptblk)
-    end
+    end #}}}
 
     # Parallel DSL-Construct
     # Defines Workflow paths that can be executed parallel.
@@ -558,20 +558,20 @@ class WEEL
       [code || blk, :post_test]
     end # }}}
 
-    def escape
+    def escape #{{{
       return if __weel_is_in_search_mode
       throw :escape
-    end
-    def terminate
+    end #}}}
+    def terminate #{{{
       return if __weel_is_in_search_mode
       self.__weel_state = :finishing
-    end
-    def stop(position)
+    end #}}}
+    def stop(position) #{{{
       searchmode = __weel_is_in_search_mode(position)
       return if searchmode
       __weel_progress searchmode, position, true
       self.__weel_state = :stopping
-    end
+    end #}}}
 
     def status # {{{
       @__weel_status
@@ -584,7 +584,7 @@ class WEEL
     end # }}}
 
   private
-    def __weel_protect_yield(*local)
+    def __weel_protect_yield(*local) #{{{
       begin
         yield(*local) if block_given?
       rescue NameError => err # don't look into it, or it will explode
@@ -596,9 +596,9 @@ class WEEL
         @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new(err.message),nil)
         nil
       end
-    end
+    end #}}}
 
-    def __weel_eval_condition(condition)
+    def __weel_eval_condition(condition) #{{{
       begin
         handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition.is_a?(Proc)
         condition.is_a?(Proc) ? condition.call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition)
@@ -612,9 +612,9 @@ class WEEL
         @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new(err.message),nil)
         nil
       end
-    end
+    end #}}}
 
-    def __weel_progress(searchmode, position, skip=false)
+    def __weel_progress(searchmode, position, skip=false) #{{{
       ipc = {}
       if searchmode == :after
         wp = WEEL::Position.new(position, :after, nil)
@@ -639,7 +639,7 @@ class WEEL
 
       @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, ipc
       wp
-    end
+    end #}}}
 
     def __weel_activity(position, type, endpoints, parameters, finalize, update=nil)# {{{
       position = __weel_position_test position
@@ -849,29 +849,29 @@ class WEEL
       end
     end # }}}
 
-    def __weel_sim
+    def __weel_sim #{{{
       @__weel_state == :simulating
-    end
+    end #}}}
 
-    def __weel_sim_start(what,options={})
+    def __weel_sim_start(what,options={}) #{{{
       current_branch_sim_pos = Thread.current[:branch_sim_pos]
       Thread.current[:branch_sim_pos] = @__weel_sim += 1
       handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args
       handlerwrapper.simulate(what,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
       [handlerwrapper, current_branch_sim_pos]
-    end
+    end #}}}
 
-    def __weel_sim_stop(what,handlerwrapper,current_branch_sim_pos,options={})
+    def __weel_sim_stop(what,handlerwrapper,current_branch_sim_pos,options={}) #{{{
       handlerwrapper.simulate(what,:end,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
       Thread.current[:branch_sim_pos] = current_branch_sim_pos
-    end
+    end #}}}
 
   public
-    def __weel_finalize
+    def __weel_finalize #{{{
       __weel_recursive_join(@__weel_main)
       @__weel_state = :stopped
       @__weel_handlerwrapper::inform_state_change @__weel_handlerwrapper_args, @__weel_state
-    end
+    end #}}}
 
     def __weel_state=(newState)# {{{
       return @__weel_state if newState == @__weel_state && @__weel_state != :ready
@@ -880,6 +880,7 @@ class WEEL
       @__weel_state = newState
 
       if newState == :stopping || newState == :finishing
+        @__weel_status.nudge!
         __weel_recursive_continue(@__weel_main)
       end
 

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.63"
+  s.version          = "1.99.64"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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.99.63
+  version: 1.99.64
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -101,45 +101,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
 - test/TestHandlerWrapper.rb
-- test/ContinueTest.rb
-- test/TestWorkflow.rb
 - test/TestMixin.rb
-- test/SimHandlerWrapper.rb
+- test/TestWorkflow.rb
 - test/README
+- test/ContinueTest.rb
+- test/SimHandlerWrapper.rb
+- test/exec/tc_again.rb
+- test/exec/tc_exec.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_parallel.rb
+- test/basic/tc_codereplace.rb
+- test/basic/tc_wf_control.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_state.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_search.rb
+- test/basic/tc_data.rb
+- test/speed/tc_speed2.rb
+- test/speed/tc_speed1.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
+- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
 - test/wfp_adv_branching/tc_threadmerge.rb
 - test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
 - test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_multimerge.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_state_based/tc_deferredchoice.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
-- test/speed/tc_speed1.rb
-- test/speed/tc_speed2.rb
-- test/exec/tc_again.rb
-- test/exec/tc_exec.rb
+- test/complex/tc_parallel_stop.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/complexsearch/tc_search.rb
 - test/wfp_basic/tc_parallelsplit_synchronization.rb
 - test/wfp_basic/tc_exclusivechoice_simplemerge.rb
 - test/wfp_basic/tc_sequence.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/complex/tc_parallel_stop.rb
-- test/basic/tc_state.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_data.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_search.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_codereplace.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_parallel.rb
-- test/complexsearch/tc_search.rb
+- test/wfp_state_based/tc_deferredchoice.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb