Changeset 1094

Timestamp:

12/13/07 22:36:30 (1 year ago)

Author:

e.@brainspl.at

Message:

spit out error and help message if you call merb with no args and you are not in the root of a merb app. closes #352

Files:

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

trunk/lib/merb/server.rb

@@ -180 +180 @@
-        end
-        
+        # If we run merb with no arguments and we are not inside a merb root
+        # show the help message
+        if (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
-        # Load up the configuration from file, but keep the command line
-        # options that may have been chosen. Also, pass-through if we have