cpee 1.3.211 → 1.3.212

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9dfbc4a7336bc2c8c2362dcbf908e405513651b
-  data.tar.gz: 1a598ec52063b0be720385d56ad43a6a34a5675b
+  metadata.gz: d73a9bb53d9229c30830b55083ce1a8f94ccdb67
+  data.tar.gz: dd414c3f30f5905fac89916c1ae9dae138602482
 SHA512:
-  metadata.gz: 51fa98d57404c06840e661579968c1972320fa78c164e972a2d3d29c85a8fc2aeff9ecc82b397b4a093e1d6acc76e025cdf5f97989f97492255e5eb4daa1804c
-  data.tar.gz: c44f85f3d3596ffc9fb9c8b70d3ee1570a37c0a8121e156d3b67c00485a8a2b265a0e316604f7dca675850594c413eb05db20c18fe488e847aa2f77c65116dda
+  metadata.gz: 44d934d06075d382982f24a1c880032caffc918de1ee86191db25ddc4b4bb6b4cc43a45e9dabfcf7fdd04956eee13ff002fa1946a0d1af21903a35323c50646a
+  data.tar.gz: 54d9791c816f0db90fad04d321ed8c884ad93611531d85ca0f12c3b48aa0194d6a30c38aa27136d2608f655f96fa3ef299a101ee0507b5acffadb5d60ec19037

data/cockpit/js/instance.js

@@ -56,11 +56,10 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'change';// }}}
 
 $(document).ready(function() {// {{{
-  console.log(location.protocol);
   if (location.protocol.match(/^file/)) {
     $("input[name=base-url]").val("http://localhost:" + $('body').data('defaultport'));
   } else {
-    $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
+    $("input[name=base-url]").val(location.protocol + "//" + location.hostname + ":" + $('body').data('defaultport'));
   }
   $("button[name=base]").click(function(){ create_instance(null,false); });
   $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false,false); });

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.211"
+  s.version          = "1.3.212"
   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/tools/cpee

@@ -3,17 +3,34 @@ curpath = __dir__
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
+require 'webrick'
+
+def wrap(s, width=78, indent=10)
+	lines = []
+	line, s = s[0..indent-2], s[indent..-1]
+	s.split(/\s+/).each do |word|
+		if line.size + word.size >= width
+			lines << line
+			line = (" " * (indent)) + word
+		else
+		 line << " " << word
+	 end
+	 end
+	 lines << line if line
+	return lines.join "\n"
+end
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] [new|ui DIRECTORY]\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] [ui] | [new DIR]\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
-  opt.on("[new DIRECTORY] scaffolds a sample execution engine. Everything except instances can be removed for default behaviour.")
-  opt.on("[ui  DIRECTORY] symlinks/updates the UI.")
+	opt.on("")
+  opt.on(wrap("[new DIR] scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
+  opt.on(wrap("[ui]      starts a simple static web server with the ui on http://localhost:8080. Copy #{File.realpath(curpath + '/../cockpit')} if you want stuff in apache or nginx."))
   opt.parse!
 }
-if ARGV.length != 2 || !%w(ui new).include?(ARGV[0])
+if ARGV.length == 0 || (ARGV.length == 1 && ARGV[0] != 'ui') || (ARGV.length == 2 && ARGV[1] != 'new') || ARGV.length > 2
   puts ARGV.options
   exit
 end
@@ -21,11 +38,9 @@ command = ARGV[0]
 dir     = ARGV[1]
 
 if command == 'ui'
-  if !File.exists?(dir) || File.symlink?(dir)
-    FileUtils.ln_sf("#{curpath}/../cockpit",dir)
-  else
-    puts "File or directory with this name already exists."
-  end
+  s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => "#{curpath}/../cockpit")
+  trap("INT"){ s.shutdown }
+  s.start
 else
   if !File.exists?(dir)
     FileUtils.cp_r("#{curpath}/server/",dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.211
+  version: 1.3.212
 platform: ruby
 authors:
 - Juergen eTM Mangler