cpee 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9723d9a647c3d39f739c125cbc6112254172a59b61c24d498c1ec4d53f9a6998
-  data.tar.gz: 8945918c7a22d82a7936f1f76a322734f233e7ab701fa670f9a182ccbcd5c80b
+  metadata.gz: bdfedecb98660aba343a39fb374f7d54cd535c44e2093fb6c78d2ee7a5767cb6
+  data.tar.gz: 3efbefd7f8230e85bbf7cc2dd79b1a62a78c9ac755eab581b5b8f23b7c99bb55
 SHA512:
-  metadata.gz: 7d7cb7f744225804de94c56b348c22e61cc2501aba291bddadcef2c1ae725f5280eeb9700065467d3b9289ec2fd15c3200708d557e3b94ffd03b190abd72c492
-  data.tar.gz: 731e6e16864401821398d2274c230512abca96af46f74ff0c665bc90a4a9db00141972f52084ce4b84c076532507ca4f9e0bee8635a2913bf4533d4f5a2b56fb
+  metadata.gz: d23d6b7600162555d0ce52666c31df60534710867143a218d241cfc0cd4d764b82a1f3e10e13000936001bab2ee45cd06135a5bb93c551e88343e53e3fe2471d
+  data.tar.gz: 1c01c6bd32cb8697b659bcaf4fc72834d029467c37929906c0a23894e31144533d70de01cc8ab56c7226e89e2a20c6bea0c261400d735ab4450e9b2d9cfa9b8a

data/cpee.gemspec

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

@@ -33,18 +33,25 @@ module CPEE
       end
     else # we always assume file socket if redis is startet locally
       opts[:redis_dyn] = Proc.new { Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i) }
+      tried = false
       begin
         opts[:redis] = opts[:redis_dyn].call
         opts[:redis].dbsize
       rescue
-        rcmd = opts[:redis_cmd]
-        rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])
-        rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
-        rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
-        rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
-        res = system rcmd
+        res = if tried
+          rcmd = opts[:redis_cmd]
+          rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])
+          rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
+          rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
+          rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
+          system rcmd
+        else
+          true
+        end
         if res
+          tried = true
           puts 'starting redis ... it will keep running, just to let you know ...'
+          puts 'waiting for successful start ...'
           sleep 1
           retry
         else

data/tools/cpee

@@ -162,6 +162,7 @@ elsif command == 'archive'
     names << File.basename(p2)
   end
   names.each do |name|
+    print "Working on: " + name.to_s + "\r"
     res = Typhoeus.get(File.join(base,name.to_s,'/'))
     if res.success?
       if res.headers['Content-Type'] =~ /^(text|application)\/xml/
@@ -193,6 +194,7 @@ elsif command == 'archive'
       end
     end
   end
+  puts
 elsif command == 'abandon'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
@@ -215,6 +217,7 @@ elsif command == 'abandon'
     names << File.basename(p1)
   end
   names.each do |name|
+    print "Working on: " + name.to_s + "\r"
     res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
     if res1.success?
       if res1.response_body == 'ready' || res1.response_body == 'stopped'
@@ -222,6 +225,7 @@ elsif command == 'abandon'
       end
     end
   end
+  puts
 elsif command == 'start'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
@@ -256,7 +260,31 @@ elsif command == 'start'
     end
   end
 elsif command == 'delete!'
-  Typhoeus.delete(File.join(p1,'/'))
+  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
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    Typhoeus.delete(File.join(base,name.to_s,'/'))
+  end
+  puts
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)

data/tools/cpee.sic

@@ -0,0 +1,306 @@
+#!/usr/bin/ruby
+curpath = __dir__
+require 'rubygems'
+require 'optparse'
+require 'fileutils'
+require 'webrick'
+require 'typhoeus'
+require 'xml/smart'
+require 'zip'
+require 'pp'
+
+def wrap(s, width=78, indent=18)
+	lines = []
+	line, s = s[0..indent-2], s[indent..-1]
+  s.split(/\n/).each do |ss|
+    ss.split(/[ \t]+/).each do |word|
+      if line.size + word.size >= width
+        lines << line
+        line = (" " * (indent)) + word
+      else
+        line << " " << word
+      end
+    end
+    lines << line if line
+    line = (" " * (indent-1))
+  end
+	return lines.join "\n"
+end
+
+ARGV.options { |opt|
+  opt.summary_indent = ' ' * 2
+  opt.summary_width = 15
+  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("")
+  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\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\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("")
+  opt.on(wrap("[new DIR]         scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
+	opt.on("")
+  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  && !(%w(ui convert).include?(ARGV[0]))) ||
+   (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
+   (ARGV.length == 3  && ARGV[0] != 'archive') ||
+   (ARGV.length >  3)
+  puts ARGV.options
+  exit
+end
+command = ARGV[0]
+p1      = ARGV[1]
+p2      = ARGV[2]
+cockpit = "#{curpath}/../cockpit/"
+
+def js_libs(cockpit)
+  res = Typhoeus.get('https://cpee.org/js_libs/js_libs.zip')
+  if res.success?
+    File.write(File.join(cockpit,'js_libs.zip'),res.response_body)
+    Zip::File.open(File.join(cockpit,'js_libs.zip')) do |zip_file|
+      zip_file.each do |entry|
+        case entry.ftype
+          when :directory
+            Dir.mkdir(File.join(cockpit,entry.name)) rescue nil
+          when :file
+            File.write(File.join(cockpit,entry.name),entry.get_input_stream.read)
+          when :symlink
+            FileUtils.ln_s(File.join('.',entry.get_input_stream.read),File.join(cockpit,entry.name), force: true)
+        end
+      end
+    end
+    true
+  else
+    puts 'Internet access required to download javascript libs from "http://cpee.org/js_libs/js_libs.zip".'
+    false
+  end
+end
+
+if command == 'ui'
+  if js_libs(cockpit)
+    s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => cockpit)
+    trap("INT"){ s.shutdown }
+    s.start
+  end
+elsif command == 'cpui'
+    if !File.exists?(p1)
+      FileUtils.cp_r(cockpit,p1)
+    else
+      FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')),p1,remove_destination: true)
+      puts "Directory already exists, updating ..."
+    end
+    js_libs(p1)
+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:handlerwrapper').each do |e|
+          if e.text == 'DefaultHandlerWrapper'
+            doc.root.prepend('x:executionhandler','ruby')
+          end
+        end rescue nil
+        doc.find('//x:handlerwrapper').delete_all!
+        doc.find('//x:start_url').each do |e|
+          e.text = 'https://cpee.org/flow/start/url/'
+        end rescue nil
+        doc.find('//x:start_git').each do |e|
+          e.text = 'https://cpee.org/flow/start/git/'
+        end rescue nil
+        doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
+          if e.parent.qname.name != 'code'
+            n = e.parent
+            if (x = n.find('d:code')).any?
+              x.first.add(e)
+            else
+              n.add('d:code').add(e)
+            end
+          end
+        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)
+  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
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res = Typhoeus.get(File.join(base,name.to_s,'/'))
+    if res.success?
+      if res.headers['Content-Type'] =~ /^(text|application)\/xml/
+        XML::Smart.string(res.response_body) do |doc|
+          if doc.root.qname.to_s == "instances"
+            doc.root.children.each do |i|
+              if ["finished","abandoned"].include?(i.attributes['state']) || (["ready"].include?(i.attributes['state']) && Time.parse(i.attributes['changed']).to_i < Time.now-(60*60*24))
+                prop = Typhoeus.get(File.join(base,name.to_s,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(base,name.to_s,i.attributes['id'],'/'))
+                end
+              end
+            end
+          elsif doc.root.qname.to_s == "info"
+            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://cpee.org/ns/properties/2.0'
+              if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)")) || (["ready"].include?(xprop.find("string(/p:properties/p:state)")) && Time.parse(xprop.find("string(/p:properties/p:state/@changed)")) < Time.now-(60*60*12))
+                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/
+                Typhoeus.delete(File.join(base,name.to_s,'/'))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+  puts
+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
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res1.success?
+      if res1.response_body == 'ready' || res1.response_body == 'stopped'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+      end
+    end
+  end
+  puts
+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
+  names.each do |name|
+    res = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res.success?
+      case res.response_body
+        when "stopped" then
+          keep_alive = Typhoeus.get(File.join(base,name.to_s,'properties','attributes','keep_alive','/'))
+          if keep_alive.success?
+            Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=running")
+          end
+      end
+    end
+  end
+elsif command == 'delete!'
+  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
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    Typhoeus.delete(File.join(base,name.to_s,'/'))
+  end
+  puts
+elsif command == 'new'
+  if !File.exists?(p1)
+    FileUtils.cp_r("#{curpath}/server/",p1)
+    FileUtils.mkdir("#{p1}/archive") rescue nil
+    FileUtils.mkdir("#{p1}/instances") rescue nil
+    FileUtils.mkdir("#{p1}/resources") rescue nil
+    FileUtils.mkdir("#{p1}/executionhandler") rescue nil
+    Dir["#{curpath}/../systemd/*.service"].each do |f|
+      nam =  File.basename f
+      cont = File.read(f)
+      cont.gsub!(/{CPEEUSER}/,`whoami`.strip)
+      cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
+      cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
+      File.write("#{p1}/#{nam}",cont)
+    end
+  else
+    puts 'Directory already exists.'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -641,6 +641,7 @@ files:
 - server/server.conf
 - server/server.rb
 - tools/cpee
+- tools/cpee.sic
 - tools/server/cpee
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init