cpee in cpee-1.3.214

- old
+ new

@@ -3,11 +3,11 @@
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
 require 'webrick'
 
-def wrap(s, width=78, indent=10)
+def wrap(s, width=78, indent=11)
 	lines = []
 	line, s = s[0..indent-2], s[indent..-1]
 	s.split(/\s+/).each do |word|
 		if line.size + word.size >= width
 			lines << line
@@ -20,28 +20,37 @@
 	return lines.join "\n"
 end
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] [ui] | [new DIR]\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] ui | cpui DIR | new DIR\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	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.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.parse!
 }
-if ARGV.length == 0 || (ARGV.length == 1 && ARGV[0] != 'ui') || (ARGV.length == 2 && ARGV[1] != 'new') || ARGV.length > 2
+if ARGV.length == 0 || (ARGV.length == 1 && ARGV[0] != 'ui') || (ARGV.length == 2 && %w(cpui new).include?(ARGV[1])) || ARGV.length > 2
   puts ARGV.options
   exit
 end
 command = ARGV[0]
 dir     = ARGV[1]
 
 if command == 'ui'
-  s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => "#{curpath}/../cockpit")
+  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)
+  else
+    puts "Directory already exists."
+  end
 else
   if !File.exists?(dir)
     FileUtils.cp_r("#{curpath}/server/",dir)
     FileUtils.mkdir("#{dir}/instances") rescue nil
     FileUtils.mkdir("#{dir}/resources") rescue nil