Changeset 228

Timestamp:

09/26/2007 17:39:26 (11 months ago)

Author:

zimbatm

Message:

Command-line fixes. Ticket #93 solved.

Location:

trunk

Files:

• bin/camping (modified) (5 diffs)
• lib/camping/reloader.rb (modified) (3 diffs)
• lib/camping/server.rb (modified) (1 diff)

trunk/bin/camping

@@ -15 +15 @@
 # Setup paths
 if home = ENV['HOME'] # POSIX
-  conf.db = File.join(home, '.camping.db')
-  conf.rc = File.join(home, '.campingrc')
+  db_path = File.join(home, '.camping.db')
+  rc_path = File.join(home, '.campingrc')
 elsif home = ENV['APPDATA'] # MSWIN
-  conf.db = File.join(home, 'Camping.db')
-  conf.rc = File.join(home, 'Campingrc')
-end
-
-# Load configuration if any
-if conf.rc and File.exists?( conf.rc )
-  YAML.load_file(conf.rc).each do |k,v|
-    conf.send("#{k}=", v)
-  end 
+  db_path = File.join(home, 'Camping.db')
+  rc_path = File.join(home, 'Campingrc')
 end
 
@@ -38 +31 @@
     opts.on("-h", "--host HOSTNAME", "Host for web server to bind to (default is all IPs)") { |conf.host| }
     opts.on("-p", "--port NUM", "Port for web server (defaults to #{conf.port})") { |conf.port| }
-    opts.on("-d", "--database FILE", "Database file (defaults to #{conf.db})") { |conf.db| }
+    opts.on("-d", "--database FILE", "SQLite3 database path (defaults to #{db_path ? db_path : '<none>'})") { |db_path| conf.database = {:adapter => 'sqlite3', :database => db_path} }
     opts.on("-l", "--log FILE", "Start a database log ('-' for STDOUT)") { |conf.log| }
-    opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = :console }
-    opts.on("-s", "--server NAME", "Server to force (mongrel, webrick, console)") { |s| conf.server = s.to_sym }
+    opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = "console" }
+    server_list = ["mongrel", "webrick", "console"]
+    opts.on("-s", "--server NAME", server_list, "Server to force (#{server_list.join(', ')})") { |conf.server| }
 
     opts.separator ""
@@ -61 +55 @@
 end
 
-opts.parse! ARGV
+begin
+  opts.parse! ARGV
+rescue OptionParser::ParseError => ex
+  STDERR.puts "!! #{ex.message}"
+  puts "** use `#{File.basename($0)} --help` for more details..."
+  exit 1
+end
+
 if ARGV.length < 1
     puts opts
-    exit
+    exit 1
 end
+
+# Load configuration if any
+if rc_path and File.exists?( rc_path )
+  YAML.load_file(rc_path).each do |k,v|
+    conf.send("#{k}=", v) unless conf.send(k)
+  end 
+  puts "** conf file #{rc_path} loaded"
+end
+
+# Default db
+if conf.database.nil? and db_path
+  conf.database = {:adapter => 'sqlite3', :database => db_path} if db_path
+end
+
 
 # get a copy of the paths to pass to the server
@@ -71 +86 @@
 
 # Check that mongrel exists 
-if conf.server.nil? || conf.server == :mongrel
+if conf.server.nil? || conf.server == "mongrel"
     begin
         require 'mongrel'
         require 'mongrel/camping'
-        conf.server = :mongrel
+        conf.server = "mongrel"
     rescue LoadError 
-        conf.server = :webrick 
+        puts "!! could not load mongrel. Falling back to webrick."
+        conf.server = "webrick"
     end
 end
@@ -83 +99 @@
 require "camping/server/#{conf.server}"
 
-server = Camping::Server.const_get(conf.server.to_s.capitalize).new(conf, paths)
+server = Camping::Server.const_get(conf.server.capitalize).new(conf, paths)
 server.start

trunk/lib/camping/reloader.rb

@@ -64 +64 @@
             end
         rescue Exception => e
-            puts "!! trouble loading #{title}: [#{e.class}] #{e.message}"
+            puts "!! trouble loading #{title.inspect}: [#{e.class}] #{e.message}"
             puts e.backtrace.join("\n")
             find_app title
@@ -74 +74 @@
         find_app title
         unless @klass and @klass.const_defined? :C
-            puts "!! trouble loading #{title}: not a Camping app, no #{title.capitalize} module found"
+            puts "!! trouble loading #{title.inspect}: not a Camping app, no #{title.capitalize} module found"
             remove_app
             return
@@ -81 +81 @@
         Reloader.conditional_connect
         @klass.create if @klass.respond_to? :create
-        puts "!! loaded #{title}"
+        puts "** #{title.inspect} app loaded"
         @klass
     end

trunk/lib/camping/server.rb

@@ -11 +11 @@
   def initialize(conf, paths = [])
     unless conf.database
-      unless conf.db
-        raise "!! No home directory found.  Please specify a database file, see --help."
-      end
-      conf.database = {:adapter => 'sqlite3', :database => conf.db}
+      raise "!! No home directory found.  Please specify a database file, see --help."
     end