brightbox 2.1.2 → 2.2

data/bin/brightbox

@@ -55,6 +55,10 @@ opts = OptionParser.new do |opts|
     "Brightbox virtual server",
     "(e.g: example-001.vm.brightbox.net)\n"
   ) { |value| @server = value }
+  
+  opts.on("-a TYPE", "--app TYPE", [:mongrel, :passenger],
+    "App server type, mongrel or passenger"
+    ) { |value| @app_server = value }
 
   begin
     opts.parse!(ARGV)
@@ -78,6 +82,17 @@ def unindent(string)
   string.strip.gsub(/^#{indentation}/, "")
 end
 
+def deploy_requires(app_server)
+  header = %Q{gem 'brightbox', '>=#{Brightbox::VERSION}'
+    require 'brightbox/recipes'
+    }
+  case app_server
+  when :passenger
+    header << %Q{require 'brightbox/passenger'}
+  end
+  return header
+end
+
 @domain ||= @server
 @application ||= @server.gsub(/(-\d{3})?\..*\Z/,'')
 
@@ -149,36 +164,46 @@ unless Rake::Task.task_defined?("db:check:config")
       pe "database name should start with '\#{config['username']}' if using cluster"
     end
   end
+  
+    require 'yaml'
+
+    def read_database_yml
+      db_yml = File.join(File.dirname(__FILE__), "..", "..", "config", "database.yml")
+      if File.exist?(db_yml)
+        return YAML.load(File.open(db_yml))
+      else
+        return {}
+      end
+    end
 
-  namespace(:db) do
-    namespace(:check) do
-      desc "Check database.yml config"
-      task :config => :environment do
-        p "Checking database mysql configuration..."
-        if config=ActiveRecord::Base.configurations[RAILS_ENV]
-          case config['adapter']
-          when nil
-            pe "adapter entry missing."
-          when 'mysql'
-            brightbox_sanity_checks(config)
-          else
-            pe "using \#{config['adapter']} - halting checks"
-          end
+    namespace(:db) do
+  namespace(:check) do
+    desc "Check database.yml config"
+    task :config do
+      p "Checking database mysql configuration..."
+      if config=read_database_yml[RAILS_ENV]
+        case config['adapter']
+        when nil
+          pe "adapter entry missing."
+        when 'mysql'
+          brightbox_sanity_checks(config)
         else
-          pe "section missing."
+          pe "using \#{config['adapter']} - halting checks"
         end
+      else
+        pe "section missing."
       end
     end
   end
-end
+    end
+  end
 
 
   FILE
 
 "config/deploy.rb" => unindent(<<-FILE),
     ## Generated with '#{opts.program_name}' on #{Time.now}
-    gem 'brightbox', '>=#{Brightbox::VERSION}'
-    require 'brightbox/recipes'
+    #{deploy_requires(@app_server)}
 
     # The name of your application.  Used for deployment directory and filenames
     # and Apache configs. Should be unique on the Brightbox
@@ -286,6 +311,30 @@ end
     # or be explicit
     # set :scm, :subversion
 
+    ## Deployment settings
+    # The brightbox gem deploys as the user 'rails' by default and
+    # into the 'production' environment. You can change these as required.
+    # set :user, "rails"
+    # set :rails_env, :production
+
+    ## Command running settings
+    # use_sudo is switched off by default so that commands are run
+    # directly as 'user' by the run command. If you switch on sudo
+    # make sure you set the :runner variable - which is the user the
+    # capistrano default tasks use to execute commands.
+    # NB. This just affects the default recipes unless you use the
+    # 'try_sudo' command to run your commands.
+    # set :use_sudo, false
+    # set :runner, user
+    
+    ## Dependencies
+    # Set the commands and gems that your application requires. e.g.
+    # depend :remote, :gem, "will_paginate", ">=2.2.2"
+    # depend :remote, :command, "brightbox"\n\n
+  FILE
+}
+
+mongrel_deploy = unindent(<<-FILE
     ## Mongrel settings
     # Addresses that Mongrel listens on. Defaults to :local
     # Use :remote if your mongrels are on a different host to the web
@@ -307,29 +356,31 @@ end
     # set :mongrel_max_memory, 110
     # Maximum cpu allowable per mongrel. Defaults to 80%
     # set :mongrel_max_cpu, 80
-    
-    ## Deployment settings
-    # The brightbox gem deploys as the user 'rails' by default and
-    # into the 'production' environment. You can change these as required.
-    # set :user, "rails"
-    # set :rails_env, :production
-
-    ## Command running settings
-    # use_sudo is switched off by default so that commands are run
-    # directly as 'user' by the run command. If you switch on sudo
-    # make sure you set the :runner variable - which is the user the
-    # capistrano default tasks use to execute commands.
-    # NB. This just affects the default recipes unless you use the
-    # 'try_sudo' command to run your commands.
-    # set :use_sudo, false
-    # set :runner, user
-    
-    ## Dependencies
-    # Set the commands and gems that your application requires. e.g.
-    # depend :remote, :gem, "will_paginate", ">=2.2.2"
-    # depend :remote, :command, "brightbox"
   FILE
-}
+)
+  
+passenger_deploy = unindent(<<-FILE
+   ## Ruby Enterprise
+   # Use the experimental Brightbox Ruby Enterprise Package for Ubuntu
+   # Don't enable this option unless you're testing this out as it is
+   # currently not recommended for production use
+   # set :use_ree, true
+   
+   ## Passenger Configuration
+   # Set the method of restarting passenger
+   # Defaults to :hard which is used to instantly free up database connections
+   # :soft uses the standard touch tmp/restart.txt which leaves database connections
+   # lingering until the workers time out
+   # set :passenger_restart_strategy, :hard
+  FILE
+)
+  
+case @app_server
+when :passenger
+  files["config/deploy.rb"] << passenger_deploy
+when :mongrel
+  files["config/deploy.rb"] << mongrel_deploy
+end
 
 base = ARGV.shift
 files.each do |file, content|

data/brightbox-gemspec.rb

@@ -20,7 +20,7 @@
 require File.join(File.dirname(__FILE__),"lib/brightbox/version")
 def add_common(spec)
   spec.version = Brightbox::VERSION
-  spec.authors = ["John Leach","Neil Wilson"]
+  spec.authors = ["John Leach","Neil Wilson","David Smalley"]
   spec.email = "support@brightbox.co.uk"
   spec.homepage = "http://wiki.brightbox.co.uk/docs:thebrightboxgem"
   spec.rubyforge_project = 'brightbox'

data/lib/brightbox/passenger.rb

@@ -0,0 +1,21 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), "recipes", "deploy", "passenger.rb")
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), "recipes", "configure", "passenger.rb")

data/lib/brightbox/recipes.rb

@@ -17,6 +17,7 @@
 #    Public License along with this program.  If not, see
 #    <http://www.gnu.org/licenses/>.
 #
+require File.dirname(__FILE__) + '/version'
 Dir[File.join(File.dirname(__FILE__), 'recipes', '*.rb')].each do |recipe|
   Capistrano::Configuration.instance(true).load recipe
 end

data/lib/brightbox/recipes/callbacks.rb

@@ -19,19 +19,16 @@
 #
 # Hook tasks into the standard deployment system
 
+# Some mongrel specific callbacks have been moved to configure/mongrel.rb
+
 after "deploy:setup",
   "deploy:shared:global:setup",
   "deploy:shared:local:setup",
   "configure:maintenance",
   "configure:logrotation",
-  "configure:monit",
-  "configure:mongrel",
   "configure:apache",
   "configure:nginx"
 
-after "deploy:cold",
-  "deploy:monit:reload"
-
 after "deploy:finalize_update",
   "deploy:shared:global:symlink",
   "deploy:shared:local:symlink",
@@ -40,7 +37,6 @@ after "deploy:finalize_update",
 after "deploy:update",
   "deploy:cleanup"
 
-
 after "deploy:start",
   "deploy:web:reload_if_new"
 

data/lib/brightbox/recipes/configure.rb

@@ -19,145 +19,38 @@
 #
 
 def monit_setup
-  "railsapp-monit"
+  "railsapp-monit _#{::Version}_"
 end
 depend :remote, :command, monit_setup
 
 def apache_setup
-  "railsapp-apache"
+  "railsapp-apache _#{::Version}_"
 end
 depend :remote, :command, apache_setup
 
 def nginx_setup
-  "railsapp-nginx"
+  "railsapp-nginx _#{::Version}_"
 end
 depend :remote, :command, nginx_setup
 
 def mongrel_setup
-  "railsapp-mongrel"
+  "railsapp-mongrel _#{::Version}_"
 end
 depend :remote, :command, mongrel_setup
 
 def logrotate_setup
-  "railsapp-logrotate"
+  "railsapp-logrotate _#{::Version}_"
 end
 depend :remote, :command, logrotate_setup
 
 def maintenance_setup
-  "railsapp-maintenance"
+  "railsapp-maintenance _#{::Version}_"
 end
 depend :remote, :command, maintenance_setup
 
-namespace :configure do
-
-[:nginx, :apache].each do |webserver|
-  desc %Q{
-  [internal]Create #{webserver.to_s} config. Creates a load balancing virtual host \
-  configuration based upon your specified settings
-
-    :application      Name of the application
-    :domain           Domain name which will point to the application
-    :domain_aliases   Comma separated list of aliased for the main domain
-    :mongrel_host     Name of application layer host (default localhost)
-    :mongrel_port     Start port of the mongrel cluster (default 8000)
-    :mongrel_servers  Number of servers on app host (default 2)
-    :ssl_certificate  Create SSL configuration with certificate
-    :ssl_key          Name of private key to use with certificate
-
-  }
-  task webserver, :roles => :web, :except => {:no_release => true} do
-    app_hosts = case mongrel_host
-                when :local
-                  "localhost"
-                when :remote
-                  roles[:app].servers.join(",")
-                else
-                  mongrel_host
-                end
-    sudo on_one_line( <<-END
-        #{send(webserver.to_s + "_setup")}
-        -n #{application}
-        -d #{domain}
-        #{'-a '+domain_aliases if domain_aliases}
-        -w #{File.join(current_path, 'public')}
-        -h #{app_hosts}
-        -p #{mongrel_port}
-        -s #{mongrel_servers}
-        #{'-m '+max_age if max_age}
-        #{'-c '+ssl_certificate if ssl_certificate} 
-        #{'-k '+ssl_key if ssl_key}
-    END
-        )
-  end
-end
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), 'configure', 'mongrel.rb')
 
