cpee 1.4.17 → 1.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9baa24fb02ca220f4344cd750fd772d1fc24de52452da1160b02f4a35c91a4d5
-  data.tar.gz: 461b4ba6643115fd138c12279e1e390db6cd90467e03af22b0764c85c777b064
+  metadata.gz: 30952bfb498150aa39be236415fe6110733f848542c8b1cc875b4f112e3dfc3a
+  data.tar.gz: fe3f5fb06beaf18d6db8f168b107ca0b621e06f9da36c99a1e564ed2af82d184
 SHA512:
-  metadata.gz: 5f27e270cae8b682f4dade5025886518a901a3490989fb07b677d36c6922c83d8be91f2520cd252f22ef46b4bd471cb9456bd417c571630ac9df0d157fd31f9d
-  data.tar.gz: eda464b04ff47fcf180c0c3da1150ab51887d8627a1e31f28fe1479bddf034fe088ff89c79def55d195fd080d88dd9fe2c62ae6720181e267a24b2ad49a24db8
+  metadata.gz: d25f4a4c0e44459518b0df15d2a5c0b0c8d3e7ec80c6556b8453ee85c9db780acc697629089b02e609b67b2b87f4474fab0dd8e4291cb888b9978d84f33028a3
+  data.tar.gz: d8404a79cbe9e6429f5ac44f43423f2826f497b8476bd2aa2775fa371d3ef0b7d27d497a3cd550952cff428a8692b676677b07d61d75d624f2ab1e930fc6b5cc

data/cockpit/js/details.js

@@ -69,6 +69,7 @@ function do_main_save() { //{{{
         manifestation.update_details(svgid);
       }
       adaptor_update();
+      format_instance_pos();
     });
 
     $.ajax({

data/cockpit/js/instance.js

@@ -17,6 +17,7 @@ var save = {};
     save['attributes'] = undefined;
     save['details'] = undefined;
     save['details_target'] = undefined;
+    save['instance_pos'] = [];
 var node_state = {};
 var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'calling,status,manipulating,failed,done' + '&' +
@@ -392,6 +393,7 @@ function adaptor_init(url,theme,dslx) { //{{{
         });
         adaptor_update();
         manifestation.events.click(svgid);
+        format_instance_pos();
       };
       adaptor_update();
       monitor_instance_pos();
@@ -403,7 +405,7 @@ function adaptor_init(url,theme,dslx) { //{{{
       graphrealization.set_description($(dslx));
       adaptor_update();
       manifestation.events.click(svgid);
-      monitor_instance_pos();
+      format_instance_pos();
     });
   }
 } //}}}
@@ -484,12 +486,9 @@ function monitor_instance_pos() {// {{{
     type: "GET",
     url: url + "/properties/values/positions/",
     success: function(res){
-      var values = $("value > *",res);
+      save['instance_pos'] = $("value > *",res);
       format_visual_clear();
-      values.each(function(){
-        var what = this.nodeName;
-        format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive');
-      });
+      format_instance_pos();
     }
   });
 }// }}}
@@ -554,6 +553,9 @@ function monitor_instance_pos_change(notification) {// {{{
       format_visual_add(b.position,"passive")
     });
   }
+  if (!parts['at'] && !parts['unmark'] && !parts['after'] && !parts['wait']) {
+    monitor_instance_pos();
+  }
 } // }}}
 
 function monitor_instance_vote_add(notification) {// {{{
@@ -1078,7 +1080,14 @@ function format_visual_vote_clear() {//{{{
   node_state = {};
   $('.super .vote').each(function(a,b){b.setAttribute("class","vote");});
   $("#votes").empty();
-}//}}}
+ }//}}}
+
+function format_instance_pos() { //{{{
+  $(save['instance_pos']).each(function(){
+    var what = this.nodeName;
+    format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive');
+  });
+} //}}}
 
 function format_visual_forms() { //{{{
   if (save['state'] != "ready" && save['state'] != "stopped") {

data/cockpit/themes/compact/theme.js

@@ -161,7 +161,7 @@ function WFAdaptorManifestation(adaptor) {
           'params': ['> finalize, > update', xml_node]
         });
       }
-      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate") {
+      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
         var icon =  self.elements.call.illustrator.svg.clone();
         icon.children('g.replace').addClass('active');
         var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cockpit/themes/default/theme.js

@@ -161,7 +161,7 @@ function WFAdaptorManifestation(adaptor) {
           'params': ['> finalize, > update', xml_node]
         });
       }
-      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate") {
+      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
         var icon =  self.elements.call.illustrator.svg.clone();
         icon.children('g.replace').addClass('active');
         var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cockpit/themes/extended/theme.js

@@ -161,7 +161,7 @@ function WFAdaptorManifestation(adaptor) {
           'params': ['> finalize, > update', xml_node]
         });
       }
-      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate") {
+      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
         var icon =  self.elements.call.illustrator.svg.clone();
         icon.children('g.replace').addClass('active');
         var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.17"
+  s.version          = "1.4.18"
   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/controller.rb

@@ -107,7 +107,7 @@ module CPEE
         @directory + '/notifications/',
         opts[:notifications_init]
       )
-      unless ['stopped','ready','finished'].include?(@properties.data.find("string(/p:properties/p:state)"))
+      unless ['stopped','ready','finished','abandoned'].include?(@properties.data.find("string(/p:properties/p:state)"))
         @properties.modify do |doc|
           doc.find("/p:properties/p:state").first.text = 'stopped'
         end
@@ -233,7 +233,7 @@ module CPEE
       @properties.data.find("string(/p:properties/p:state)")
     end
     def state_changed
