weel 1.99.33 → 1.99.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e8f1b805e2979d26400d4ba916679b7d9cbbea
-  data.tar.gz: 61c7cfdd34f1c011b6da55512229046d3edab825
+  metadata.gz: 1d1ac711f267672dee05871db0dbf779d521c6cb
+  data.tar.gz: 2a8e5d21db11d5fd91191b8e0f89e74284fc28a5
 SHA512:
-  metadata.gz: a44f9974cc4fd16f903be6c10f801cfc9ed36e7fa2f6f74399ae1ee89576fc949cc6b5d75a2ded7231887dd381b6cd39b4e219e19550021d07b60816e14e9c80
-  data.tar.gz: 8e7276b1c3a1306288142143cf8583888b71ea5cfd58cf5bf44d1c7f7801de8197d159e57336aceeef70d826063bdc4edfc263593964f5fe17f38adb30c8ef19
+  metadata.gz: fc6df903386deb87c06977edf0775251cddeed08ac2f9b64b116a8ba89c3b9ce186de09656e2438977fdef4e5eb6c7cb6a68d3524f6706a67e07974d59bd368e
+  data.tar.gz: 433be48661ce042dd75ae53d525bc89fdc0c0d79d9984f04773fcc9f38fc44d539ee3f9fdbaa6835697fee5cef98cc06734463f924ad632c2e7cf7fa1bf1e1bc

data/lib/weel.rb

@@ -474,6 +474,8 @@ class WEEL
       __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => condition.is_a?(String) ? condition : nil)) if __weel_sim
     end # }}}
     def otherwise(args={}) # {{{
+      p 'rrrr'
+      sleep 1
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       hw, pos = __weel_sim_start(:otherwise,args.merge(:mode => Thread.current[:alternative_mode].last)) if __weel_sim
       yield if __weel_is_in_search_mode || __weel_sim || !Thread.current[:alternative_executed].last
@@ -512,11 +514,17 @@ class WEEL
         return
       end
       handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition[0].is_a?(Proc)
-      case condition[1]
-        when :pre_test
-          yield while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
-        when :post_test
-          begin; yield; end while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
+      catch :escape do
+        case condition[1]
+          when :pre_test
+            while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
+              yield
+            end  
+          when :post_test
+            begin
+              yield
+            end while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
+        end
       end
     end # }}}
 
@@ -527,6 +535,8 @@ class WEEL
       [code || blk, :post_test]
     end # }}}
 
+    def escape; throw :escape; end
+
     def status # {{{
       @__weel_status
     end # }}}

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.33"
+  s.version          = "1.99.34"
   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.99.33
+  version: 1.99.34
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com