cpee 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e789aa5259bacd7b1a1cd8e9c819e078c4acc084983e727347b051c8f861956d
-  data.tar.gz: eb7cbc79394315d929140f424e0f3d02ee11766cb4275433437d0fe8f49dfd8d
+  metadata.gz: b71f98dc26ff6f1cfed69fc184651d7fd01175bee56c77df2f92df10a8db1a3e
+  data.tar.gz: 6b023b74f885fc91e81b1ad27040998eea19e7098cb899f3555e5c1c3e11cf38
 SHA512:
-  metadata.gz: e06026cedecdf072de2db0a66f2083f72e83a638d672543509f7f02af50c1aac06a1c20baef44afc20a9112b245f756b73da0d84ed38293981f07396dd076aa2
-  data.tar.gz: ca785378c81867e507086938e449ef78c3d00d737eedc078541c8cd67e64d20573d51145a2e841bd2e70858c5d628e17ae6ccc4f607cc27aa4468b2ff122ab43
+  metadata.gz: fd458b2163ef367cde6ac05fa4e178b93f0ad06d5a01cbfc44bf32d921e7675e667a13fd7956e19eac89b064b47908beb815f23d127201d3bf6ac5e7a081c7cd
+  data.tar.gz: f003121ae2244ba0e0608d56cc628f99a05a57e101fb806d1adce44225cc762fc7bb7354c51e3f2bee3bcabb46cfe6200fb7f6a0a3599b16c0a75ffd1f83c7d4

data/cockpit/js/instance.js

@@ -784,7 +784,7 @@ function save_testsetfile() {// {{{
   var def = new $.Deferred();
   def.done(function(name,testset) {
     var ct = new Date();
-    $('#savetestsetfile').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
+    $('#savetestsetfile').attr('download',name + '.xml');
     $('#savetestsetfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
     document.getElementById('savetestsetfile').click();
   });
@@ -811,6 +811,11 @@ function get_testset(deferred) {// {{{
       $('testset > dslx',testset).remove();
       testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
       var name =  $('testset > attributes > info',testset).text();
+      $('[xmlns]',testset).each((idx,ele) => {
+        if (ele.parentNode.namespaceURI == ele.getAttribute('xmlns')) {
+          ele.removeAttribute('xmlns');
+        }
+      });
       deferred.resolve(name,testset);
     },
     error: function() { deferred.reject(); report_failure(); }

data/cockpit/model.html

@@ -33,6 +33,7 @@
     <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
     <script type="text/javascript" src="/js_libs/ui.js"></script>

data/cpee.gemspec

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

data/lib/cpee/implementation.rb

@@ -259,12 +259,13 @@ module CPEE
       opts = @a[0]
       redis = opts[:redis]
       id = @r[0].to_i
-      unless redis.exists("instance:#{id}/state")
+      unless redis.exists?("instance:#{id}/state")
         @status = 404
         return
       end
+      empt = redis.keys("instance:#{id}/*").to_a
       redis.multi do |multi|
-        multi.del redis.keys("instance:#{id}/*").to_a
+        multi.del empt
         multi.zrem 'instances', id
       end
     end

data/lib/cpee/implementation_properties.rb

@@ -220,8 +220,11 @@ module CPEE
             Process.detach pid
           when 'stopping'
             pid = File.read(exe + '.pid') rescue nil
-            if pid
+            if pid && (Process.kill(0, pid) rescue false)
               Process.kill('HUP', pid.to_i) rescue nil
+            else
+              File.unlink(exe + '.pid') rescue nil
+              PutState::set id, opts, 'stopped'
             end
           else
             ### Most probably this is never needed. Lets see.

data/tools/cpee

@@ -30,7 +30,7 @@ end
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
   opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
@@ -47,10 +47,13 @@ ARGV.options { |opt|
   opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
   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.on("")
+  opt.on(wrap("[convert]         converts all testsets in the current directory to cpee2."))
   opt.parse!
 }
 if (ARGV.length == 0) ||
    (ARGV.length == 1  && ARGV[0] != 'ui') ||
+   (ARGV.length == 1  && ARGV[0] != 'convert') ||
    (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
    (ARGV.length == 3  && ARGV[0] != 'archive') ||
    (ARGV.length >  3)
@@ -99,6 +102,29 @@ elsif command == 'cpui'
       puts "Directory already exists."
     end
   end
+elsif command == 'convert'
+  Dir['*.xml'].each do |f|
+    XML::Smart.modify(f) do |doc|
+      doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+      doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+      doc.register_namespace 'x', 'http://cpee.org/ns/properties/2.0'
+      if doc.root.qname.name == 'testset'
+        doc.root.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
+        doc.root.namespace = nil
+
+        doc.find('//x:start_url').each do |e|
+          e.text = 'https://centurio.work/flow-test/start/url/'
+        end rescue nil
+        doc.find('//x:start_git').each do |e|
+          e.text = 'https://centurio.work/flow-test/start/git/'
+        end rescue nil
+
+        doc.find('//p:*').each do |e|
+          e.namespaces.delete_all!
+        end rescue nil
+      end
+    end
+  end
 elsif command == 'archive'
   p2 = File.join(p2,'*') if p2 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p2)
@@ -139,11 +165,12 @@ elsif command == 'archive'
             prop = Typhoeus.get(File.join(base,name.to_s,'properties','/'))
             if prop.success?
               xprop = XML::Smart::string(prop.response_body)
-              xprop.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+              xprop.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
               if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)"))
                 uuid = xprop.find("string(/p:properties/p:attributes/p:uuid)")
                 id = name.to_s
                 File.write(File.join(p1,uuid + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
+                p File.join(base,name.to_s,'/')
                 Typhoeus.delete(File.join(base,name.to_s,'/'))
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl