Mongrel: script/server works on Win32. Closes #5499.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4504 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com]
+
 * Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [nicksieger@gmail.com]
 
 * Mongrel support for script/server.  #5475 [jeremydurham@gmail.com]

railties/lib/commands/server.rb

@@ -7,13 +7,19 @@ rescue Exception
   # FCGI not available
 end
 
+begin
+  require_library_or_gem 'mongrel'
+rescue Exception
+  # Mongrel not available
+end
+
 server = case ARGV.first
   when "lighttpd", "mongrel", "webrick"
     ARGV.shift
   else
     if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
       "lighttpd"
-    elsif !silence_stderr { `mongrel_rails -v` }.blank?
+    elsif defined?(Mongrel) 
       "mongrel"
     else
       "webrick"

railties/lib/commands/servers/mongrel.rb

@@ -1,6 +1,6 @@
 require 'rbconfig'
 
-unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `mongrel_rails` }.blank?
+unless defined?(Mongrel) 
   puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
   exit 1
 end
@@ -11,11 +11,11 @@ detach = false
 ip = nil
 port = nil
 
-ARGV.options do |opt|
+ARGV.clone.options do |opt|
   opt.on("-p", "--port=port", Integer,
           "Runs Rails on the specified port.",
           "Default: 3000") { |p| port = p }
-  opt.on("-b", "--binding=ip", String,
+  opt.on("-a", "--binding=ip", String,
           "Binds Rails to the specified ip.",
           "Default: 0.0.0.0") { |i| ip = i }
   opt.on('-h', '--help', 'Show this message.') { puts opt; exit 0 }
@@ -37,7 +37,8 @@ trap(:INT) { exit }
 tail_thread = nil
 
 begin
-  `mongrel_rails start #{detach ? "-d " : ""} -p #{port || default_port} -a #{ip || default_ip}`
+  ARGV.unshift("start")
+  load 'mongrel_rails'
 ensure
   unless detach
     tail_thread.kill if tail_thread