-  desc %Q{
-  [internal]Create Mongrel config. Creates a set of mongrels running \
-  on the specified ports of the application server(s).
-
-    :application      Name of the application
-    :mongrel_host     Address for mongrels to listen to (default localhost)
-    :mongrel_port     Start port of the mongrel cluster (default 8000)
-    :mongrel_servers  Number of servers on app host (default 2)
-    :mongrel_pid_file The name of the file containing the mongrel PID 
-
-  }
-  task :mongrel, :roles => :app, :except => {:no_release => true} do
-    listen_address = case mongrel_host
-                     when :local
-                       "localhost"
-                     when :remote
-                       "0.0.0.0"
-                     else
-                       mongrel_host
-                     end
-    sudo on_one_line( <<-END
-        #{mongrel_setup}
-        -n #{application}
-        -r #{current_path}
-        -p #{mongrel_port}
-        -s #{mongrel_servers}
-        -h #{listen_address}
-        -C #{mongrel_config_file}
-        -P #{mongrel_pid_file}
-        -e #{rails_env}
-    END
-        )
-  end
-
-  desc %Q{
-  [internal]Create Monit config. Build a monit configuraton file \
-  to look after this application
-
-    :application      Name of the application
-    :mongrel_host     Name of application layer host (default localhost)
-    :mongrel_port     Start port of the mongrel cluster (default 8000)
-    :mongrel_servers  Number of servers on app host (default 2)
-
-  }
-  task :monit, :roles => :app, :except => {:no_release => true} do
-    listen_address = case mongrel_host
-                     when :local, :remote
-                       "localhost"
-                     else
-                       mongrel_host
-                     end
-    sudo on_one_line( <<-END
-        #{monit_setup}
-        -n #{application}
-        -u #{user}
-        -r #{current_path}
-        -h #{listen_address}
-        -p #{mongrel_port}
-        -s #{mongrel_servers}
-        -C #{mongrel_config_file}
-        -P #{mongrel_pid_file}
-        -U #{mongrel_check_url}
-        -m #{mongrel_max_memory}
-        -c #{mongrel_max_cpu}
-    END
-        )
-  end
+namespace :configure do
 
   desc %Q{
   [internal]Create logrotation config. Build a logrotate configuraton file \

data/lib/brightbox/recipes/configure/mongrel.rb

@@ -0,0 +1,139 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+
+after "deploy:setup",
+  "configure:monit",
+  "configure:mongrel"
+
+after "deploy:cold",
+  "deploy:monit:reload"
+
+namespace :configure do
+
+[:nginx, :apache].each do |webserver|
+  desc %Q{
+  [internal]Create #{webserver.to_s} config. Creates a load balancing virtual host \
+  configuration based upon your specified settings
+
+    :application      Name of the application
+    :domain           Domain name which will point to the application
+    :domain_aliases   Comma separated list of aliased for the main domain
+    :mongrel_host     Name of application layer host (default localhost)
+    :mongrel_port     Start port of the mongrel cluster (default 8000)
+    :mongrel_servers  Number of servers on app host (default 2)
+    :ssl_certificate  Create SSL configuration with certificate
+    :ssl_key          Name of private key to use with certificate
+
+  }
+  task webserver, :roles => :web, :except => {:no_release => true} do
+    app_hosts = case mongrel_host
+                when :local
+                  "localhost"
+                when :remote
+                  roles[:app].servers.join(",")
+                else
+                  mongrel_host
+                end
+    sudo on_one_line( <<-END
+        #{send(webserver.to_s + "_setup")}
+        -n #{application}
+        -d #{domain}
+        #{'-a '+domain_aliases if domain_aliases}
+        -w #{File.join(current_path, 'public')}
+        -h #{app_hosts}
+        -p #{mongrel_port}
+        -s #{mongrel_servers}
+        #{'-m '+max_age if max_age}
+        #{'-c '+ssl_certificate if ssl_certificate} 
+        #{'-k '+ssl_key if ssl_key}
+    END
+        )
+  end
+end
+
+  desc %Q{
+  [internal]Create Mongrel config. Creates a set of mongrels running \
+  on the specified ports of the application server(s).
+
+    :application      Name of the application
+    :mongrel_host     Address for mongrels to listen to (default localhost)
+    :mongrel_port     Start port of the mongrel cluster (default 8000)
+    :mongrel_servers  Number of servers on app host (default 2)
+    :mongrel_pid_file The name of the file containing the mongrel PID 
+
+  }
+  task :mongrel, :roles => :app, :except => {:no_release => true} do
+    listen_address = case mongrel_host
+                     when :local
+                       "localhost"
+                     when :remote
+                       "0.0.0.0"
+                     else
+                       mongrel_host
+                     end
+    sudo on_one_line( <<-END
+        #{mongrel_setup}
+        -n #{application}
+        -r #{current_path}
+        -p #{mongrel_port}
+        -s #{mongrel_servers}
+        -h #{listen_address}
+        -C #{mongrel_config_file}
+        -P #{mongrel_pid_file}
+        -e #{rails_env}
+    END
+        )
+  end
+
+  desc %Q{
+  [internal]Create Monit config. Build a monit configuraton file \
+  to look after this application
+
+    :application      Name of the application
+    :mongrel_host     Name of application layer host (default localhost)
+    :mongrel_port     Start port of the mongrel cluster (default 8000)
+    :mongrel_servers  Number of servers on app host (default 2)
+
+  }
+  task :monit, :roles => :app, :except => {:no_release => true} do
+    listen_address = case mongrel_host
+                     when :local, :remote
+                       "localhost"
+                     else
+                       mongrel_host
+                     end
+    sudo on_one_line( <<-END
+        #{monit_setup}
+        -n #{application}
+        -u #{user}
+        -r #{current_path}
+        -h #{listen_address}
+        -p #{mongrel_port}
+        -s #{mongrel_servers}
+        -C #{mongrel_config_file}
+        -P #{mongrel_pid_file}
+        -U #{mongrel_check_url}
+        -m #{mongrel_max_memory}
+        -c #{mongrel_max_cpu}
+    END
+        )
+  end
+  
+end

data/lib/brightbox/recipes/configure/passenger.rb

@@ -0,0 +1,57 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+depend :remote, :gem, "rack", ">=0.9.0"
+
+namespace :configure do
+  
+  desc %Q{
+  [internal]Create Apache config. Creates a load balancing virtual host \
+  configuration based upon your specified settings
+
+    :application      Name of the application
+    :domain           Domain name which will point to the application
+    :domain_aliases   Comma separated list of aliased for the main domain
+    :ssl_certificate  Create SSL configuration with certificate
+    :ssl_key          Name of private key to use with certificate
+
+  }
+  task :apache, :roles => :web, :except => {:no_release => true} do
+    sudo on_one_line( <<-END
+        #{send("apache_setup")}
+        -n #{application}
+        -d #{domain}
+        #{'-a '+domain_aliases if domain_aliases}
+        -w #{File.join(current_path, 'public')}
+        --passenger
+        --railsenv #{rails_env}
+        #{'-m '+max_age if max_age}
+        #{'-c '+ssl_certificate if ssl_certificate} 
+        #{'-k '+ssl_key if ssl_key}
+    END
+        )
+  end
+  
+  task :mongrel, :roles => :app, :except => {:no_release => true} do
+  end
+  
+  task :monit, :roles => :app, :except => {:no_release => true} do
+  end
+  
+end

data/lib/brightbox/recipes/deploy.rb

@@ -19,49 +19,10 @@
 #
 # Override standard tasks that don't do what we want
 
-namespace :deploy do
-
-  def mongrel_command
-    "/usr/bin/mongrel_rails"
-  end
-  depend :remote, :command, mongrel_command
-
-  def monit_command
-    "/usr/sbin/monit"
-  end
-  depend :remote, :command, monit_command
-
-  def mongrel_cluster_command(event)
-    "#{mongrel_command} cluster::#{event} -C #{mongrel_config_file}" <<
-    if event == "status"
-      ""
-    else
-      " --clean"
-    end
-  end
-
-  def monitor_cluster_command(event)
-    case event
-    when "start","restart"
-      "#{monit_command} -g #{application} monitor all"
-    when "stop"
-      "#{monit_command} -g #{application} unmonitor all"
-    else
-      nil 
-    end
-  end
+# By default we require mongrel. In future we can just switch the default to passenger
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), 'deploy', 'mongrel.rb')
 
-  #Override start, stop and restart so that they use mongrel to restart the
-  #application servers
-  %w(start stop restart status).each do |event|
-    desc "Ask mongrel to #{event} your application."
-    task event, :roles => :app, :except => {:no_release => true } do
-      try_sudo mongrel_cluster_command(event)
-      if cmd = monitor_cluster_command(event)
-        sudo cmd
-      end
-    end
-  end
+namespace :deploy do
 
   namespace :web do
 
@@ -111,21 +72,11 @@ namespace :deploy do
 
   end
 
-  namespace :monit do
-
-    desc %Q{
-      Reload monit
-    }
-    task :reload do
-      sudo "#{monit_command} reload"
-    end
-
-  end
-
   desc %Q{Setup the directories and deploy the initial version of the
   application
   }
   task :initial do
+    gems.check_server_tools
     setup
     cold
   end
@@ -136,7 +87,9 @@ namespace :deploy do
       Execute Rake tasks that need to be run once per system
     }
     task :singleton, :roles => :db, :only => {:primary => true} do
-      run rake_task("db:check:config")
+      unless disable_db_check
+        run rake_task("db:check:config")
+      end
       run rake_task("db:create")
     end
 
@@ -151,8 +104,8 @@ namespace :deploy do
       Execute Rake tasks
     }
     task :default do
-      singleton
       global
+      singleton
     end
   end
 

data/lib/brightbox/recipes/deploy/mongrel.rb

@@ -0,0 +1,76 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+
+namespace :deploy do
+  
+  def mongrel_command
+    "/usr/bin/mongrel_rails"
+  end
+  depend :remote, :command, mongrel_command
+
+  def monit_command
+    "/usr/sbin/monit"
+  end
+  depend :remote, :command, monit_command
+
+  def mongrel_cluster_command(event)
+    "#{mongrel_command} cluster::#{event} -C #{mongrel_config_file}" <<
+    if event == "status"
+      ""
+    else
+      " --clean"
+    end
+  end
+
+  def monitor_cluster_command(event)
+    case event
+    when "start","restart"
+      "#{monit_command} -g #{application} monitor all"
+    when "stop"
+      "#{monit_command} -g #{application} unmonitor all"
+    else
+      nil 
+    end
+  end
+
+  #Override start, stop and restart so that they use mongrel to restart the
+  #application servers
+  %w(start stop restart status).each do |event|
+    desc "Ask mongrel to #{event} your application."
+    task event, :roles => :app, :except => {:no_release => true } do
+      try_sudo mongrel_cluster_command(event)
+      if cmd = monitor_cluster_command(event)
+        sudo cmd
+      end
+    end
+  end
+  
+  namespace :monit do
+
+    desc %Q{
+      Reload monit
+    }
+    task :reload do
+      sudo "#{monit_command} reload"
+    end
+
+  end
+  
+end

data/lib/brightbox/recipes/deploy/passenger.rb

@@ -0,0 +1,55 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+
+namespace :deploy do
+  
+  #Override start and stop, they are useless for passenger
+  %w(start stop status).each do |event|
+    desc "Dummy command to #{event} your application, not used by Passenger."
+    task event, :roles => :app, :except => {:no_release => true } do
+    end
+  end
+    
+    desc "Restart your application using passenger."
+    task :restart, :roles => :app, :except => {:no_release => true} do
+      case passenger_restart_strategy
+      when :hard
+        deploy.passenger.hard_restart
+      when :soft
+        deploy.passenger.soft_restart
+      end
+    end
+    
+    namespace :passenger do
+    
+      desc "Hard restart your passenger instances by killing the dispatcher"
+      task :hard_restart, :roles => :app, :except => {:no_release => true} do
+        soft_restart
+        sudo "kill \$( passenger-memory-stats | grep 'Passenger spawn server' | awk '{ print \$1 }' )"
+      end
+    
+      desc "Soft restart you passenger instances by issuing touch tmp/restart.txt"
+      task :soft_restart, :roles => :app, :except => {:no_release => true} do
+        run "touch #{current_path}/tmp/restart.txt"
+      end
+    
+    end
+  
+end

data/lib/brightbox/recipes/gems.rb

@@ -19,6 +19,20 @@
 #
 
 namespace :gems do
+  
+  desc "[internal]Install the matching brightbox-server-tools gem for this client gem version"
+  task :check_server_tools, :except => {:no_release => true} do
+    puts "Checking for brightbox-server-tools at #{::Version}"
+    install_gem("brightbox-server-tools", ::Version)
+  end
+  
+  def install_gem(gem, version)
+    sudo %Q{sh -c "
+      gem spec #{gem} --version '#{version}' 2>/dev/null|egrep -q '^name:' ||
+        sudo gem install --no-ri --no-rdoc --version '#{version}' #{gem}"
+    }
+  end
+  
 
   def gem_dependencies?
     (fetch(:dependencies,{})[:remote]||{})[:gem]
@@ -30,10 +44,7 @@ namespace :gems do
       gem = gemspec[0]
       version = gemspec[1]
       puts "Checking for #{gem} at #{version}"
-      sudo %Q{sh -c "
-        gem spec #{gem} --version '#{version}' 2>/dev/null|egrep -q '^name:' ||
-          sudo gem install -y --no-ri --no-rdoc --version '#{version}' #{gem}"
-      }
+      install_gem(gem, version)
     end
   end
 
@@ -43,6 +54,7 @@ namespace :gems do
   task :install, :except => {:no_release => true} do
     if gem_dependencies?
       install_gems
+      sudo rake_task("gems:install")
     else
       sudo rake_task("gems:install")
     end

data/lib/brightbox/recipes/variables.rb

@@ -39,6 +39,9 @@ _cset :domain_aliases, nil
 _cset :max_age, nil
 _cset :user, "rails"
 _cset :runner, user
+_cset :disable_db_check, false
+_cset :use_ree, false
+_cset :passenger_restart_strategy, :hard
 _cset :use_sudo, false
 _cset :ssl_certificate, nil
 _cset :ssl_key, nil

data/lib/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  VERSION = "2.1.2"
+  VERSION = "2.2"
 end
 # Set global scope version so that OptionParser picks it up.
 ::Version = Brightbox::VERSION

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: "2.2"
 platform: ruby
 authors: 
 - John Leach
 - Neil Wilson
+- David Smalley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-08 00:00:00 +01:00
+date: 2009-01-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,17 +36,22 @@ files:
 - LICENSE
 - Rakefile
 - brightbox-gemspec.rb
+- lib/brightbox/maintenance.rb
+- lib/brightbox/passenger.rb
+- lib/brightbox/recipes/callbacks.rb
+- lib/brightbox/recipes/configure/mongrel.rb
+- lib/brightbox/recipes/configure/passenger.rb
 - lib/brightbox/recipes/configure.rb
-- lib/brightbox/recipes/variables.rb
+- lib/brightbox/recipes/database.rb
+- lib/brightbox/recipes/deploy/mongrel.rb
+- lib/brightbox/recipes/deploy/passenger.rb
+- lib/brightbox/recipes/deploy.rb
 - lib/brightbox/recipes/gems.rb
 - lib/brightbox/recipes/helpers.rb
 - lib/brightbox/recipes/shared_assets.rb
-- lib/brightbox/recipes/callbacks.rb
-- lib/brightbox/recipes/database.rb
-- lib/brightbox/recipes/deploy.rb
-- lib/brightbox/version.rb
+- lib/brightbox/recipes/variables.rb
 - lib/brightbox/recipes.rb
-- lib/brightbox/maintenance.rb
+- lib/brightbox/version.rb
 - bin/brightbox
 has_rdoc: false
 homepage: http://wiki.brightbox.co.uk/docs:thebrightboxgem
@@ -69,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Brightbox rails deployment scripts for Capistrano