cpee 2.1.67 → 2.1.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e313a326e4a845a8274655c17d53ed396b9c4869cc7308f0d3b71396c5c1cd
-  data.tar.gz: 2635e43efb227782f4835c94cfbde0e423c9a543c81efb66e01f5ef9d5c0d06d
+  metadata.gz: 742b60e370b4d7dca440503134cc68e53c86cba0efa32b2241e47e5ed30a494b
+  data.tar.gz: b7b77bcb900adbff359b599f4769ed5ebdf34d2eb1c1801afe589d389043f26f
 SHA512:
-  metadata.gz: 773fb767bcd14e9e719a0716a5b5d8cb51a8a7c80ba3de7eb32a1b3f3d2f06666775fe0ebe7b9d6f57757c39fff0692d9bb8dcc5c7abe6ed1deefd4a2202b389
-  data.tar.gz: 182169f0e3bca3b90ac0d97382ba2f3abe771c53c3e8298907a5f053fb5f0d17a7f7b567b9e5960cc0cddc490764186ebe742b233a09ec886ad87005796d75ca
+  metadata.gz: 70a3f1d1bad894a550150b486e097ca023674fe73e586ed795180ba82ab9c2999321b8964a7aa18576b48ab643cb5b07a6f10599d62a8ce5f583afe85d8b9f9e
+  data.tar.gz: 79b5d7581ad1def9ad8853844cfd8bf402daa1de398738c2477c43d5cd5c810b6ff042c5ea5aa35fbc045758f3b6e8a213cfbb9a3d87ce3f9bb69ec66224ce8a

data/cockpit/themes/felix/rngs/call.rng

@@ -224,6 +224,14 @@
      <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
         <data type="string" rngui:readonly="true"/>
       </attribute>
-
+  </element>
+  <element name="expectedready" rngui:label="Expected Ready">
+    <data name="expectedready" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedstart" rngui:label="Planned Start Time">
+    <data name="plannedstart" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedend" rngui:label="Planned End Time">
+    <data name="plannedend" type="decimal" rngui:readonly="true"/>
   </element>
 </element>

data/cockpit/themes/felix/rngs/callmanipulate.rng

@@ -253,7 +253,15 @@
     <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
       <data type="string" rngui:readonly="true"/>
     </attribute>
-
   </element>
 
+  <element name="expectedready" rngui:label="Expected Ready">
+    <data name="expectedready" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedstart" rngui:label="Planned Start Time">
+    <data name="plannedstart" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedend" rngui:label="Planned End Time">
+    <data name="plannedend" type="decimal" rngui:readonly="true"/>
+  </element>
 </element>

data/cockpit/themes/felix/rngs/manipulate.rng

@@ -15,6 +15,15 @@
     <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
       <data type="string" rngui:readonly="true"/>
     </attribute>
-
   </element>
+  <element name="expectedready" rngui:label="Expected Ready">
+    <data name="expectedready" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedstart" rngui:label="Planned Start Time">
+    <data name="plannedstart" type="decimal" rngui:readonly="true"/>
+  </element>
+  <element name="plannedend" rngui:label="Planned End Time">
+    <data name="plannedend" type="decimal" rngui:readonly="true"/>
+  </element>
+
 </element>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.67"
+  s.version          = "2.1.69"
   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.124'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.125'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'
@@ -31,5 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'webrick', '~>1.7'
   s.add_runtime_dependency 'rbtrace', '~>0.4'
-  s.add_runtime_dependency 'cpee-eval-ruby', '~> 1.0', '>= 1.0.1'
+  s.add_runtime_dependency 'cpee-eval-ruby', '~> 1.0', '>= 1.0.4'
 end

data/server/executionhandlers/rubyext/connection.rb

@@ -36,19 +36,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::inform_syntax_error(arguments,err,code)# {{{
     # TODO extract spot (code) where error happened for better error handling (ruby 3.1 only)
     # https://github.com/rails/rails/pull/45818/commits/3beb2aff3be712e44c34a588fbf35b79c0246ca5
-    puts err.message
-    puts err.backtrace
-
     controller = arguments[0]
-    mess = err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : ''
-    mess += err.message
-    controller.notify("description/error", :message => mess)
+    controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?), Line (\d+):\s(.*)/)[3] + err.message, :line => err.backtrace[0].match(/(.*?), Line (\d+):/)[2], :where => err.backtrace[0].match(/(.*?), Line (\d+):/)[1])
+    #mess = err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : ''
+    #mess += err.message
+    #controller.notify("description/error", :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end# }}}
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
-    puts err.message
-    puts err.backtrace
-    controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') + err.message)
+    controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?), Line (\d+):\s(.*)/)[3] + err.message, :line => err.backtrace[0].match(/(.*?), Line (\d+):/)[2], :where => err.backtrace[0].match(/(.*?), Line (\d+):/)[1])
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
     controller = arguments[0]
@@ -250,9 +246,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
-    puts err.message
-    puts err.backtrace
-    @controller.notify("activity/failed", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("activity/failed", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.backtrace[0].match(/(.*?):(\d+):\s(.*)/)[3], :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
@@ -326,9 +320,21 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def prepare(lock,dataelements,endpoints,status,local,additional,code,exec_endpoints,exec_parameters)
+  def code_error_handling(ret,where,what=RuntimeError) #{{{
+    sig = ret.find{|e| e.name == "signal" }.value
+    sigt = ret.find{|e| e.name == "signal_text" }.value
+    case sig
+      when 'Signal::Again'; throw WEEL::Signal::Again
+      when 'Signal::Error'; raise what, '', [where + ' ' + sigt]
+      when 'Signal::Stop'; raise WEEL::Signal::Stop
+      when 'Signal::SyntaxError'; raise SyntaxError, '', [where + ' ' + sigt]
+      else
+        raise 'something bad happened, but we dont know what.'
+    end
+  end #}}}
+  def prepare(lock,dataelements,endpoints,status,local,additional,code,exec_endpoints,exec_parameters) #{{{
     struct = if code
-      manipulate(true,lock,dataelements,endpoints,status,local,additional,code,'Parameter')
+      manipulate(true,lock,dataelements,endpoints,status,local,additional,code,'prepare')
     else
       WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
     end
@@ -353,7 +359,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         recv = if status >= 200 && status < 300
           ret[0].value
         else
-          nil
+          code_error_handling ret, 'Parameter ' + t.value.code
         end
         t.value = recv
       end
@@ -373,7 +379,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     recv = if status >= 200 && status < 300
       ret[0].value
     else
-      nil
+      code_error_handling ret, 'Condition ' + code, WEEL::Signal::Error
     end
     recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' ? false : true)
@@ -411,7 +417,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
         struct
       else
-        nil
+        code_error_handling ret, where
       end
     end
   end #}}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.67
+  version: 2.1.69
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.124
+        version: 1.99.125
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.124
+        version: 1.99.125
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -177,7 +177,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables: