mongrel_cluster 1.0.2 → 1.0.3

data/CHANGELOG

@@ -0,0 +1,2 @@
+
+v1.0.3. Signed gem; Capistrano 2.0 tasks (require 'mongrel_cluster/recipes_2').

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Bradley Taylor, bradley@fluxura.com
+Copyright (c) 2007 Bradley Taylor, bradley@fluxura.com
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Bradley Taylor, bradley@fluxura.com
+Copyright (c) 2007 Bradley Taylor, bradley@fluxura.com
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

data/Manifest

@@ -0,0 +1,10 @@
+resources/mongrel_cluster
+resources/defaults.yaml
+README
+Manifest
+LICENSE
+lib/mongrel_cluster/recipes.rb
+lib/mongrel_cluster/init.rb
+COPYING
+CHANGELOG
+bin/mongrel_cluster_ctl

data/README

@@ -3,45 +3,57 @@
 Tool to help start/stop/restart multiple mongrel servers to use behind a load balancer like Apache 2.2 (mod_proxy_balancer), Lighttpd, Pound, Pen or Balance. This plugin adds an option to specify a number of Mongrel servers to launch, a range of ports, and a configuration file for the cluster. Use "-h" to see command syntax.
 
 Configure cluster and write configuration file:
-mongrel_rails cluster::configure  
+  mongrel_rails cluster::configure  
 
 Start cluster:
-mongrel_rails cluster::start
+  mongrel_rails cluster::start
 
 Restart cluster:
-mongrel_rails cluster::restart
+  mongrel_rails cluster::restart
 
 Stop cluster:
-mongrel_rails cluster::stop
+  mongrel_rails cluster::stop
 
-Capistrano Recipe
+== Capistrano 1.0 Recipes
 
 Add to config/deploy.rb:
-require 'mongrel_cluster/recipes'
+  require 'mongrel_cluster/recipes'
 
-Example usage:
-cap -a configure_mongrel_cluster
-
-Variables
-mongrel_servers: Number of Mongrel servers to start.
-mongrel_port: Starting port to bind to.
-mongrel_address: Address to bind to.
-mongrel_environment: Rails environment to run as.
-mongrel_conf: Path to conf file. Defaults to /etc/mongrel_cluster/app_name.conf
-mongrel_user: User to run mongrels in cluster as. Unset by default
-mongrel_group: Group to run mongrels in cluster as. Unset by default.
+Variables:
+  mongrel_servers: Number of Mongrel servers to start.
+  mongrel_port: Starting port to bind to.
+  mongrel_address: Address to bind to.
+  mongrel_environment: Rails environment to run as.
+  mongrel_conf: Path to conf file. Defaults to /etc/mongrel_cluster/app_name.conf
+  mongrel_user: User to run mongrels in cluster as. Unset by default
+  mongrel_group: Group to run mongrels in cluster as. Unset by default.
 
 Tasks (performed on :app role)
-configure_mongrel_cluster: Configure the cluster with variables.
-start_mongrel_cluster: Start Mongrel processes on the app server.
-stop_mongrel_cluster: Stop the Mongrel processes on the app server.
-restart_mongrel_cluster: Restart the Mongrel processes on the app server by starting and stopping mongrel_cluster.
-restart: Calls restart_mongrel_cluster to allow Mongrel to be used with the standard Capistrano deploy task.
-spinner: Calls start_mongrel_cluster to allow Mongrel to be used with the standard Capistrano cold_deploy task.
-
-Supporting starting clusters on boot.
+  configure_mongrel_cluster: Configure the cluster with variables.
+  start_mongrel_cluster: Start Mongrel processes on the app server.
+  stop_mongrel_cluster: Stop the Mongrel processes on the app server.
+  restart_mongrel_cluster: Restart the Mongrel processes on the app server by starting and stopping mongrel_cluster.
+  restart: Calls restart_mongrel_cluster to allow Mongrel to be used with the standard Capistrano deploy task.
+  spinner: Calls start_mongrel_cluster to allow Mongrel to be used with the standard Capistrano cold_deploy task.
+
+== Capistrano 2.0 Recipes
+
+Add to config/deploy.rb:
+  require 'mongrel_cluster/recipes_2'
+
+Capistrano 2.0 uses namespaced tasks. The new task names are:
+  mongrel:cluster:configure Configure the cluster with variables.
+  mongrel:cluster:start: Start Mongrel processes on the app server.
+  mongrel:cluster:stop: Stop the Mongrel processes on the app server.
+  mongrel:cluster:restart: Restart the Mongrel processes on the app server by starting and stopping mongrel_cluster.
+  deploy:restart: Calls mongrel:cluster:restart to allow Mongrel to be used with the standard Capistrano deploy task.
+  deploy:start: Calls mongrel:cluster:start to allow Mongrel to be used with the standard Capistrano deploy task.
+  deploy:stop: Calls mongrel:cluster:stop to allow Mongrel to be used with the standard Capistrano deploy task.
+
+== Starting clusters at boot
+
 1. Create mongrel_cluster conf directory (/etc/mongrel_cluster).
-2. Assign ownership to your capistrano user.
+2. Assign ownership to your Capistrano user.
 3. Copy the init.d script from this gem's resouces directory /etc/init.d.
 4. chmod +x /etc/init.d/mongrel_cluster
 5. Add to init.d startup. On RHEL/CentOS use: /sbin/chkconfig --level 345 mongrel_cluster on

data/bin/mongrel_cluster_ctl

@@ -3,13 +3,14 @@
 
 require 'optparse'
 
-def run(command, verbose)
+def run(command, verbose, clean=false)
   Dir.chdir @options[:conf_path] do
     confs =  Dir.glob("*.yml")
     confs += Dir.glob("*.conf")
     confs.each do |conf|
       cmd = "mongrel_rails cluster::#{command} -C #{conf}"
       cmd += " -v" if verbose
+      cmd += " --clean" if clean
       puts cmd if verbose || command == "status"
       output = `#{cmd}`
       puts output if verbose || command == "status"
@@ -21,12 +22,14 @@ end
 @options = {}
 @options[:conf_path] = "/etc/mongrel_cluster"
 @options[:verbose] = false
+@options[:clean] = false
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} (start|stop|restart|status) [options]"
  
   opts.on("-c", "--conf_path PATH", "Path to mongrel_cluster configuration files") { |value| @options[:conf_path] = value }
   opts.on('-v', '--verbose', "Print all called commands and output.") { |value| @options[:verbose] = value }
+  opts.on('--clean', "Remove pid files if needed beforehand.") { |value| @options[:clean] = value }
 
   if ARGV.empty?
     puts opts
@@ -49,14 +52,14 @@ end
 case @cmd[0]
 when "start": 
   puts "Starting all mongrel_clusters..."
-  run "start", @options[:verbose]
+  run "start", @options[:verbose], @options[:clean]
 when "stop":
   puts "Stopping all mongrel_clusters..."
-  run "stop", @options[:verbose]
+  run "stop", @options[:verbose], @options[:clean]
 when "restart":
   puts "Restarting all mongrel_clusters..."
-  run "stop", @options[:verbose]
-  run "start", @options[:verbose]
+  run "stop", @options[:verbose], @options[:clean]
+  run "start", @options[:verbose], @options[:clean]
 when "status":
   puts "Checking all mongrel_clusters..."
   run "status", @options[:verbose]

data/lib/mongrel_cluster/init.rb

@@ -11,7 +11,7 @@ module Cluster
     
     def validate
       valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-      return @valid
+      @valid
     end
       
     def read_options
@@ -62,25 +62,28 @@ module Cluster
       argv = [ "mongrel_rails" ]
       argv << "start"
       argv << "-d"
-      argv << "-e #{@options["environment"]}" if @options["environment"]
-      argv << "-a #{@options["address"]}"  if @options["address"]
-      argv << "-c #{@options["cwd"]}" if @options["cwd"]
-      argv << "-t #{@options["timeout"]}" if @options["timeout"]
-      argv << "-m #{@options["mime_map"]}" if @options["mime_map"]
-      argv << "-r #{@options["docroot"]}" if @options["docroot"]
-      argv << "-n #{@options["num_procs"]}" if @options["num_procs"]
-      argv << "-B" if @options["debug"]
-      argv << "-S #{@options["config_script"]}" if @options["config_script"]
-      argv << "--user #{@options["user"]}" if @options["user"]
-      argv << "--group #{@options["group"]}" if @options["group"]
-      argv << "--prefix #{@options["prefix"]}" if @options["prefix"]
+      argv << "-e #{@options['environment']}" if @options['environment']
+      argv << "-a #{@options['address']}"  if @options['address']
+      argv << "-c #{@options['cwd']}" if @options['cwd']
+      argv << "-o #{@options['timeout']}" if @options['timeout']
+      argv << "-t #{@options['throttle']}" if @options['throttle']
+      argv << "-m #{@options['mime_map']}" if @options['mime_map']
+      argv << "-r #{@options['docroot']}" if @options['docroot']
+      argv << "-n #{@options['num_procs']}" if @options['num_procs']
+      argv << "-B" if @options['debug']
+      argv << "-S #{@options['config_script']}" if @options['config_script']
+      argv << "--user #{@options['user']}" if @options['user']
+      argv << "--group #{@options['group']}" if @options['group']
+      argv << "--prefix #{@options['prefix']}" if @options['prefix']
       cmd = argv.join " "
       
       @ports.each do |port|              
         if @clean && pid_file_exists?(port) && !check_process(port)
           pid_file = port_pid_file(port)        
           log "missing process: removing #{pid_file}"
-          File.unlink(pid_file) 
+          chdir_cwd do
+            File.unlink(pid_file) 
+          end
         end
         
         if pid_file_exists?(port) && check_process(port)
@@ -149,7 +152,7 @@ module Cluster
         puts ""
       end
 
-      return status
+      status
     end
 
     def pid_file_exists?(port)    
@@ -169,13 +172,17 @@ module Cluster
       else
         pid = find_pid(port)
       end
-      return pid
+      pid
     end 
     
-    def cmd_name 
-      RUBY_PLATFORM =~ /solaris/i ? "args" : "command"
+    def cmd_name
+      RUBY_PLATFORM =~ /solaris|aix/i ? "args" : "command"
     end
-
+        
+    def cmd_flags
+      RUBY_PLATFORM =~ /solaris|aix/i ? "-eo" : "-ewwo"
+    end
+    
     def chdir_cwd
       pwd = Dir.pwd
       Dir.chdir(@options["cwd"]) if @options["cwd"]     
@@ -189,21 +196,20 @@ module Cluster
       chdir_cwd do     
         pid = File.read(pid_file)
       end
-      return pid
+      pid
     end
  
     def find_pid(port)
-      ps_cmd = "ps -ewwo pid,#{cmd_name}"
-      ps_output = `#{ps_cmd}`      
-      ps_output.each do |line|     
-        if line =~ /-P #{Regexp.escape(port_pid_file(port))} /              
+      ps_cmd = "ps #{cmd_flags} pid,#{cmd_name}"
+      ps_output = `#{ps_cmd}`
+      ps_output.each do |line|
+        if line =~ /-P #{Regexp.escape(port_pid_file(port))} /
           pid = line.split[0]
           return pid
         end
       end
-      return nil
     end
-
+    
     def log_error(message)
       log(message)
     end
@@ -282,7 +288,8 @@ module Cluster
         ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
         ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/mongrel.pid"],
         ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
-        ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, nil],
+        ['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, nil],
+        ['-t', '--throttle TIME', "Time to pause (in hundredths of a second) between accepting clients", :@throttle, nil],
         ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
         ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, nil],
         ['-n', '--num-procs INT', "Number of processor threads to use", :@num_procs, nil],
@@ -302,7 +309,7 @@ module Cluster
       valid?(@servers > 0, "Must give a valid number of servers")
       valid_dir? File.dirname(@config_file), "Path to config file not valid: #{@config_file}"
       
-      return @valid
+      @valid
     end
 
     def run
@@ -315,9 +322,10 @@ module Cluster
       @options["log_file"] = @log_file if @log_file
       @options["debug"] = @debug if @debug
       @options["num_procs"] = @num_procs if @num_procs
-      @options["docroot"] = @docroot if @docroots
+      @options["docroot"] = @docroot if @docroot
       @options["address"] = @address if @address
       @options["timeout"] = @timeout if @timeout
+      @options["throttle"] = @throttle if @throttle
       @options["environment"] = @environment if @environment
       @options["mime_map"] = @mime_map if @mime_map
       @options["config_script"] = @config_script if @config_script

data/mongrel_cluster.gemspec

@@ -0,0 +1,58 @@
+
+# Gem::Specification for Mongrel_cluster-1.0.3
+# Originally generated by Echoe
+
+Gem::Specification.new do |s|
+  s.name = %q{mongrel_cluster}
+  s.version = "1.0.3"
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bradley Taylor"]
+  s.date = %q{2007-10-26}
+  s.default_executable = %q{mongrel_cluster_ctl}
+  s.description = %q{Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.}
+  s.email = %q{}
+  s.executables = ["mongrel_cluster_ctl"]
+  s.files = ["resources/mongrel_cluster", "resources/defaults.yaml", "README", "Manifest", "LICENSE", "lib/mongrel_cluster/recipes.rb", "lib/mongrel_cluster/init.rb", "COPYING", "CHANGELOG", "bin/mongrel_cluster_ctl", "mongrel_cluster.gemspec"]
+  s.homepage = %q{}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{mongrel}
+  s.rubygems_version = %q{0.9.4.6}
+  s.summary = %q{Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.}
+
+  s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
+  s.add_dependency(%q<mongrel>, [">= 1.0.2"])
+end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# 
+# require 'echoe'
+# 
+# Echoe.new("mongrel_cluster") do |p|
+#   p.summary = "Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes."
+#   p.project = "mongrel"
+#   p.author="Bradley Taylor"
+#   p.dependencies = ['gem_plugin >=0.2.3', 'mongrel >=1.0.2']
+#   p.has_rdoc = false
+# 
+#   p.need_tar_gz = false
+#   p.need_tgz = true
+#   p.require_signed = true
+# end
+# 
+# # Is this still used?
+# 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}"
+# 
+#   sh %{ generate_yaml_index.rb -d pkg }
+#   sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/releases/ }
+# end
+# 

metadata

@@ -1,52 +1,101 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
+rubygems_version: 0.9.4.6
+specification_version: 2
 name: mongrel_cluster
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-07-10 00:00:00 -04:00
+  version: 1.0.3
+date: 2007-10-26 00:00:00 -04:00
 summary: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 require_paths: 
 - lib
-email: 
-homepage: 
-rubyforge_project: 
+email: ""
+homepage: ""
+rubyforge_project: mongrel
 description: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 autorequire: 
-default_executable: mongrel_cluster_ctl
+default_executable: 
 bindir: bin
 has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 0.0.0
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDUDCCAjigAwIBAgIBADANBgkqhkiG9w0BAQUFADBOMRwwGgYDVQQDDBNtb25n
+  cmVsLWRldmVsb3BtZW50MRkwFwYKCZImiZPyLGQBGRYJcnVieWZvcmdlMRMwEQYK
+  CZImiZPyLGQBGRYDb3JnMB4XDTA3MDkxNjEwMzI0OVoXDTA4MDkxNTEwMzI0OVow
+  TjEcMBoGA1UEAwwTbW9uZ3JlbC1kZXZlbG9wbWVudDEZMBcGCgmSJomT8ixkARkW
+  CXJ1Ynlmb3JnZTETMBEGCgmSJomT8ixkARkWA29yZzCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAMb9v3B01eOHk3FyypbQgKXzJplUE5P6dXoG+xpPm0Lv
+  P7BQmeMncOwqQ7zXpVQU+lTpXtQFTsOE3vL7KnhQFJKGvUAkbh24VFyopu1I0yqF
+  mGu4nRqNXGXVj8TvLSj4S1WpSRLAa0acLPNyKhGmoV9+crqQypSjM6XKjBeppifo
+  4eBmWGjiJEYMIJBvJZPJ4rAVDDA8C6CM1m3gMBGNh8ELDhU8HI9AP3dMIkTI2Wx9
+  9xkJwHdroAaS0IFFtYChrwee4FbCF1FHDgoTosMwa47DrLHg4hZ6ojaKwK5QVWEV
+  XGb6ju5UqpktnSWF2W+Lvl/K0tI42OH2CAhebT1gEVUCAwEAAaM5MDcwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGHChyMSZ16u9WOzKhgJSQ9lqDc5
+  MA0GCSqGSIb3DQEBBQUAA4IBAQA/lfeN2WdB1xN+82tT7vNS4HOjRQw6MUh5yktu
+  GQjaGqm0UB+aX0Z9y0B0qpfv9rj7nmIvEGiwBmDepNWYCGuW15JyqpN7QVVnG2xS
+  Mrame7VqgjM7A+VGDD5In5LtWbM/CHAATvvFlQ5Ph13YE1EdnVbZ65c+KQv+5sFY
+  Q+zEop74d878uaC/SAHHXS46TiXneocaLSYw1CEZs/MAIy+9c4Q5ESbGpgnfg1Ad
+  6lwl7k3hsNHO/+tZzx4HJtOXDI1yAl3+q6T9J0yI3z97EinwvAKhS1eyOI2Y5eeT
+  tbQaNYkU127B3l/VNpd8fQm3Jkl/PqCCmDBQjUszFrJEODug
+  -----END CERTIFICATE-----
+
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPzCCAiegAwIBAgIBADANBgkqhkiG9w0BAQUFADBOMRwwGgYDVQQDDBNtb25n
+  cmVsLWRldmVsb3BtZW50MRkwFwYKCZImiZPyLGQBGRYJcnVieWZvcmdlMRMwEQYK
+  CZImiZPyLGQBGRYDb3JnMB4XDTA3MDkxNjEwMzMwMFoXDTA4MDkxNTEwMzMwMFow
+  PTENMAsGA1UEAwwEZXZhbjEYMBYGCgmSJomT8ixkARkWCGNsb3VkYnVyMRIwEAYK
+  CZImiZPyLGQBGRYCc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
+  LQijz2fICmev4+9s0WB71WzJFYCUYFQQxqGlenbxWut9dlPSsBbskGjg+UITeOXi
+  cTh3MTqAB0i1LJyNOiyvDsAivn7GjKXhVvflp2/npMhBBe83P4HOWqeQBjkk3QJI
+  FFNBvqbFLeEXIP+HiqAOiyNHZEVXMepLEJLzGrg3Ly7M7A6L5fK7jDrt8jkm+c+8
+  zGquVHV5ohAebGd/vpHMLjpA7lCG5+MBgYZd33rRfNtCxDJMNRgnOu9PsB05+LJn
+  MpDKQq3x0SkOf5A+MVOcadNCaAkFflYk3SUcXaXWxu/eCHgqfW1m76RNSp5djpKE
+  CgNPK9lGIWpB3CHzDaVNAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSw
+  MB0GA1UdDgQWBBT5aonPfFBdJ5rWFG+8dZwgyB54LjANBgkqhkiG9w0BAQUFAAOC
+  AQEAiKbzWgMcvZs/TPwJxr8tJ+7mSGz7+zDkWcbBl8FpQq1DtRcATh1oyTkQT7t+
+  rFEBYMmb0FxbbUnojQp8hIFgFkUwFpStwWBL/okLSehntzI2iwjuEtfj4ac9Q3Y2
+  uSdbmZqsQTuu+lEUc5C4qLK7YKwToaul+cx7vWxyk1YendcVwRlFLIBqA5cPrwo3
+  yyGLTHlRYn2c9PSbM1B63Yg+LqSSAa4QSU3Wv9pNdffVpvwHPVEQpO7ZDo5slQFL
+  Gf6+gbD/eZAvhpvmn8JlXb+LxKaFVMs2Yvrk1xOuT76SsPjEGWxkr7jZCIpsYfgQ
+  ALN3mi/9z0Mf1YroliUgF0v5Yw==
+  -----END CERTIFICATE-----
+
 post_install_message: 
 authors: 
 - Bradley Taylor
 files: 
-- COPYING
-- LICENSE
+- resources/mongrel_cluster
+- resources/defaults.yaml
 - README
-- Rakefile
-- bin/mongrel_cluster_ctl
-- lib/mongrel_cluster
+- Manifest
+- LICENSE
 - lib/mongrel_cluster/recipes.rb
-- lib/mongrel_cluster/init.rb~
 - lib/mongrel_cluster/init.rb
-- tools/rakehelp.rb
-- resources/mongrel_cluster
-- resources/defaults.yaml
+- COPYING
+- CHANGELOG
+- bin/mongrel_cluster_ctl
+- mongrel_cluster.gemspec
 test_files: []
 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 executables: 
 - mongrel_cluster_ctl
 extensions: []
@@ -57,18 +106,18 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.0.2
     version: 

data/Rakefile

@@ -1,54 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'tools/rakehelp'
-require 'fileutils'
-include FileUtils
-
-setup_tests
-setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
-
-setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
-
-desc "Does a full compile, test run"
-task :default => [:test, :package]
-
-version="1.0.2"
-name="mongrel_cluster"
-
-setup_gem(name, version) do |spec|
-  spec.summary = "Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes."
-  spec.description = spec.summary
-  spec.author="Bradley Taylor"
-  spec.add_dependency('gem_plugin', '>= 0.2.2')
-  spec.add_dependency('mongrel', '>= 1.0.1')
-  spec.files += Dir.glob("resources/**/*")
-  spec.has_rdoc = false
-  spec.files += Dir.glob("bin/*")
-  spec.files += Dir.glob("examples/*")
-  spec.default_executable = "mongrel_cluster_ctl"
-  spec.executables = ["mongrel_cluster_ctl"]
-end
-
-
-task :install => [:test, :package] do
-  sh %{sudo gem install pkg/#{name}-#{version}.gem}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{name}}
-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}"
-
-  sh %{ generate_yaml_index.rb -d pkg }
-  sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/releases/ }
-end
-

data/lib/mongrel_cluster/init.rb~

@@ -1,351 +0,0 @@
-require 'gem_plugin'
-require 'mongrel'
-require 'yaml'
-
-module Cluster
-  module ExecBase
-    include Mongrel::Command::Base
-      
-    STATUS_OK = 0
-    STATUS_ERROR = 2
-    
-    def validate
-      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-      return @valid
-    end
-      
-    def read_options
-      @options = { 
-        "environment" => ENV['RAILS_ENV'] || "development",
-        "port" => 3000,
-        "pid_file" => "tmp/pids/mongrel.pid",
-        "log_file" => "log/mongrel.log",
-        "servers" => 2
-      }
-      conf = YAML.load_file(@config_file)
-      @options.merge! conf if conf
-        
-      process_pid_file @options["pid_file"]
-      process_log_file @options["log_file"]
-
-      start_port = end_port = @only
-      start_port ||=  @options["port"].to_i
-      end_port ||=  start_port + @options["servers"] - 1
-      @ports = (start_port..end_port).to_a
-    end
-
-    def process_pid_file(pid_file)
-      @pid_file_ext = File.extname(pid_file)
-      @pid_file_base = File.basename(pid_file, @pid_file_ext)
-      @pid_file_dir = File.dirname(pid_file)
-    end
-
-    def process_log_file(log_file)
-      @log_file_ext = File.extname(log_file)
-      @log_file_base = File.basename(log_file, @log_file_ext)
-      @log_file_dir = File.dirname(log_file)
-    end
-    
-    def port_pid_file(port)
-      pid_file = [@pid_file_base, port].join(".") + @pid_file_ext      
-      File.join(@pid_file_dir, pid_file)
-    end
-      
-    def port_log_file(port)
-      log_file = [@log_file_base, port].join(".") +  @log_file_ext      
-      File.join(@log_file_dir, log_file)
-    end
-      
-    def start
-      read_options
-      
-      argv = [ "mongrel_rails" ]
-      argv << "start"
-      argv << "-d"
-      argv << "-e #{@options["environment"]}" if @options["environment"]
-      argv << "-a #{@options["address"]}"  if @options["address"]
-      argv << "-c #{@options["cwd"]}" if @options["cwd"]
-      argv << "-t #{@options["timeout"]}" if @options["timeout"]
-      argv << "-m #{@options["mime_map"]}" if @options["mime_map"]
-      argv << "-r #{@options["docroot"]}" if @options["docroot"]
-      argv << "-n #{@options["num_procs"]}" if @options["num_procs"]
-      argv << "-B" if @options["debug"]
-      argv << "-S #{@options["config_script"]}" if @options["config_script"]
-      argv << "--user #{@options["user"]}" if @options["user"]
-      argv << "--group #{@options["group"]}" if @options["group"]
-      argv << "--prefix #{@options["prefix"]}" if @options["prefix"]
-      cmd = argv.join " "
-      
-      @ports.each do |port|              
-        if @clean && pid_file_exists?(port) && !check_process(port)
-          pid_file = port_pid_file(port)        
-          log "missing process: removing #{pid_file}"
-          File.unlink(pid_file) 
-        end
-        
-        if pid_file_exists?(port) && check_process(port)
-          log "already started port #{port}"         
-          next
-        end
-
-        exec_cmd = cmd + " -p #{port} -P #{port_pid_file(port)}"
-        exec_cmd += " -l #{port_log_file(port)}"
-        log "starting port #{port}"          
-        log_verbose exec_cmd
-        output = `#{exec_cmd}`
-        log_error output unless $?.success?
-      end
-    end
-      
-    def stop
-      read_options
-    
-      argv = [ "mongrel_rails" ]
-      argv << "stop"
-      argv << "-c #{@options["cwd"]}" if @options["cwd"]
-      argv << "-f" if @force
-      cmd = argv.join " "
-
-      @ports.each do |port|
-        pid = check_process(port)        
-        if @clean && pid && !pid_file_exists?(port)       
-          log "missing pid_file: killing mongrel_rails port #{port}, pid #{pid}"
-          Process.kill("KILL", pid.to_i)  
-        end
-        
-        if !check_process(port)
-          log "already stopped port #{port}"                   
-          next       
-        end
-
-        exec_cmd = cmd + " -P #{port_pid_file(port)}"
-        log "stopping port #{port}"          
-        log_verbose exec_cmd
-        output = `#{exec_cmd}`
-        log_error output unless $?.success?
-        
-      end
-    end
-  
-    def status
-      read_options
-      
-      status = STATUS_OK
-     
-      @ports.each do |port|
-        pid = check_process(port)        
-        unless pid_file_exists?(port)        
-          log "missing pid_file: #{port_pid_file(port)}"  
-          status = STATUS_ERROR
-        else
-          log "found pid_file: #{port_pid_file(port)}"
-        end    
-        if pid
-          log "found mongrel_rails: port #{port}, pid #{pid}"
-        else
-          log "missing mongrel_rails: port #{port}"
-          status = STATUS_ERROR
-        end
-        puts ""
-      end
-
-      return status
-    end
-
-    def pid_file_exists?(port)    
-      pid_file = port_pid_file(port)
-      exists = false
-      chdir_cwd do     
-        exists = File.exists?(pid_file)  
-      end
-      exists
-    end
-
-    def check_process(port)
-      if pid_file_exists?(port)
-        pid = read_pid(port)
-        ps_output = `ps -o #{cmd_name}= -p #{pid}`
-        pid = ps_output =~ /mongrel_rails/ ? pid : nil
-      else
-        pid = find_pid(port)
-      end
-      return pid
-    end 
-    
-    def cmd_name 
-      RUBY_PLATFORM =~ /solaris/i ? "args" : "command"
-    end
-
-    def chdir_cwd
-      pwd = Dir.pwd
-      Dir.chdir(@options["cwd"]) if @options["cwd"]     
-      yield
-      Dir.chdir(pwd) if @options["cwd"]
-    end
-
-    def read_pid(port)
-      pid_file = port_pid_file(port)
-      pid = 0
-      chdir_cwd do     
-        pid = File.read(pid_file)
-      end
-      return pid
-    end
- 
-    def find_pid(port)
-      ps_cmd = "ps -ewwo pid,#{cmd_name}"
-      ps_output = `#{ps_cmd}`      
-      ps_output.each do |line|     
-        if line =~ /-P #{Regexp.escape(port_pid_file(port))} /              
-          pid = line.split[0]
-          return pid
-        end
-      end
-      return nil
-    end
-
-    def log_error(message)
-      log(message)
-    end
-
-    def log_verbose(message)
-      log(message) if @verbose
-    end
-
-    def log(message)
-      puts message
-    end   
-  end
-  class Start < GemPlugin::Plugin "/commands"
-    include ExecBase
-    
-    def configure
-      options [ 
-        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
-        ['', '--clean', "Remove pid_file if needed before starting", :@clean, false],
-        ['', '--only PORT', "Port number of cluster member", :@only, nil]
-      ]
-    end
-
-    def run
-      start      
-    end
-  end
-  
-  class Stop < GemPlugin::Plugin "/commands"
-    include ExecBase
-
-    def configure
-      options [
-       ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-       ['-f', '--force', "Force the shutdown.", :@force, false],
-       ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
-       ['', '--clean', "Remove orphaned process if needed before stopping", :@clean, false],
-       ['', '--only PORT', "Port number of cluster member", :@only, nil]
-      ]
-    end
-    
-    def run
-      stop
-    end  
-  end
-  
-  class Restart < GemPlugin::Plugin "/commands"
-    include ExecBase
-
-    def configure 
-      options [ 
-        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-        ['-f', '--force', "Force the shutdown.", :@force, false],
-        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
-        ['', '--clean', "Call stop and start with --clean", :@clean, false],        
-        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
-      ]
-    end
-    
-    def run
-      stop
-      start
-    end
-    
-  end
-  
-  class Configure < GemPlugin::Plugin "/commands"
-    include ExecBase
-    
-    def configure 
-      options [
-        ["-e", "--environment ENV", "Rails environment to run as", :@environment, nil],
-        ['-p', '--port PORT', "Starting port to bind to", :@port, 3000],
-        ['-a', '--address ADDR', "Address to bind to", :@address, nil],
-        ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
-        ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/mongrel.pid"],
-        ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
-        ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, nil],
-        ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
-        ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, nil],
-        ['-n', '--num-procs INT', "Number of processor threads to use", :@num_procs, nil],
-        ['-B', '--debug', "Enable debugging mode", :@debug, nil],
-        ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
-        ['-N', '--num-servers INT', "Number of Mongrel servers", :@servers, 2],
-        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-        ['', '--user USER', "User to run as", :@user, nil],
-        ['', '--group GROUP', "Group to run as", :@group, nil],
-        ['', '--prefix PREFIX', "Rails prefix to use", :@prefix, nil]
-      ]
-    end
-
-    def validate
-      @servers = @servers.to_i
-      
-      valid?(@servers > 0, "Must give a valid number of servers")
-      valid_dir? File.dirname(@config_file), "Path to config file not valid: #{@config_file}"
-      
-      return @valid
-    end
-
-    def run
-      @options = { 
-        "port" => @port,
-        "servers" => @servers,
-        "pid_file" => @pid_file
-      }
-      
-      @options["log_file"] = @log_file if @log_file
-      @options["debug"] = @debug if @debug
-      @options["num_procs"] = @num_procs if @num_procs
-      @options["docroot"] = @docroot if @docroots
-      @options["address"] = @address if @address
-      @options["timeout"] = @timeout if @timeout
-      @options["environment"] = @environment if @environment
-      @options["mime_map"] = @mime_map if @mime_map
-      @options["config_script"] = @config_script if @config_script
-      @options["cwd"] = @cwd if @cwd
-      @options["user"] = @user if @user
-      @options["group"] = @group if @group
-      @options["prefix"] = @prefix if @prefix
-      
-      log "Writing configuration file to #{@config_file}."
-      File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}
-    end  
-  end
-
-  class Status < GemPlugin::Plugin "/commands"
-    include ExecBase
-
-    def configure 
-      options [ 
-        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
-        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
-      ]
-    end
-    
-    def run
-      status
-    end
-
-  end
-end
-

