bin/castronaut in relevance-castronaut-0.5.2 vs bin/castronaut in relevance-castronaut-0.5.3

@@ -8,30 +8,40 @@
 require 'sinatra'
 require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: castronaut -C /path/to/config/file"
+  opts.banner =  "Usage: castronaut [Options] {/path/to/config/file}\n"
+  opts.banner += "\t -C: \t\tStart castronaut using the specified config file.\n"
+  opts.banner += "\t --config: \tStart castronaut using the specified config file.\n"  
+  opts.banner += "\t -F: \t\tWrite the castronaut default sample config file to the specified location.\n"
+  opts.banner += "\t --fresh: \tWrite the castronaut default sample config file to the specified location.\n"
+  opts.banner += "\t -S: \t\tCreate a sample development database with users for testing.\n"
+  opts.banner += "\t --sampledb: \tCreate a sample development database with users for testing.\n"  
 
   opts.on("-h", "--help") do
     puts opts.banner
     exit(1)
   end
 
   opts.on("-C", "--config", "Config File") do |c|
-    options[:config_file] = ARGV[0]
+    Castronaut.config = Castronaut::Configuration.load(ARGV[0])
   end
   
   opts.on("-F", "--fresh", "Directory") do |f|
-    FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'config', 'castronaut.example.yml'), "#{ARGV[0]}/castronaut.yml")
+    FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'config', 'castronaut.sample.yml'), "#{ARGV[0]}/castronaut.yml")
     puts "Writing config file to #{ARGV[0]}/castronaut.yml"
     exit(1)
   end
+  
+  opts.on("-S", "--sampledb") do
+    puts "Creating development database"
+    Castronaut::Support::Sample.create_sample_database
+    exit(1)
+  end
 end.parse!
 
-if options[:config_file]
-  Castronaut.config = Castronaut::Configuration.load(options[:config_file])
-else
+unless Castronaut.config
   $stderr.puts "No configuration file specified.  Deafaulting to ./config/castronaut.yml"
   default_config = File.expand_path("./config/castronaut.yml")
 
   if File.exist?(default_config)
     Castronaut.config = Castronaut::Configuration.load(default_config)