-      @properties.data.find("string(/p:properties/p:state/@changed)")
+      (str = @properties.data.find("string(/p:properties/p:state/@changed)")).empty? ? Time.at(0).xmlschema : str
     end
     def state_change!(state=nil)
       @properties.modify do |doc|
@@ -270,10 +270,10 @@ module CPEE
       end
     end #}}}
     def serialize_state! # {{{
-      @properties.activate_schema(:finished) if @instance.state == :finished
-      @properties.activate_schema(:inactive) if @instance.state == :stopped || @instance.state == :ready
-      @properties.activate_schema(:active)   if @instance.state == :running || @instance.state == :simulating
-      if [:finished, :stopped, :ready].include?(@instance.state)
+      @properties.activate_schema(:finished) if @instance.state == :finished || @instance.state == :abandoned
+      @properties.activate_schema(:inactive) if @instance.state == :stopped  || @instance.state == :ready
+      @properties.activate_schema(:active)   if @instance.state == :running  || @instance.state == :simulating
+      if [:finished, :stopped, :ready, :abandoned].include?(@instance.state)
         state_change! @instance.state
       end
     end # }}}

data/tools/cpee

@@ -6,6 +6,7 @@ require 'fileutils'
 require 'webrick'
 require 'typhoeus'
 require 'xml/smart'
+require 'pp'
 
 def wrap(s, width=78, indent=18)
 	lines = []
@@ -27,11 +28,15 @@ end
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] ui | cpui DIR | new DIR\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] ui | cpui DIR | new DIR | archive DIR URL | abandon URL\n"
   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.\ne.g. cpee ./archive http://localhost:9298/"))
+  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR.\ne.g. cpee archive ./archive http://localhost:9298/"))
+	opt.on("")
+  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned.\ne.g. cpee abandon http://localhost:9298/1/"))
+	opt.on("")
+  opt.on(wrap("[delete! URL]      DANGER ZONE.\ne.g. cpee delete! http://localhost:9298/1/"))
 	opt.on("")
   opt.on(wrap("[new DIR]         scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
 	opt.on("")
@@ -42,51 +47,69 @@ ARGV.options { |opt|
   opt.on(wrap("[ui]              starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
   opt.parse!
 }
-if ARGV.length == 0 || (ARGV.length == 1 && ARGV[0] != 'ui') || (ARGV.length == 2 && %w(cpui new).include?(ARGV[1])) || (ARGV.length == 3 && ARGV[0] != 'archive') || ARGV.length > 3
+if (ARGV.length == 0) ||
+   (ARGV.length == 1  && ARGV[0] != 'ui') ||
+   (ARGV.length == 2  && %w(abandon delete! cpui new).include?(ARGV[1])) ||
+   (ARGV.length == 3  && ARGV[0] != 'archive') ||
+   (ARGV.length >  3)
   puts ARGV.options
   exit
 end
 command = ARGV[0]
-dir     = ARGV[1]
-url     = ARGV[2]
+p1      = ARGV[1]
+p2      = ARGV[2]
 
 if command == 'ui'
   s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => "#{curpath}/../cockpit/")
   trap("INT"){ s.shutdown }
   s.start
 elsif command == 'cpui'
-  if !File.exists?(dir)
-    FileUtils.cp_r("#{curpath}/../cockpit/",dir)
+  if !File.exists?(p1)
+    FileUtils.cp_r("#{curpath}/../cockpit/",p1)
   else
     puts "Directory already exists."
   end
 elsif command == 'inst'
-  if !File.exists?(dir)
-    FileUtils.cp_r("#{curpath}/instantiation/",dir)
+  if !File.exists?(p1)
+    FileUtils.cp_r("#{curpath}/instantiation/",p1)
   else
     puts 'Directory already exists.'
   end
 elsif command == 'archive'
-  res = Typhoeus.get(url)
+  res = Typhoeus.get(File.join(p2,'/'))
   if res.success?
-    if res.headers['content-type'] == 'text/xml'
-      XML::Smart.string(res.body) do |doc|
-        puts doc.to_s
-        tcount = 0
-        fcount = 0
+    if res.headers['Content-Type'] =~ /^(text|application)\/xml/
+      XML::Smart.string(res.response_body) do |doc|
         doc.root.children.each do |i|
-          p i.attributes['id']
-          p i.attributes['state']
+          if ["finished","abandoned"].include?(i.attributes['state'])
+            prop = Typhoeus.get(File.join(p2,i.attributes['id'],'properties','/'))
+            if prop.success?
+              File.write(File.join(p1,i.attributes['uuid'] + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
+              Typhoeus.delete(File.join(p2,i.attributes['id'],'/'))
+            end
+          end
         end
       end
     end
   end
+elsif command == 'abandon'
+  res = Typhoeus.get(File.join(p1,'properties','values','state','/'))
+  if res.success?
+    case res.response_body
+      when "ready", "stopped" then
+        Typhoeus.put(File.join(p1,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+      when "running" then
+        Typhoeus.put(File.join(p1,'properties','values','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopped")
+    end
+  end
+elsif command == 'delete!'
+  Typhoeus.delete(File.join(p1,'/'))
 else
-  if !File.exists?(dir)
-    FileUtils.cp_r("#{curpath}/server/",dir)
-    FileUtils.mkdir("#{dir}/instances") rescue nil
-    FileUtils.mkdir("#{dir}/resources") rescue nil
-    FileUtils.mkdir("#{dir}/handlerwrappers") rescue nil
+  if !File.exists?(p1)
+    FileUtils.cp_r("#{curpath}/server/",p1)
+    FileUtils.mkdir("#{p1}/instances") rescue nil
+    FileUtils.mkdir("#{p1}/resources") rescue nil
+    FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil
   else
     puts 'Directory already exists.'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.4.18
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl