0
@@ -1,4 +1,5 @@
0
 == 0.5.5 Pony release
0
+ * Add --config option to load options from a config file in thin script [Matt Todd].
0
  * Alter response headers to output directly to a string.
0
  * Improve specs stability.
0
  * Move request body to a Tempfile if too big (> 112 MB)

0
@@ -3,8 +3,9 @@
0
 # Run <tt>thin -h</tt> to get more usage.
0
 require File.dirname(__FILE__) + '/../lib/thin'
0
 require 'optparse'
0
+require 'yaml'
0
 
0
-COMMANDS = %w(start stop restart)
0
+COMMANDS = %w(start stop restart config)
0
 
0
 # Default options values
0
 options = {
0
@@ -44,6 +45,7 @@
0
   opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")             { |user| options[:user] = user }
0
   opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)")           { |group| options[:group] = group }
0
   opts.on(      "--prefix PATH", "Mount the app under PATH (start with /)")       { |path| options[:prefix] = path }
0
+  opts.on("-C", "--config PATH", "Load option from a config file")                { |file| options[:config] = file }
0
   
0
   opts.separator ""
0
   opts.separator "Common options:"
0
0
0
0
@@ -51,18 +53,28 @@
0
   opts.on_tail("-D", "--debug", "Set debbuging on") { $DEBUG = true }
0
   opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
0
   opts.on_tail('-v', '--version', "Show version")   { puts Thin::SERVER; exit }
0
-
0
-  opts.parse! ARGV
0
 end
0
 
0
 
0
-# == Commands definitions
0
+# == Utilities
0
 
0
 def cluster?(options)
0
   options[:servers] && options[:servers] > 1
0
 end
0
 
0
+def load_options_from_config_file!(options)
0
+  file = options.delete(:config)
0
+  YAML.load_file(file).each do |key, value|
0
+    options[key.to_sym] = value
0
+  end
0
+end
0
+
0
+
0
+# == Commands definitions
0
+
0
 def start(options)
0
+  load_options_from_config_file! options
0
+  
0
   if cluster?(options)
0
     Thin::Cluster.new(options).start
0
   else
0
@@ -87,6 +99,8 @@
0
 end
0
 
0
 def stop(options)
0
+  load_options_from_config_file! options
0
+  
0
   if cluster?(options)
0
     Thin::Cluster.new(options).stop
0
   else
0
@@ -95,6 +109,8 @@
0
 end
0
 
0
 def restart(options)
0
+  load_options_from_config_file! options
0
+  
0
   if cluster?(options)
0
     Thin::Cluster.new(options).restart
0
   else
0
0
0
0
@@ -106,11 +122,23 @@
0
   end
0
 end
0
 
0
+def config(options)
0
+  config_file = options.delete(:config)
0
 
0
+  # Stringify keys
0
+  options.keys.each { |o| options[o.to_s] = options.delete(o) }
0
+
0
+  File.open(config_file, 'w') { |f| f << options.to_yaml }
0
+  puts "Wrote configuration to #{config_file}"
0
+end
0
+
0
+
0
 # == Runs the command
0
 
0
-Dir.chdir(options[:chdir])
0
+opts.parse! ARGV
0
 command = ARGV[0]
0
+
0
+Dir.chdir(options[:chdir])
0
 
0
 if COMMANDS.include?(command)
0
   send(command, options)