init.rb in server-blender-0.0.14

- old
+ new
@@ -1,44 +1,57 @@
-options = {
-  :system_gems => 'y'
-}
-OptionParser.new do |opts|
-  opts.banner = "Usage: blender init [OPTIONS] HOST"
-  opts.separator ""
-  opts.separator "Common options:"
+def parse_options
+  options = {
+    :system_gems => 'y'
+  }
+  OptionParser.new do |opts|
+    opts.banner = "Usage: blender init [OPTIONS] HOST"
+    opts.separator ""
+    opts.separator "Common options:"
 
-  opts.on("-u", "--upstream-gems", "don't use the system gems, download and install upstream version instead") do
-    options[:system_gems] = 'n'
-  end
+    opts.on("-u", "--upstream-gems", "don't use the system gems, download and install upstream version instead") do
+      options[:system_gems] = 'n'
+    end
 
-  opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
-    options[:node] = val
-  end
+    opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
+      options[:node] = val
+    end
 
-  opts.on("-t", "--trace", "dump trace to the stdout") do |val|
-    options[:trace] = true
-  end
+    opts.on("-t", "--trace", "dump trace to the stdout") do |val|
+      options[:trace] = true
+    end
 
-  opts.on("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
-    options[:hostname] = val
-  end
+    opts.on("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
+      options[:hostname] = val
+    end
 
-  opts.on("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
+    opts.on("-h", "--help", "Show this message") do
+      raise(opts.to_s)
+    end
 
-end.parse!
+  end.parse!
 
-abort("please provide a hostname") unless host = ARGV.shift
+  raise("please provide a hostname\n#{opts}") unless host = ARGV.shift
 
-extra=""
-extra << " TRACE=1" if options[:trace]
-extra << " HOSTNAME=#{options[:hostname]}" if options[:hostname]
-extra << " NODE=#{options[:node]}" if options[:node]
+  options.merge(:host => host)
+end
 
 def run(*cmd)
-  puts ">> #{cmd * ' '}"
+  STDERR.puts ">> #{cmd * ' '}"
   system(*cmd)
 end
 
-run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{host} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"
+def bootstrap(options)
+  extra=""
+  extra << " TRACE=1" if options[:trace]
+  extra << " HOSTNAME=#{options[:hostname]}" if options[:hostname]
+  extra << " NODE=#{options[:node]}" if options[:node]
+
+  run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{options[:host]} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"
+end
+
+def main
+  options = parse_options
+  bootstrap(options)
+
+rescue => e
+  abort(e.to_s)
+end