cpee-eval-ruby 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fc79790dae3221f52506e89cac2873c3b87df3b453f28fcf66e6274fbbe9ed
-  data.tar.gz: 024a8c81054a23b338d794898fa8f459f6b603eca6aa53fab2c507d414243c35
+  metadata.gz: 7dca0a648023beda43a3bdbb31753255a07be61291230c143341823b7af4bdbe
+  data.tar.gz: 107b9f6f5421219fc87cfcd7da03a9e45e18dc0bbf5c26a44b6154d0167095fc
 SHA512:
-  metadata.gz: e24df120022480933494c3040f9e47589a6bb410433e152a89a91d14c9ff5e5b564f63bf341b53db84e72ab6515df36d437493103dbb1c0be94cb19bb06a0e40
-  data.tar.gz: 7d9d35d776ea27611803bbd3a20ea5635b0c2027df74e885ae52e21e48df0ce1d8386fd8becc6567007efa1e573d7c070db059e0370a30c586b05e9b436a9b6b
+  metadata.gz: db0cf5c65638d058a386f6e351b03395ff7e8b2a600184aa48363b157631e0a9122624cd189f299dff419d2fc38d0b55bebc5b8e6f9f8b8d85163854f3113955
+  data.tar.gz: d819ea7b8db051e7ed55f296c1031fd346295c55606bcba37e8165390d4d39a169cca280d3e3f40bd80761f430566fb6d6ae0aa717aa5b575e2c6bbc10739d86

data/cpee-eval-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-eval-ruby"
-  s.version          = "1.0.8"
+  s.version          = "1.0.10"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Ruby eval for the cloud process execution engine (cpee.org)"

data/lib/cpee-eval-ruby/implementation.rb

@@ -25,6 +25,7 @@ require 'redis'
 require 'json'
 require 'weel'
 require 'charlock_holmes'
+require 'timeout'
 require_relative 'translation'
 
 module CPEE
@@ -36,15 +37,17 @@ module CPEE
       def exec(__struct,__code,result=nil,headers=nil)
         __ret = {}
         __cat = catch WEEL::Signal::Again do
-          __ret[:res] = JSON::generate(__struct.instance_eval(__code))
+          Timeout.timeout(7) do
+            __ret[:res] = JSON::generate(__struct.instance_eval(__code))
+          end
           WEEL::Signal::Proceed
         end
         if __cat.nil? || __cat == WEEL::Signal::Again
           __ret[:signal] << 'Signal::Again'
         end
-      rescue => err
+      rescue Timeout::Error
         __ret[:signal] = 'Signal::Error'
-        __ret[:signal_text] = (err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : '') + err.message
+        __ret[:signal_text] = 'Your code took longer than 7 seconds'
       rescue WEEL::Signal::Again
         __ret[:signal] = 'Signal::Again'
       rescue  WEEL::Signal::Error => err
@@ -55,6 +58,9 @@ module CPEE
       rescue SyntaxError => err
         __ret[:signal] = 'Signal::SyntaxError'
         __ret[:signal_text] = err.message
+      rescue => err
+        __ret[:signal] = 'Signal::Error'
+        __ret[:signal_text] = (err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : '') + err.message
       ensure
         return __ret
       end
@@ -93,6 +99,7 @@ module CPEE
             send << Riddl::Parameter::Simple.new('signal',execresult[:signal])
             send << Riddl::Parameter::Simple.new('signal_text',execresult[:signal_text] || '')
             @status = 555
+            return send
           end
 
           res = {}
@@ -117,7 +124,7 @@ module CPEE
           struct = WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
           execresult = exec struct, code
           send = []
-          send << Riddl::Parameter::Complex.new('result','application/json',execresult[:res])
+          send << Riddl::Parameter::Complex.new('result','application/json',execresult[:res] || '')
           if execresult[:signal]
             send << Riddl::Parameter::Simple.new('signal',execresult[:signal])
             send << Riddl::Parameter::Simple.new('signal_text',execresult[:signal_text] || '')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cpee-eval-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
-autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -55,13 +54,11 @@ files:
 - lib/cpee-eval-ruby/implementation.xml
 - lib/cpee-eval-ruby/translation.rb
 - server/eval-ruby
-- server/eval-ruby.pid
 - tools/cpee-eval-ruby
 homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby eval for the cloud process execution engine (cpee.org)
 test_files: []

data/server/eval-ruby.pid

@@ -1 +0,0 @@
-934659