lib/trinidad/command_line_parser.rb in trinidad-0.7.2 vs lib/trinidad/command_line_parser.rb in trinidad-0.8.0

@@ -1,9 +1,10 @@
 module Trinidad
   require 'optparse'
-  
+
   class CommandLineParser
+
     def self.parse
       default_options = {
         :port => 3000,
         :environment => 'development',
         :context_path => '/',
@@ -11,46 +12,46 @@
         :classes_dir => 'classes',
         :config => 'config/tomcat.yml',
         :ssl_port => 8443,
         :ajp_port => 8009
       }
-      
+ 
       parser = OptionParser.new do |opts|
         opts.banner = 'Trinidad server default options:'
         opts.separator ''
 
         opts.on('-e', '--env ENVIRONMENT', 'Rails environment', 
             "default: #{default_options[:environment]}") do |v| 
           default_options[:environment] = v
         end
-        
+
         opts.on('-p', '--port PORT', 'Port to bind to', 
             "default: #{default_options[:port]}") do |v| 
           default_options[:port] = v
         end
-        
+
         opts.on('-c', '--context CONTEXT_PATH', 'The application context path', 
             "default: #{default_options[:context_path]}") do |v| 
           default_options[:context_path] = v
         end
-        
+
         opts.on('--lib', '--jars LIBS_DIR', 'Directory containing jars used by the application', 
             "default: #{default_options[:libs_dir]}") do |v| 
           default_options[:libs_dir] = v
         end
-        
+
         opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
             "default: #{default_options[:classes_dir]}") do |v| 
           default_options[:classes_dir] = v
         end        
 
         opts.on('-s', '--ssl [SSL_PORT]', 'Enable secure socket layout',
             "default port: #{default_options[:ssl_port]}") do |v|
           ssl_port = v.nil? ? default_options.delete(:ssl_port) : v.to_i
           default_options[:ssl] = {:port => ssl_port}
         end
-        
+
         opts.on('-a', '--ajp [AJP_PORT]', 'Enable ajp connections',
             "default port: #{default_options[:ajp_port]}") do |v|
           ajp_port = v.nil? ? default_options.delete(:ajp_port) : v.to_i
           default_options[:ajp] = {:port => ajp_port} 
         end
@@ -67,23 +68,23 @@
         end
 
         opts.on('--public', '--public DIRECTORY', 'Public directory', 'default: public') do |v|
           default_options[:public] = v
         end
-        
+
         opts.on('-v', '--version', 'display the current version') do
           puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
           exit
         end
-        
+
         opts.on('-h', '--help', 'display the help') do
           puts opts
           exit
         end
-          
+
         opts.parse!(ARGV)
       end
-      
-        default_options
+
+      default_options
     end
   end
 end