cpee 2.1.69 → 2.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742b60e370b4d7dca440503134cc68e53c86cba0efa32b2241e47e5ed30a494b
-  data.tar.gz: b7b77bcb900adbff359b599f4769ed5ebdf34d2eb1c1801afe589d389043f26f
+  metadata.gz: 41f311fdc70aec9386640a09a7331abdd3279d08e532de6a74f019a89d413cd8
+  data.tar.gz: 479b16db900e1270c2124d5b413d3623813bc4b37d8727a8bbce397ea1207953
 SHA512:
-  metadata.gz: 70a3f1d1bad894a550150b486e097ca023674fe73e586ed795180ba82ab9c2999321b8964a7aa18576b48ab643cb5b07a6f10599d62a8ce5f583afe85d8b9f9e
-  data.tar.gz: 79b5d7581ad1def9ad8853844cfd8bf402daa1de398738c2477c43d5cd5c810b6ff042c5ea5aa35fbc045758f3b6e8a213cfbb9a3d87ce3f9bb69ec66224ce8a
+  metadata.gz: 0c6f6a22e4e5d76474b160f780b99a4f4e6355259174cf31f99704512e88863dcc0ee9f17a3c037a0fc44a98730ae8f1f2eff8a749de774eb87f409ecb286b11
+  data.tar.gz: 7b70f1adc92d339b829ef8285fafb7836946d73c6b51e6cf16f0a278ba84cae0a6191897dcdbf3caf61bcd2960643da2a7cbb1b36260ef19a29639659ea3f25b

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.69"
+  s.version          = "2.1.70"
   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.125'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.126'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/server/executionhandlers/ruby/connection.rb

@@ -38,7 +38,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     # 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

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -435,7 +435,7 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch data do |local|</xsl:text>
+    <xsl:text>parallel_branch do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">

data/server/executionhandlers/rubyext/connection.rb

@@ -36,8 +36,11 @@ 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
+    p err
+    p err.message
+    p err.backtrace
     controller = arguments[0]
-    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])
+    controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):\s(.*)/)[4] + err.message, :line => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[3], :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])

data/server/executionhandlers/rubyext/dsl_to_dslx.xsl

@@ -435,7 +435,7 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch data do |local|</xsl:text>
+    <xsl:text>parallel_branch do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.69
+  version: 2.1.70
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.125
+        version: 1.99.126
   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.125
+        version: 1.99.126
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement