lib/trinidad/command_line_parser.rb in trinidad-0.8.3 vs lib/trinidad/command_line_parser.rb in trinidad-0.9.0

@@ -1,24 +1,46 @@
 module Trinidad
   require 'optparse'
   require 'yaml'
-  
+
   class CommandLineParser
+    attr_reader :default_options
 
-    def self.parse
-      default_options = {
+    def self.parse(argv)
+      CommandLineParser.new.parse!(argv)
+    end
+
+    def initialize
+      @default_options = {
         :port => 3000,
         :environment => 'development',
         :context_path => '/',
         :libs_dir => 'lib',
         :classes_dir => 'classes',
-        :config => 'config/tomcat.yml',
         :ssl_port => 8443,
         :ajp_port => 8009
       }
- 
-      parser = OptionParser.new do |opts|
+    end
+
+    def parse!(argv)
+      begin
+        options_parser.parse!(argv)
+      rescue OptionParser::InvalidOption => e
+        p e, options_parser
+        exit(1)
+      end
+
+      if default_options.has_key?(:config)
+        config_options = YAML.load_file(default_options[:config])
+        default_options.deep_merge!(config_options.symbolize!)
+      end
+
+      default_options
+    end
+
+    def options_parser
+      @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| 
@@ -41,11 +63,11 @@
         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        
+        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}
@@ -56,18 +78,25 @@
           ajp_port = v.nil? ? default_options.delete(:ajp_port) : v.to_i
           default_options[:ajp] = {:port => ajp_port} 
         end
 
         opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
-            "default: #{default_options[:config]}") do |v|
-          default_options[:config] = v if v
-          default_options.deep_merge! YAML.load_file(default_options[:config])
+            "default: #{default_options[:config]}") do |file|
+          default_options[:config] = 'config/trinidad.yml'
+
+          if file
+            default_options[:config] = file
+          elsif File.exist?('config/tomcat.yml') && !File.exist?(default_options[:config])
+            puts "[WARNING] Default configuration file name has been moved to trinidad.yml, tomcat.yml will not be supported in future versions."
+            puts "\tYou still can use tomcat.yml passing it as the file name to this option: -f config/tomcat.yml"
+            default_options[:config] = 'config/tomcat.yml'
+          end
         end
 
         opts.on('-r', '--rackup [RACKUP_FILE]', 'Rackup configuration file',
             'default: config.ru') do |v|
-          default_options[:rackup] = v || 'config.ru'  
+          default_options[:rackup] = v || 'config.ru'
         end
 
         opts.on('--public', '--public DIRECTORY', 'Public directory', 'default: public') do |v|
           default_options[:public] = v
         end
@@ -88,13 +117,9 @@
 
         opts.on('-h', '--help', 'display the help') do
           puts opts
           exit
         end
-
-        opts.parse!(ARGV)
       end
-
-      default_options
     end
   end
 end