Changeset 1147

Timestamp:

01/02/08 09:32:48 (11 months ago)

Author:

jimfree..@gmail.com

Message:

Added back -h option for help and fixed merb to print help message when run with no args and outside a merb dir

Files:

• trunk/lib/merb/server.rb (modified) (1 diff)

trunk/lib/merb/server.rb

@@ -176 +176 @@
-            exit
-          end
+        end
+
+        # If we run merb with no arguments and we are not inside a merb root
+        # show the help message
+        if !defined?(__DIR__) && (argv.size == 0) && !File.exists?("#{options[:merb_root] || Merb::Config.defaults[:merb_root]}/config/merb_init.rb") 
+          puts "You are not in the root of a merb application...\n"
+          puts opts 
+          exit 
+        end
+
+        # Special case of looking for help
+        if ARGV == ["-h"]
+          puts opts  
+          exit
-        end
-