Changeset 232

Timestamp:

09/28/2007 18:09:00 (14 months ago)

Author:

zimbatm

Message:

Small cosmetic fixes and require 'rubygems' rescue

Location:

trunk

Files:

• bin/camping (modified) (1 diff)
• lib/camping/server/mongrel.rb (modified) (2 diffs)

trunk/bin/camping

@@ -1 +1 @@
 #!/usr/bin/env ruby
 
-require 'delegate'
 require 'optparse'
 require 'ostruct'
+require 'stringio'
+require 'yaml'
 
-require 'stringio'
-require 'rubygems'           
+begin require 'rubygems' rescue LoadError end
 require 'camping'
 require 'camping/server'
-require 'yaml'
 
 conf = OpenStruct.new(:host => '0.0.0.0', :port => 3301)

trunk/lib/camping/server/mongrel.rb

@@ -9 +9 @@
     end
     def start
-        raise "No apps loaded" unless self.apps.length > 0
+        raise "!! No apps loaded" unless self.apps.length > 0
         # get a reference to the server object for later use
         server = self
@@ -33 +33 @@
             @config.join
         rescue Errno::EADDRINUSE
-            raise "** ERROR : address #{conf.host}:#{conf.port} already in use."
+            raise "!! address #{conf.host}:#{conf.port} already in use."
         end