data/tools/rakehelp.rb

@@ -1,105 +0,0 @@
-
-def make(makedir)
-    Dir.chdir(makedir) do
-        sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
-    end
-end
-
-
-def extconf(dir)
-    Dir.chdir(dir) do ruby "extconf.rb" end
-end
-
-
-def setup_tests
-    Rake::TestTask.new do |t|
-        t.libs << "test"
-        t.test_files = FileList['test/test*.rb']
-        t.verbose = true
-    end
-end
-
-
-def setup_clean otherfiles
-    files = ['build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log'] + otherfiles
-    CLEAN.include(files)
-end
-
-
-def setup_rdoc files
-    Rake::RDocTask.new do |rdoc|
-        rdoc.rdoc_dir = 'doc/rdoc'
-        rdoc.options << '--line-numbers'
-        rdoc.rdoc_files.add(files)
-    end
-end
-
-
-def setup_extension(dir, extension)
-    ext = "ext/#{dir}"
-    ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-    ext_files = FileList[
-    "#{ext}/*.c",
-    "#{ext}/*.h",
-    "#{ext}/extconf.rb",
-    "#{ext}/Makefile",
-    "lib"
-    ] 
-    
-    task "lib" do
-        directory "lib"
-    end
-
-    desc "Builds just the #{extension} extension"
-    task extension.to_sym => ["#{ext}/Makefile", ext_so ]
-
-    file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
-        extconf "#{ext}"
-    end
-
-    file ext_so => ext_files do
-        make "#{ext}"
-        cp ext_so, "lib"
-    end
-end
-
-
-def base_gem_spec(pkg_name, pkg_version)
-  pkg_version = pkg_version
-  pkg_name    = pkg_name
-  pkg_file_name = "#{pkg_name}-#{pkg_version}"
-  Gem::Specification.new do |s|
-    s.name = pkg_name
-    s.version = pkg_version
-    s.platform = Gem::Platform::RUBY
-    s.has_rdoc = true
-    s.extra_rdoc_files = [ "README" ]
-    
-    s.files = %w(COPYING LICENSE README Rakefile) +
-      Dir.glob("{bin,doc/rdoc,test,lib}/**/*") + 
-      Dir.glob("ext/**/*.{h,c,rb}") +
-      Dir.glob("examples/**/*.rb") +
-      Dir.glob("tools/*.rb")
-    
-    s.require_path = "lib"
-    s.extensions = FileList["ext/**/extconf.rb"].to_a
-    s.bindir = "bin"
-  end
-end
-
-def setup_gem(pkg_name, pkg_version)
-  spec = base_gem_spec(pkg_name, pkg_version)
-  yield spec if block_given?
-    
-  Rake::GemPackageTask.new(spec) do |p|
-    p.gem_spec = spec
-    p.need_tar = true
-  end
-end
-
-def setup_win32_gem(pkg_name, pkg_version)
-  spec = base_gem_spec(pkg_name, pkg_version)
-  yield spec if block_given?
-
-  Gem::Builder.new(spec).build
-end