cpee 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c62160d5a81af31291d43be2b7a15d7ec82280fbaf8100b2e7f6d1c9444acb
-  data.tar.gz: 5c2ec7a78293aaeabd1d6b0a450ad8205c4e31e9dac2799a36020b1b4a04525d
+  metadata.gz: 7c028a21ea683c2b4021f66cb0707a5a36a65dd507998ded71e4c3edd061d4a0
+  data.tar.gz: dfafd97c3ecbe4f40b1cd1233b91ab54fd90dbc3fca3e70c3456f6cdcf234e79
 SHA512:
-  metadata.gz: 6795bea238d2fb417ce780ce8335eee886019b1e712fed7a2bdded535822a9b9648bb941a6a44a0d5ee188da10fc0aed1ec01661b23b83cbc9846537686f2855
-  data.tar.gz: f983dddac9dfbd8a3150e594958202a67910f7532a70ee5b27a67ec5c565e5dd3d9ef8a56320d7fe91216f8158c1ee5491582a7d64130798eb90eaaef19c7261
+  metadata.gz: 18e675ccef009528bad6d7852ff5e3d46549bd30bd632b3caa685c3ce353f357a961d54caf6355312d8e1b2eba3ece587539ede3105853b1ea9bab571610588a
+  data.tar.gz: 41be183fb35677883e3de3a3b7194822bb4a811643640749710b54056fdf202680128fc61be8969a68ea0fc5dd952d949bfd864f344c4f45e2575c4f4f993715

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.10"
+  s.version          = "1.5.11"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/instantiation.rb

@@ -146,7 +146,7 @@ module CPEE
       end #}}}
     end #}}}
 
-    class InstantiateUrl < Riddl::Implementation #{{{
+    class InstantiateGit < Riddl::Implementation #{{{
       include Helpers
 
       def response
@@ -154,28 +154,66 @@ module CPEE
         selfurl = @a[1]
         cblist = @a[2]
 
-        status, res = Riddl::Client.new(@p[2].value.gsub(/ /,'%20')).get
+        status, res = Riddl::Client.new(File.join(@p[1].value,'raw',@p[2].value,@p[3].value).gsub(/ /,'%20')).get
         tdoc = if status >= 200 && status < 300
           res[0].value.read
         else
           (@status = 500) && return
         end
 
-        if (instance, uuid = load_testset(tdoc,cpee,@p[0].value)).first == -1
+        if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
-          handle_data cpee, instance, @p[3]&.value if @p[3]&.name == 'init'
-          handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
+          handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
           handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
+          handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
+
+          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+          handle_starting cpee, instance, @p[0].value
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => @p[0].value
+          }
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
+        end
+      end
+    end  #}}}
+
+    class InstantiateUrl < Riddl::Implementation #{{{
+      include Helpers
+
+      def response
+        cpee    = @h['X_CPEE'] || @a[0]
+        selfurl = @a[1]
+        cblist  = @a[2]
+        name    = @a[3] ? @p.pop.value : nil
+
+        status, res = Riddl::Client.new(@p[1].value.gsub(/ /,'%20')).get
+        tdoc = if status >= 200 && status < 300
+          res[0].value.read
+        else
+          (@status = 500) && return
+        end
 
-          handle_waiting cpee, instance, uuid, @p[1].value, selfurl, cblist
-          handle_starting cpee, instance, @p[1].value
+        if (instance, uuid = load_testset(tdoc,cpee,name)).first == -1
+          @status = 500
+        else
+          handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
+          handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
+          handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
+
+          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+          handle_starting cpee, instance, @p[0].value
 
           send = {
             'CPEE-INSTANCE' => instance,
             'CPEE-INSTANCE-URL' => File.join(cpee,instance),
             'CPEE-INSTANCE-UUID' => uuid,
-            'CPEE-BEHAVIOR' => @p[1].value
+            'CPEE-BEHAVIOR' => @p[0].value
           }
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
@@ -291,7 +329,11 @@ module CPEE
             run InstantiateXML, opts[:cpee], false if post 'xml'
           end
           on resource 'url' do
-            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist] if post 'url'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], false if post 'url'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], true  if post 'url_info'
+          end
+          on resource 'git' do
+            run InstantiateGit, opts[:cpee], opts[:self], opts[:cblist] if post 'git'
           end
           on resource 'instance' do
             run HandleInstance, opts[:cpee] if post 'instance'

data/lib/instantiation.xml

@@ -16,7 +16,7 @@
       <parameter name="init" type="string"/>
     </optional>
   </message>
-  <message name="url">
+  <message name="url_info">
     <parameter name="info" type="string"/>
     <parameter name="behavior" type="string">
       <choice>
@@ -34,6 +34,42 @@
       <parameter name="endpoints" type="string"/>
     </optional>
   </message>
+  <message name="url">
+    <parameter name="behavior" type="string">
+      <choice>
+        <value>fork_ready</value>
+        <value>fork_running</value>
+        <value>wait_ready</value>
+        <value>wait_running</value>
+      </choice>
+    </parameter>
+    <parameter name="url" type="string"/>
+    <optional>
+      <parameter name="init" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="endpoints" type="string"/>
+    </optional>
+  </message>
+  <message name="git">
+    <parameter name="behavior" type="string">
+      <choice>
+        <value>fork_ready</value>
+        <value>fork_running</value>
+        <value>wait_ready</value>
+        <value>wait_running</value>
+      </choice>
+    </parameter>
+    <parameter name="repo" type="string"/>
+    <parameter name="branch" type="string"/>
+    <parameter name="path" type="string"/>
+    <optional>
+      <parameter name="init" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="endpoints" type="string"/>
+    </optional>
+  </message>
   <message name="instance">
     <parameter name="behavior" type="string">
       <choice>
@@ -65,6 +101,10 @@
     </resource>
     <resource relative="url">
       <post in="url" out="result"/>
+      <post in="url_info" out="result"/>
+    </resource>
+    <resource relative="git">
+      <post in="git" out="result"/>
     </resource>
     <resource relative="callback">
       <resource>

data/server/dev.pid

@@ -0,0 +1 @@
+7174

data/tools/cpee

@@ -33,11 +33,11 @@ ARGV.options { |opt|
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200"))
+  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200"))
+  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[start URL]       stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1-200"))
+  opt.on(wrap("[start URL]       stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
 	opt.on("")
   opt.on(wrap("[delete! URL]     DANGER ZONE. Vanishes forever. Not in archive. Examples:\ncpee delete! http://localhost:9298/1/"))
 	opt.on("")
@@ -107,10 +107,23 @@ elsif command == 'inst'
     puts 'Directory already exists.'
   end
 elsif command == 'archive'
+  p2 = File.join(p2,'*') if p2 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p2)
   names = []
   if File.basename(p2) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p2) == '*'
+    res = Typhoeus.get(File.join(base))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
   else
     names << File.basename(p2)
   end
@@ -147,10 +160,23 @@ elsif command == 'archive'
     end
   end
 elsif command == 'abandon'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
   names = []
   if File.basename(p1) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
   else
     names << File.basename(p1)
   end
@@ -160,18 +186,27 @@ elsif command == 'abandon'
       case res.response_body
         when "ready", "stopped" then
           Typhoeus.put(File.join(base,name.to_s,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
-        when "running" then
-          Typhoeus.put(File.join(base,name.to_s,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopped")
-          sleep 1
-          Typhoeus.put(File.join(base,name.to_s,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
       end
     end
   end
 elsif command == 'start'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
   names = []
   if File.basename(p1) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
   else
     names << File.basename(p1)
   end
@@ -180,13 +215,16 @@ elsif command == 'start'
     if res.success?
       case res.response_body
         when "stopped" then
-          Typhoeus.put(File.join(base,name.to_s,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=running")
+          keep_alive = Typhoeus.get(File.join(base,name.to_s,'properties','values','attributes','keep_alive','/'))
+          if keep_alive.success?
+            Typhoeus.put(File.join(base,name.to_s,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=running")
+          end
       end
     end
   end
 elsif command == 'delete!'
   Typhoeus.delete(File.join(p1,'/'))
-else
+elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)
     FileUtils.mkdir("#{p1}/instances") rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -287,6 +287,7 @@ files:
 - log/trace_sic.yaml
 - log/xes_xml.rb
 - log/xes_yaml.rb
+- server/dev.pid
 - server/dev.rb
 - server/handlerwrappers/default.rb
 - server/handlerwrappers/soap.rb
@@ -303,7 +304,6 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
-- server/server.pid
 - server/server.rb
 - test/callback.rb
 - tools/cpee

data/server/server.pid

@@ -1 +0,0 @@
-29054