cpee 2.1.98 → 2.1.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5380db38e15ecc1a9e3d52fa912f498c6a07e071e685370402719257154dc768
-  data.tar.gz: 228deb7bd244630dfb4dc47618fc628cc23630e95822f7bf6a517824a6c2f9b4
+  metadata.gz: 10e4035a81c82d0dbeb5b0880d7d95c8a1624064ad5dc28b97cc0ea20e7abd55
+  data.tar.gz: 1bc56bb711d4d736c20a9abb758c717182c912e8a9ba4c03c1018a2292e9831a
 SHA512:
-  metadata.gz: 856b90b8753e9984e4c7cbdcea0914873987c6ecf68297afca3309b8dda9e8ca1e72a68be0b85e9147b5378bc2f734b3c0c8b9da08827670a8b853acde7a2681
-  data.tar.gz: ba100bf2a332013b03c005493cadae226b85407e7e9846f5e24cd694b73095a8a1041c569c4455ceede9dd33cf6e4f6fabb3b97b96aa4ab36397e2930428e560
+  metadata.gz: 8add1a6e917a9adfd4e0b00d0c8fd04eb74587eb5b76a52ce3a57501bbd1bd00f48b3bccbe2d004b98b874b9a472bef55e2d6b9a3458d6d0db5dfcccb27f35bf
+  data.tar.gz: 333a07148ac4d3be6c551fa0e6eb5ae6e0c5a84ba8fb70be44675964cb6430cfa7ef8e242bd19813c67e75512ffc4fee15fab5feeaddc4280eec4ec1d1692a25

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.98"
+  s.version          = "2.1.99"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.126'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.146'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/server/executionhandlers/eval/connection.rb

@@ -69,8 +69,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @handler_continue = continue
     @handler_position = position
     @handler_passthrough = nil
-    @handler_returnValue = nil
-    @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
     @guard_files = []
@@ -236,13 +234,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
-  def activity_result_value # {{{
-    @handler_returnValue
-  end # }}}
-  def activity_result_options # {{{
-    @handler_returnOptions
-  end # }}}
-
   def activity_stop # {{{
     unless @handler_passthrough.nil?
       @controller.cancel_callback(@handler_passthrough)
@@ -307,24 +298,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
-      @handler_returnValue = nil
-      @handler_returnOptions = nil
+      returnValue = nil
+      returnOptions = nil
     else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
+      returnValue = recv
+      returnOptions = options
     end
 
     if options['CPEE_UPDATE']
-      @handler_continue.continue WEEL::Signal::UpdateAgain
+      @handler_continue.continue WEEL::Signal::UpdateAgain, returnValue, returnOptions
     else
       @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
-        @handler_continue.continue WEEL::Signal::Salvage
+        @handler_continue.continue WEEL::Signal::Salvage, returnValue, returnOptions
       elsif options['CPEE_STOP']
-        @handler_continue.continue WEEL::Signal::Stop
+        @handler_continue.continue WEEL::Signal::Stop, returnValue, returnOptions
       else
-        @handler_continue.continue
+        @handler_continue.continue WEEL::Signal::Proceed, returnValue, returnOptions
       end
     end
   end #}}}

data/server/executionhandlers/ruby/connection.rb

@@ -69,8 +69,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @handler_continue = continue
     @handler_position = position
     @handler_passthrough = nil
-    @handler_returnValue = nil
-    @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
     @guard_files = []
@@ -236,13 +234,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
-  def activity_result_value # {{{
-    @handler_returnValue
-  end # }}}
-  def activity_result_options # {{{
-    @handler_returnOptions
-  end # }}}
-
   def activity_stop # {{{
     unless @handler_passthrough.nil?
       @controller.cancel_callback(@handler_passthrough)
@@ -314,24 +305,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
-      @handler_returnValue = nil
-      @handler_returnOptions = nil
+      returnValue = nil
+      returnOptions = nil
     else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
+      returnValue = recv
+      returnOptions = options
     end
 
     if options['CPEE_UPDATE']
-      @handler_continue.continue WEEL::Signal::UpdateAgain
+      @handler_continue.continue WEEL::Signal::UpdateAgain, returnValue, returnOptions
     else
       @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
-        @handler_continue.continue WEEL::Signal::Salvage
+        @handler_continue.continue WEEL::Signal::Salvage, returnValue, returnOptions
       elsif options['CPEE_STOP']
-        @handler_continue.continue WEEL::Signal::Stop
+        @handler_continue.continue WEEL::Signal::Stop, returnValue, returnOptions
       else
-        @handler_continue.continue
+        @handler_continue.continue WEEL::Signal::Proceed, returnValue, returnOptions
       end
     end
   end #}}}

data/server/routing/end.pid

@@ -1 +1 @@
-2372948
+1586693

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-2372966
+1586711

data/server/routing/forward-events-01.pid

@@ -1 +1 @@
-2372972
+1586718

data/server/routing/forward-events-02.pid

@@ -1 +1 @@
-2372978
+1586734

data/server/routing/forward-events-03.pid

@@ -1 +1 @@
-2372984
+1586740

data/server/routing/forward-events-04.pid

@@ -1 +1 @@
-2372990
+1586746

data/server/routing/forward-events-05.pid

@@ -1 +1 @@
-2372996
+1586752

data/server/routing/forward-events-06.pid

@@ -1 +1 @@
-2373002
+1586758

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-2372960
+1586705

data/server/routing/persist.pid

@@ -1 +1 @@
-2372954
+1586699

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.98
+  version: 2.1.99
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.126
+        version: 1.99.146
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.126
+        version: 1.99.146
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement