weel 1.99.56 → 1.99.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4cdf62385cfec6d6ef0af98c8a76d8d52259796
-  data.tar.gz: 26fc6450ac38515a53833be35da736019fab71f2
+  metadata.gz: c55c3d411a1eab0c4cd80b803dbbcf358fbafb63
+  data.tar.gz: 313ba40f324c648a521f8909afac4ad63406e294
 SHA512:
-  metadata.gz: 30efad55aea47e8d445c9bd079e539f2f8474d76647dff7f952f874296c03298f62b9cacf4ff619fb6766a6622d959ea6e80c69481835de2565523bf18be1973
-  data.tar.gz: 6d5d7c4d9475c6c8e4b3e9e8ca6b55db3d4149a0de3fd45e15dd843d6c6186ba83ff421be2ac7b433c6090df31e3bb6a2b4b527c08e07377f7896cea84b8dab8
+  metadata.gz: cdc858221117b9535568b76d19e9c710007cfa687b6b9c0f12b12169b0e8e4861281dc6bfa4afe64e0a1574d7c7c4b0f6f7997384b33411eb3ccf977921e4fe2
+  data.tar.gz: 80c42fca246256ebc96c9a2533087ae1e72cdcefdb96ff06b872a78c71fabb9035ac2399c1b514146e69863b76110ac4863edb8d5a1284610333df517e60657c

data/lib/weel.rb

@@ -56,7 +56,6 @@ class WEEL
     class SkipManipulate < Exception; end
     class StopSkipManipulate < Exception; end
     class Stop < Exception; end
-    class StopAfter < Exception; end
     class Proceed < Exception; end
     class NoLongerNecessary < Exception; end
     class Again < Exception; end
@@ -212,6 +211,7 @@ class WEEL
     def initialize(arguments,endpoint=nil,position=nil,continue=nil); end
 
     def activity_handle(passthrough, parameters); end
+    def activity_manipulate_handle(parameters); end
 
     def activity_result_value; end
     def activity_result_status; end
@@ -335,15 +335,20 @@ class WEEL
     def call(position, endpoint, parameters: {}, finalize: nil, update: nil, &finalizeblk)
       __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update)
     end
-    def manipulate(position, script=nil, &scriptblk)
-      __weel_activity(position,:manipulate,nil,{},script||scriptblk)
+    # when two params, second param always script
+    # when block and two params, parameters stays
+    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
 
     # Parallel DSL-Construct
     # Defines Workflow paths that can be executed parallel.
     # May contain multiple branches (parallel_branch)
     def parallel(type=nil)# {{{
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
       Thread.current[:branches] = []
       Thread.current[:branch_finished_count] = 0
@@ -372,7 +377,7 @@ class WEEL
 
       __weel_sim_stop(:parallel,hw,pos) if __weel_sim
 
-      unless self.__weel_state == :stopping || self.__weel_state == :stopped
+      unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
         # first set all to no_longer_neccessary
         Thread.current[:branches].each do |thread|
           if thread.alive?
@@ -389,7 +394,7 @@ class WEEL
 
     # Defines a branch of a parallel-Construct
     def parallel_branch(*vars)# {{{
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       branch_parent = Thread.current
 
       if __weel_sim
@@ -428,11 +433,11 @@ class WEEL
         branch_parent[:mutex].synchronize do
           Thread.current[:branch_status] = true
           branch_parent[:branch_finished_count] += 1
-          if branch_parent[:branch_finished_count] == branch_parent[:branch_wait_count] && self.__weel_state != :stopping
+          if branch_parent[:branch_finished_count] == branch_parent[:branch_wait_count] && self.__weel_state != :stopping && self.__weel_state != :finishing
             branch_parent[:branch_event].continue
           end
         end
-        if self.__weel_state != :stopping && self.__weel_state != :stopped
+        if self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
           if Thread.current[:branch_position]
             @__weel_positions.delete Thread.current[:branch_position]
             begin
@@ -450,7 +455,7 @@ class WEEL
     # Defines a choice in the Workflow path.
     # May contain multiple execution alternatives
     def choose(mode=:inclusive) # {{{
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       Thread.current[:alternative_executed] ||= []
       Thread.current[:alternative_mode] ||= []
       Thread.current[:alternative_executed] << false
@@ -467,7 +472,7 @@ class WEEL
     # Block is executed if condition == true or
     # searchmode is active (to find the starting position)
     def alternative(condition,args={})# {{{
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       hw, pos = __weel_sim_start(:alternative,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => ((condition.is_a?(String) || condition.is_a?(Proc)) ? condition : nil))) if __weel_sim
       Thread.current[:mutex] ||= Mutex.new
       Thread.current[:mutex].synchronize do
@@ -481,7 +486,7 @@ class WEEL
       __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => ((condition.is_a?(String) || condition.is_a?(Proc)) ? condition : nil))) if __weel_sim
     end # }}}
     def otherwise(args={}) # {{{
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       hw, pos = __weel_sim_start(:otherwise,args.merge(:mode => Thread.current[:alternative_mode].last)) if __weel_sim
       __weel_protect_yield(&Proc.new) if __weel_is_in_search_mode || __weel_sim || !Thread.current[:alternative_executed].last
       __weel_sim_stop(:otherwise,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last)) if __weel_sim
@@ -506,7 +511,7 @@ class WEEL
       unless condition.is_a?(Array) && (condition[0].is_a?(Proc) || condition[0].is_a?(String)) && [:pre_test,:post_test].include?(condition[1]) && args.is_a?(Hash)
         raise "condition must be called pre_test{} or post_test{}"
       end
-      return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       if __weel_is_in_search_mode
         catch :escape do
           __weel_protect_yield(&Proc.new)
@@ -525,13 +530,13 @@ class WEEL
       catch :escape do
         case condition[1]
           when :pre_test
-            while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
+            while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
               __weel_protect_yield(&Proc.new)
             end
           when :post_test
             begin
               __weel_protect_yield(&Proc.new)
-            end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
+            end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
         end
       end
     end # }}}
@@ -546,7 +551,20 @@ class WEEL
       [code || blk, :post_test]
     end # }}}
 
-    def escape; throw :escape; end
+    def escape
+      return if __weel_is_in_search_mode
+      throw :escape
+    end
+    def terminate
+      return if __weel_is_in_search_mode
+      self.__weel_state = :finishing
+    end
+    def stop(position)
+      searchmode = __weel_is_in_search_mode(position)
+      return if searchmode
+      __weel_progress searchmode, position, true
+      self.__weel_state = :stopping
+    end
 
     def status # {{{
       @__weel_status
@@ -589,12 +607,39 @@ class WEEL
       end
     end
 
+    def __weel_progress(searchmode, position, skip=false)
+      ipc = {}
+      if searchmode == :after
+        wp = WEEL::Position.new(position, :after, nil)
+        ipc[:after] = [wp.position]
+      else
+        if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
+          @__weel_positions.delete Thread.current[:branch_parent][:branch_position]
+          ipc[:unmark] ||= []
+          ipc[:unmark] << Thread.current[:branch_parent][:branch_position].position rescue nil
+          Thread.current[:branch_parent][:branch_position] = nil
+        end
+        if Thread.current[:branch_position]
+          @__weel_positions.delete Thread.current[:branch_position]
+          ipc[:unmark] ||= []
+          ipc[:unmark] << Thread.current[:branch_position].position rescue nil
+        end
+        wp = WEEL::Position.new(position, skip ? :after : :at, nil)
+        ipc[skip ? :after : :at] = [wp.position]
+      end
+      @__weel_positions << wp
+      Thread.current[:branch_position] = wp
+
+      @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, ipc
+      wp
+    end
+
     def __weel_activity(position, type, endpoints, parameters, finalize, update=nil)# {{{
       position = __weel_position_test position
       begin
         searchmode = __weel_is_in_search_mode(position)
         return if searchmode == true
-        return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+        return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
         Thread.current[:continue] = Continue.new
         handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args, endpoints.is_a?(Array) ? endpoints.map{ |ep| @__weel_endpoints[ep] }.compact : @__weel_endpoints[endpoints], position, Thread.current[:continue]
@@ -604,29 +649,7 @@ class WEEL
           return
         end
 
-        ipc = {}
-        if searchmode == :after
-          wp = WEEL::Position.new(position, :after, nil)
-          ipc[:after] = [wp.position]
-        else
-          if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
-            @__weel_positions.delete Thread.current[:branch_parent][:branch_position]
-            ipc[:unmark] ||= []
-            ipc[:unmark] << Thread.current[:branch_parent][:branch_position].position rescue nil
-            Thread.current[:branch_parent][:branch_position] = nil
-          end
-          if Thread.current[:branch_position]
-            @__weel_positions.delete Thread.current[:branch_position]
-            ipc[:unmark] ||= []
-            ipc[:unmark] << Thread.current[:branch_position].position rescue nil
-          end
-          wp = WEEL::Position.new(position, :at, nil)
-          ipc[:at] = [wp.position]
-        end
-        @__weel_positions << wp
-        Thread.current[:branch_position] = wp
-
-        @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, ipc
+        wp = __weel_progress searchmode, position
 
         # searchmode position is after, jump directly to vote_sync_after
         raise Signal::Proceed if searchmode == :after
@@ -634,9 +657,10 @@ class WEEL
         case type
           when :manipulate
             raise Signal::Stop unless handlerwrapper.vote_sync_before
-            raise Signal::Skip if self.__weel_state == :stopping
+            raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
             if finalize.is_a?(Proc) || finalize.is_a?(String)
+              handlerwrapper.activity_manipulate_handle(parameters)
               handlerwrapper.inform_activity_manipulate
               if finalize.is_a?(Proc)
                 mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
@@ -679,7 +703,7 @@ class WEEL
                 raise("invalid parameters")
             end
             raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
-            raise Signal::Skip if self.__weel_state == :stopping
+            raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
             passthrough = @__weel_search_positions[position] ? @__weel_search_positions[position].passthrough : nil
             handlerwrapper.activity_handle passthrough, params
@@ -687,14 +711,14 @@ class WEEL
               # with loop if catching Signal::Again
               # handshake call and wait until it finished
               waitingresult = nil
-              waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :stopped
+              waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
               raise waitingresult[1] if !waitingresult.nil? && waitingresult.is_a?(Array) && waitingresult.length == 2 && waitingresult[0] == WEEL::Signal::Error
 
               if Thread.current[:nolongernecessary]
                 handlerwrapper.activity_no_longer_necessary
                 raise Signal::NoLongerNecessary
               end
-              if self.__weel_state == :stopping
+              if self.__weel_state == :stopping || self.__weel_state == :finishing
                 handlerwrapper.activity_stop
                 wp.passthrough = handlerwrapper.activity_passthrough_value
                 raise Signal::Proceed
@@ -732,13 +756,8 @@ class WEEL
             end
         end
         raise Signal::Proceed
-      rescue Signal::StopAfter
-        handlerwrapper.inform_activity_done
-        wp.detail = :after
-        @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp.position]
-        self.__weel_state = :stopping
       rescue Signal::SkipManipulate, Signal::Proceed
-        if self.__weel_state != :stopping && !handlerwrapper.vote_sync_after
+        if self.__weel_state != :stopping && self.__weel_state != :finishing && !handlerwrapper.vote_sync_after
           self.__weel_state = :stopping
           wp.detail = :unmark
         end
@@ -853,7 +872,7 @@ class WEEL
       @__weel_positions = Array.new if newState == :running
       @__weel_state = newState
 
-      if newState == :stopping
+      if newState == :stopping || newState == :finishing
         __weel_recursive_continue(@__weel_main)
       end
 
@@ -966,7 +985,7 @@ public
           @dslr.__weel_state = :stopping
           @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,Exception.new(err.message),code)
         end
-        if @dslr.__weel_state == :running
+        if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing
           @dslr.__weel_state = :finished
           ipc = { :unmark => [] }
           @dslr.__weel_positions.each{ |wp| ipc[:unmark] << wp.position }

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.56"
+  s.version          = "1.99.61"
   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.56
+  version: 1.99.61
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit