cpee 2.1.104 → 2.1.108

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -110,6 +110,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>terminate</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">
@@ -145,6 +158,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>escape</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='parallel'">
@@ -155,8 +181,21 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>parallel</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@wait">
-        <xsl:text> :wait =&gt; </xsl:text>
+        <xsl:text>, :wait =&gt; </xsl:text>
         <xsl:value-of select="@wait"/>
         <xsl:if test="@cancel">
           <xsl:text>, :cancel =&gt; :</xsl:text>
@@ -186,16 +225,29 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>loop </xsl:text>
+      <xsl:text>loop</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@mode='pre_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>pre_test{</xsl:text>
+            <xsl:text>, pre_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>pre_test("</xsl:text>
+            <xsl:text>, pre_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
@@ -204,18 +256,18 @@
       <xsl:if test="@mode='post_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>post_test{</xsl:text>
+            <xsl:text>, post_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>post_test("</xsl:text>
+            <xsl:text>, post_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:if>
-      <xsl:for-each select="@*[not(name()='language' or (local-name()='alt_id' and namespace-uri()='http://cpee.org/ns/annotation/1.0') or name()='mode' or name()='condition' or name()='svg-label')]">
+      <xsl:for-each select="@*[not(name()='language' or name()='mode' or (local-name()='alt_id' and namespace-uri()='http://cpee.org/ns/annotation/1.0') or name()='condition' or name()='svg-label')]">
         <xsl:text>, :</xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:text> => "</xsl:text>
@@ -306,13 +358,26 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>choose </xsl:text>
+      <xsl:text>choose</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:choose>
         <xsl:when test="@mode='exclusive'">
-          <xsl:text>:exclusive</xsl:text>
+          <xsl:text>, :exclusive</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>:inclusive</xsl:text>
+          <xsl:text>, :inclusive</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:text> do</xsl:text>
@@ -346,7 +411,21 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>critical :</xsl:text>
+      <xsl:text>critical</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text>, :</xsl:text>
       <xsl:value-of select="@sid"/>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
@@ -373,15 +452,28 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>alternative </xsl:text>
+    <xsl:text>alternative</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:choose>
       <xsl:when test="@language='application/x-ruby'">
-        <xsl:text>test{</xsl:text>
+        <xsl:text>, test{</xsl:text>
         <xsl:value-of select="@condition"/>
         <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>test("</xsl:text>
+        <xsl:text>, test("</xsl:text>
         <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
         <xsl:text>")</xsl:text>
       </xsl:otherwise>
@@ -418,7 +510,20 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>otherwise </xsl:text>
+      <xsl:text>otherwise</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:for-each select="@*[not(name()='language' or name()='condition' or name()='svg-label')]">
         <xsl:if test="position() &gt;1">, </xsl:if>
         <xsl:text>:</xsl:text>
@@ -452,7 +557,21 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch do |local|</xsl:text>
+    <xsl:text>parallel_branch</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
@@ -468,21 +587,7 @@
     <xsl:text>end</xsl:text>
     <xsl:call-template name="print-newline"/>
   </xsl:template>
-  <xsl:template name="genPath">
-    <xsl:param name="prevPath"/>
-    <xsl:variable name="currPath" select="concat('/',name(),'[',
-      count(preceding-sibling::*[name() = name(current())])+1,']',$prevPath)"/>
-    <xsl:for-each select="parent::*">
-      <xsl:call-template name="genPath">
-        <xsl:with-param name="prevPath" select="$currPath"/>
-      </xsl:call-template>
-    </xsl:for-each>
-    <xsl:if test="not(parent::*)">
-      <xsl:value-of select="$currPath"/>
-    </xsl:if>
-  </xsl:template>
   <xsl:template match="d:parameters">
-    <!--xsl:text>:path =&gt; "</xsl:text><xsl:call-template name="genPath"/><xsl:text>", </xsl:text-->
     <xsl:apply-templates select="d:label" mode="parameter"/>
     <xsl:apply-templates select="d:*[not(name()='label') and not(name()='color')]" mode="parameter"/>
     <xsl:if test="count(*) &gt; 0">, </xsl:if>
@@ -508,7 +613,6 @@
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text> =&gt; </xsl:text>
-
     <xsl:choose>
       <xsl:when test="count(*) &gt; 0 and name()='arguments'">
         <xsl:text>[</xsl:text>

data/server/executionhandlers/ruby/execution.rb

@@ -76,27 +76,44 @@ module CPEE
       end
 
       def self::run(id,opts)
-        ### if File file .remote
-          ### connect to remote
-          ### run same as below
-        ### else
-          ### Determine whether we run locally or remote
+        if File.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            ssh.exec!("ruby #{exe} >#{exe}.out 2>#{exe}.err &")
+          end
+        else
           exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
           pid = Kernel.spawn(opts[:libs_preloaderrun] + ' ' + exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
           Process.detach pid
           File.write(exe + '.pid',pid)
-        ### end
+        end
       end
 
       def self::stop(id,opts) ### return: bool to tell if manually changing redis is necessary
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
-        pid = File.read(exe + '.pid') rescue nil
-        if pid && (Process.kill(0, pid.to_i) rescue false)
-          Process.kill('HUP', pid.to_i) rescue nil
-          false
-        else # its not running, so clean up
-          File.unlink(exe + '.pid') rescue nil
-          true
+        if File.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            pid = ssh.exec!("cat #{exe}.pid 2>/dev/null")
+            if pid != '' && ssh.exec!("kill -0 #{pid} >/dev/null 2>&1; echo $?").strip == '0'
+              ssh.exec!("kill -SIGHUP #{pid}")
+              false
+            else
+              ssh.exec!("rm #{exe}.pid")
+              true
+            end
+          end
+        else
+          exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
+          pid = File.read(exe + '.pid') rescue nil
+          if pid && (Process.kill(0, pid.to_i) rescue false)
+            Process.kill('HUP', pid.to_i) rescue nil
+            false
+          else # its not running, so clean up
+            File.unlink(exe + '.pid') rescue nil
+            true
+          end
         end
       end
     end

data/server/routing/end.pid

@@ -1 +1 @@
-577032
+1764907

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

@@ -1 +1 @@
-577074
+1764950

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-577060
+1764935

data/server/routing/persist.pid

@@ -1 +1 @@
-577046
+1764921

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.104
+  version: 2.1.108
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.146
+        version: 1.99.148
   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.146
+        version: 1.99.148
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.3'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement