mongrel 0.3.12.4 → 0.3.13

data/Rakefile

@@ -16,84 +16,95 @@ desc "Does a full compile, test run"
 task :default => [:compile, :test]
 
 desc "Compiles all extensions"
-task :compile => [:http11]
-task :package => [:clean,:compile,:test]
+task :compile => [:http11] do
+  if Dir.glob(File.join("lib","http11.*")).length == 0
+    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    STDERR.puts "Gem actually failed to build.  Your system is"
+    STDERR.puts "NOT configured properly to build Mongrel."
+    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    exit(1)
+  end
+end
+
+task :package => [:clean,:compile,:test,:rerdoc]
 
 task :ragel do
   sh %{/usr/local/bin/ragel ext/http11/http11_parser.rl | /usr/local/bin/rlcodegen -G2 -o ext/http11/http11_parser.c}
 end
 
-task :site do
+task :site_webgen do
   sh %{pushd doc/site; webgen; scp -r output/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/; popd }
+end
+
+task :site_rdoc do
   sh %{ scp -r doc/rdoc/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/ }
+end
+
+task :site_coverage => [:rcov] do
+  sh %{ scp -r test/coverage/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/coverage/ }
+end
+
+task :site_projects_rdoc do
   sh %{ cd projects/gem_plugin; rake site }
 end
 
+task :site => [:site_webgen, :site_rdoc, :site_coverage, :site_projects_rdoc]
+
 setup_extension("http11", "http11")
 
 name="mongrel"
-version="0.3.12.4"
+version="0.3.13"
 
 setup_gem(name, version) do |spec|
   spec.summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
   spec.description = spec.summary
-  spec.test_file = "test/test_ws.rb"
+  spec.test_files = Dir.glob('test/test_*.rb')
   spec.author="Zed A. Shaw"
   spec.executables=['mongrel_rails']
   spec.files += %w(ext/http11/MANIFEST README Rakefile setup.rb)
 
-  spec.add_dependency('daemons', '>= 0.4.2')
-  spec.add_dependency('gem_plugin', '>= 0.2.1')
   spec.required_ruby_version = '>= 1.8.4'
-end
 
-desc "Build a binary gem for Win32"
-task :win32_gem => [:clean, :compile, :test, :rerdoc, :package_win32]
-
-task :package_win32 do
-  setup_win32_gem(name, version) do |spec|
-    spec.summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
-    spec.description = spec.summary
-    spec.test_files = Dir.glob('test/test_*.rb') 
-    spec.author="Zed A. Shaw"
-    spec.executables=['mongrel_rails', 'mongrel_rails_service']
-    spec.homepage="http://mongrel.rubyforge.org"
-    spec.rubyforge_project="mongrel"
-    spec.files += %w(ext/http11/MANIFEST README Rakefile setup.rb)
+  if RUBY_PLATFORM =~ /mswin/
+    Dir.chdir "projects/mongrel_service" do
+      sh %{rake install }
+    end
     spec.files << 'ext/http11/http11.so'
-
-    spec.required_ruby_version = '>= 1.8.4'
-
     spec.add_dependency('win32-service', '>= 0.5.0')
-    spec.add_dependency('gem_plugin', ">= 0.2.1")
-
-    spec.extensions = []
+    spec.extensions.clear
     spec.platform = Gem::Platform::WIN32
+  else
+    spec.add_dependency('daemons', '>= 0.4.2')
   end
+  
+  spec.add_dependency('gem_plugin', '>= 0.2.1')
 end
 
-
 task :install do
   sub_project("gem_plugin", :install)
   sh %{rake package}
-  sh %{sudo gem install pkg/mongrel-#{version}}
+  sh %{gem install pkg/mongrel-#{version}}
   sub_project("mongrel_status", :install)
-  sub_project("mongrel_config", :install)
   sub_project("mongrel_console", :install)
+  if RUBY_PLATFORM =~ /mswin/
+    sub_project("mongrel_service", :install)
+  end
 end
 
 task :uninstall => [:clean] do
   sub_project("mongrel_status", :uninstall)
-  sub_project("mongrel_config", :uninstall)
   sub_project("mongrel_console", :uninstall)
-  sh %{sudo gem uninstall mongrel}
+  sh %{gem uninstall mongrel}
   sub_project("gem_plugin", :uninstall)
+  if RUBY_PLATFORM =~ /mswin/
+    sub_project("mongrel_service", :install)
+  end
 end
 
 
 task :gem_source do
   mkdir_p "pkg/gems"
-
+ 
   FileList["**/*.gem"].each { |gem| mv gem, "pkg/gems" }
   FileList["pkg/*.tgz"].each {|tgz| rm tgz }
   rm_rf "pkg/#{name}-#{version}"

data/bin/mongrel_rails

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'yaml'
 require 'mongrel'
 require 'mongrel/rails'
-
+require 'etc'
 
 
 class Start < GemPlugin::Plugin "/commands"
@@ -17,17 +17,20 @@ class Start < GemPlugin::Plugin "/commands"
       ['-a', '--address ADDR', "Address to bind to", :@address, "0.0.0.0"],
       ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
       ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"],
-      ['-n', '--num-procs INT', "Number of processor threads to use", :@num_procs, 1024],
-      ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, 0],
+      ['-n', '--num-procs INT', "Number of processors active before clients denied", :@num_procs, 1024],
+      ['-t', '--timeout TIME', "Timeout all requests after 100th seconds time", :@timeout, 0],
       ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
       ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
       ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"],
       ['-B', '--debug', "Enable debugging mode", :@debug, false],
       ['-C', '--config PATH', "Use a config file", :@config_file, nil],
-      ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil]
+      ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
+      ['-G', '--generate CONFIG', "Generate a config file for -C", :@generate, nil],
+      ['', '--user USER', "User to run as", :@user, nil],
+      ['', '--group GROUP', "Group to run as", :@group, nil]
     ]
   end
-  
+
   def validate
     @cwd = File.expand_path(@cwd)
     valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
@@ -40,46 +43,65 @@ class Start < GemPlugin::Plugin "/commands"
     valid_dir? @docroot, "Path to docroot not valid: #@docroot"
     valid_exists? @mime_map, "MIME mapping file does not exist: #@mime_map" if @mime_map
     valid_exists? @config_file, "Config file not there: #@config_file" if @config_file
+    valid_dir? File.dirname(@generate), "Problem accessing directory to #@generate" if @generate
+    valid_user? @user if @user
+    valid_group? @group if @group
+
     return @valid
   end
-
+  
+  
   def run
 
     # command line setting override config file settings
     settings = { :host => @address,  :port => @port, :cwd => @cwd,
       :log_file => @log_file, :pid_file => @pid_file, :environment => @environment,
       :docroot => @docroot, :mime_map => @mime_map, :daemon => @daemon,
-      :debug => @debug, :includes => ["mongrel"], :config_script => @config_script
+      :debug => @debug, :includes => ["mongrel"], :config_script => @config_script,
+      :num_processors => @num_procs, :timeout => @timeout,
+      :user => @user, :group => @group
     }
 
+    if @generate
+      STDERR.puts "** Writing config to #@generate"
+      open(@generate, "w") {|f| f.write(settings.to_yaml) }
+      STDERR.puts "## Exiting. Re-run without -G and WITH -C using your new config file."
+      exit 0
+    end
+
     if @config_file
-      STDERR.puts "** Loading settings from #{@config_file} (command line options override)."
+      STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless defaults[:daemon]
       conf = YAML.load_file(@config_file)
-      settings = conf.merge(settings)
+      settings = settings.merge! conf
     end
-    
+
     config = Mongrel::Rails::RailsConfigurator.new(settings) do
-      log "Starting Mongrel in #{defaults[:environment]} mode at #{defaults[:host]}:#{defaults[:port]}"
-      
       if defaults[:daemon]
-        log "Daemonizing, any open files are closed.  Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info."
+        if File.exist? defaults[:pid_file]
+          log "!!! PID file #{defaults[:pid_file]} already exists.  Mongrel could be running already. Check your #{defaults[:log_file]} for errors."
+        end
+
         daemonize
+        log "Daemonized, any open files are closed.  Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info."
+        log "Settings loaded from #{@config_file} (they override command line)." if @config_file
       end
-      
+
+      log "Starting Mongrel listening at #{defaults[:host]}:#{defaults[:port]}"
+
       listener do
         mime = {}
         if defaults[:mime_map]
           log "Loading additional MIME types from #{defaults[:mime_map]}"
           mime = load_mime_map(defaults[:mime_map], mime)
         end
-        
+
         if defaults[:debug]
           log "Installing debugging prefixed filters.  Look in log/mongrel_debug for the files."
           debug "/"
         end
 
-        log "Starting Rails in environment #{defaults[:environment]} ..."
-        uri "/", :handler => rails
+        log "Starting Rails with #{defaults[:environment]} environment ..."
+        uri "/", :handler => rails(:mime => mime)
         log "Rails loaded."
 
         log "Loading any Rails specific GemPlugins"
@@ -96,6 +118,13 @@ class Start < GemPlugin::Plugin "/commands"
 
     config.run
     config.log "Mongrel available at #{settings[:host]}:#{settings[:port]}"
+    
+    if not @daemon
+      config.log "Use CTRL-C to stop." 
+    else
+      config.write_pid_file
+    end
+
     config.join
 
     if config.needs_restart
@@ -118,7 +147,7 @@ def send_signal(signal, pid_file)
   rescue Errno::ESRCH
     puts "Process does not exist.  Not running."
   end
-  
+
   puts "Done."
 end
 
@@ -128,23 +157,25 @@ class Stop < GemPlugin::Plugin "/commands"
 
   def configure 
     options [ 
-             ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
-             ['-f', '--force', "Force the shutdown.", :@force, false],
-             ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
+      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
+      ['-f', '--force', "Force the shutdown.", :@force, false],
+      ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
     ]
   end
-  
+
   def validate
-    @cwd = File.expand_path(@cwd)
-    valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+    if @cwd
+      @cwd = File.expand_path(@cwd)
+      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+      @pid_file = File.join(@cwd,@pid_file)
+    end
 
-    @pid_file = File.join(@cwd,@pid_file)
     valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
 
     return @valid
   end
 
-  
+
   def run
     if @force
       send_signal("KILL", @pid_file)
@@ -161,17 +192,19 @@ class Restart < GemPlugin::Plugin "/commands"
 
   def configure 
     options [ 
-             ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
-             ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
-             ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
+      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
+      ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
+      ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
     ]
   end
-  
+
   def validate
-    @cwd = File.expand_path(@cwd)
-    valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+    if @cwd
+      @cwd = File.expand_path(@cwd)
+      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+      @pid_file = File.join(@cwd,@pid_file)
+    end
 
-    @pid_file = File.join(@cwd,@pid_file)
     valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
 
     return @valid
@@ -192,7 +225,7 @@ GemPlugin::Manager.instance.load "mongrel" => GemPlugin::INCLUDE, "rails" => Gem
 
 
 if not Mongrel::Command::Registry.instance.run ARGV
-   exit 1
+  exit 1
 end
 
 

data/doc/rdoc/classes/IO.html

@@ -86,8 +86,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000006">close</a>&nbsp;&nbsp;
-      <a href="#M000005">open</a>&nbsp;&nbsp;
+      <a href="#M000002">close</a>&nbsp;&nbsp;
+      <a href="#M000001">open</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -127,12 +127,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
+      <div id="method-M000002" class="method-detail">
+        <a name="M000002"></a>
 
         <div class="method-heading">
-          <a href="IO.src/M000006.html" target="Code" class="method-signature"
-            onclick="popupCode('IO.src/M000006.html');return false;">
+          <a href="IO.src/M000002.html" target="Code" class="method-signature"
+            onclick="popupCode('IO.src/M000002.html');return false;">
           <span class="method-name">close</span><span class="method-args">(*arg,&amp;blk)</span>
           </a>
         </div>
@@ -141,12 +141,12 @@
         </div>
       </div>
 
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
+      <div id="method-M000001" class="method-detail">
+        <a name="M000001"></a>
 
         <div class="method-heading">
-          <a href="IO.src/M000005.html" target="Code" class="method-signature"
-            onclick="popupCode('IO.src/M000005.html');return false;">
+          <a href="IO.src/M000001.html" target="Code" class="method-signature"
+            onclick="popupCode('IO.src/M000001.html');return false;">
           <span class="method-name">open</span><span class="method-args">(*arg, &amp;blk)</span>
           </a>
         </div>

data/doc/rdoc/classes/IO.src/{M000005.html → M000001.html}

@@ -10,10 +10,10 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre>     <span class="ruby-comment cmt"># File lib/mongrel/debug.rb, line 103</span>
-103:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
-104:     <span class="ruby-identifier">$open_files</span>[<span class="ruby-keyword kw">self</span>] = <span class="ruby-identifier">args</span>.<span class="ruby-identifier">inspect</span>
-105:     <span class="ruby-identifier">orig_open</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
-106:   <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel/debug.rb, line 116</span>
+116:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
+117:     <span class="ruby-identifier">$open_files</span>[<span class="ruby-keyword kw">self</span>] = <span class="ruby-identifier">args</span>.<span class="ruby-identifier">inspect</span>
+118:     <span class="ruby-identifier">orig_open</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
+119:   <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/IO.src/{M000006.html → M000002.html}

@@ -10,10 +10,10 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre>     <span class="ruby-comment cmt"># File lib/mongrel/debug.rb, line 108</span>
-108:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
-109:     <span class="ruby-identifier">$open_files</span>.<span class="ruby-identifier">delete</span> <span class="ruby-keyword kw">self</span>
-110:     <span class="ruby-identifier">orig_close</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
-111:   <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel/debug.rb, line 121</span>
+121:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
+122:     <span class="ruby-identifier">$open_files</span>.<span class="ruby-identifier">delete</span> <span class="ruby-keyword kw">self</span>
+123:     <span class="ruby-identifier">orig_close</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">arg</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">blk</span>)
+124:   <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Kernel.html

@@ -80,8 +80,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000026">log_open_files</a>&nbsp;&nbsp;
-      <a href="#M000025">open</a>&nbsp;&nbsp;
+      <a href="#M000021">log_open_files</a>&nbsp;&nbsp;
+      <a href="#M000020">open</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -116,12 +116,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000026" class="method-detail">
-        <a name="M000026"></a>
+      <div id="method-M000021" class="method-detail">
+        <a name="M000021"></a>
 
         <div class="method-heading">
-          <a href="Kernel.src/M000026.html" target="Code" class="method-signature"
-            onclick="popupCode('Kernel.src/M000026.html');return false;">
+          <a href="Kernel.src/M000021.html" target="Code" class="method-signature"
+            onclick="popupCode('Kernel.src/M000021.html');return false;">
           <span class="method-name">log_open_files</span><span class="method-args">()</span>
           </a>
         </div>
@@ -130,12 +130,12 @@
         </div>
       </div>
 
-      <div id="method-M000025" class="method-detail">
-        <a name="M000025"></a>
+      <div id="method-M000020" class="method-detail">
+        <a name="M000020"></a>
 
         <div class="method-heading">
-          <a href="Kernel.src/M000025.html" target="Code" class="method-signature"
-            onclick="popupCode('Kernel.src/M000025.html');return false;">
+          <a href="Kernel.src/M000020.html" target="Code" class="method-signature"
+            onclick="popupCode('Kernel.src/M000020.html');return false;">
           <span class="method-name">open</span><span class="method-args">(*arg, &amp;blk)</span>
           </a>
         </div>