brightbox 2.3.9 → 2.4.0.pre1

data/bin/brightbox

@@ -91,6 +91,8 @@ def deploy_requires(app_server)
   case app_server
   when :passenger
     header << %Q{require 'brightbox/passenger'}
+  when :mongrel
+    header << %Q{require 'brightbox/mongrel'}
   end
   return header
 end
@@ -112,9 +114,8 @@ unless Rake::Task.task_defined?("db:create")
   namespace(:db) do
     task :create do
       puts "This is a dummy task installed by the Brightbox command"
-      puts "Your Rails version is too old to support the db:create task"
-      puts "Either upgrade to Rails >=2.0 to use the inbuilt facilities"
-      puts "Or create the database by hand if you haven't already"
+      puts "Your app doesn't support doing it's own database creation so you'll"
+      puts "have to create the database by hand if you haven't already."
     end
   end
 end
@@ -359,10 +360,10 @@ mongrel_deploy = unindent(<<-FILE
 passenger_deploy = unindent(<<-FILE
    ## 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
+   # :soft is the default and just touches tmp/restart.txt as normal.
+   # :hard forcibly kills running instances, rarely needed now but used
+   # to be necessary with older versions of passenger
+   # set :passenger_restart_strategy, :soft
   FILE
 )
   

data/lib/brightbox/mongrel.rb

@@ -0,0 +1,21 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2013 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", "mongrel.rb")
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), "recipes", "configure", "mongrel.rb")

data/lib/brightbox/recipes/bundler.rb

@@ -18,8 +18,8 @@
 #    <http://www.gnu.org/licenses/>.
 #
 
+
 after "gems:install", "bundler:install"
-depend :remote, :gem, "bundler", ">=1.0.0"
 
 namespace :bundler do
 
@@ -30,33 +30,40 @@ namespace :bundler do
   # Set :bundle_disable to true to prevent us from running bundler,
   # even if we detect a Gemfile
   _cset(:bundle_disable, false)
-  # Set :bundle_force to true to run bundler even if we can't see a
-  # Gemfile
+  # bundle_force is ignored now, bundle is used by default now
   _cset(:bundle_force, false)
   _cset(:bundle_symlink, true)
+  _cset(:bundle_cmd, "bundle")
+
+  set(:rake) do
+    if fetch(:bundle_disable)
+      "rake"
+    else
+      "#{fetch(:bundle_cmd)} exec rake"
+    end
+  end
+
+  depend :remote, :command, fetch(:bundle_cmd)
 
   desc "[internal]Install the bundler gem on the server"
   task :install_bundler, :except => {:no_release => true} do
-    puts "Checking for bundler gem"
-    gems.install_gem("bundler", ">= 1.0.0" )
+    gems.install_gem("bundler", ">= 1.3.0" )
   end
-  
+
   desc %Q{
   [internal]Install the gems specified by the Gemfile or Gemfile.lock using bundler
   }
-  task :install, :except => {:no_release => true} do    
-    install_cmd = "(bundle install --gemfile #{bundle_gemfile} "
+  task :install, :except => {:no_release => true} do
+    install_cmd = "(cd #{latest_release} && #{bundle_cmd} install --gemfile #{bundle_gemfile} "
+    install_cmd << "--quiet "
     install_cmd << "--path #{bundle_dir} #{bundle_flags} "
     install_cmd << "--without #{bundle_without} "
     install_cmd << "&& ln -sf #{bundle_dir} #{File.join(latest_release, "vendor")}" if fetch(:bundle_symlink)
     install_cmd << ")"
     if fetch(:bundle_disable)
-      puts "Skipping bundler install as :bundle_enable is set to false"
-    elsif fetch(:bundle_force)
-      puts "Forcing bundler install as :bundle_force is set to true"
-      run install_cmd
+      logger.info "Skipping bundler install as :bundle_enable is set to false"
     else
-      run "if [ -e #{bundle_gemfile} ] ; then #{install_cmd} ; else true ; fi"
+      run install_cmd
     end
   end
 
@@ -64,7 +71,7 @@ namespace :bundler do
   [internal]Determine whether the requirements for your application are installed and available to bundler
   }
   task :check, :except => {:no_release => true} do
-    run "bundle check --gemfile #{bundle_gemfile}"
+    run "cd #{latest_release} && #{bundle_cmd} check --gemfile #{bundle_gemfile}"
   end
 
 end

data/lib/brightbox/recipes/callbacks.rb

@@ -25,9 +25,7 @@ after "deploy:setup",
   "deploy:shared:global:setup",
   "deploy:shared:local:setup",
   "configure:maintenance",
-  "configure:logrotation",
-  "configure:apache",
-  "configure:nginx"
+  "configure:logrotation"
 
 after "deploy:finalize_update",
   "deploy:shared:global:symlink",

data/lib/brightbox/recipes/configure.rb

@@ -19,18 +19,12 @@
 #
 
 # Commands
-_cset :monit_command, "railsapp-monit"
+
 _cset :apache_command, "railsapp-apache"
 _cset :nginx_command, "railsapp-nginx"
-_cset :mongrel_command, "railsapp-mongrel"
 _cset :logrotate_command, "railsapp-logrotate"
 _cset :maintenance_command, "railsapp-maintenance"
 
-def monit_setup
-  "#{fetch(:monit_command)} _#{::Version}_"
-end
-depend :remote, :command, fetch(:monit_command)
-
 def apache_setup
   "#{fetch(:apache_command)} _#{::Version}_"
 end
@@ -41,11 +35,6 @@ def nginx_setup
 end
 depend :remote, :command, fetch(:nginx_command)
 
-def mongrel_setup
-  "#{fetch(:mongrel_command)} _#{::Version}_"
-end
-depend :remote, :command, fetch(:mongrel_command)
-
 def logrotate_setup
   "#{fetch(:logrotate_command)} _#{::Version}_"
 end
@@ -56,8 +45,6 @@ def maintenance_setup
 end
 depend :remote, :command, fetch(:maintenance_command)
 
-Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), 'configure', 'mongrel.rb')
-
 namespace :configure do
 
   desc %Q{
@@ -83,7 +70,7 @@ namespace :configure do
   desc %Q{
   [internal]Create the default maintenance website on the appropriate web servers in the shared area.
   }
-  task :maintenance, :roles => :web, :except => {:no_release => true} do
+  task :maintenance, :roles => :web, :except => {:no_release => true}, :on_no_matching_servers => :continue do
     run "#{maintenance_setup} #{shared_path}/system"
   end
 

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

@@ -18,26 +18,48 @@
 #    <http://www.gnu.org/licenses/>.
 #
 
+_cset :monit_command, "railsapp-monit"
+_cset :mongrel_command, "railsapp-mongrel"
+def monit_setup
+  "#{fetch(:monit_command)} _#{::Version}_"
+end
+depend :remote, :command, fetch(:monit_command)
+
+def mongrel_setup
+  "#{fetch(:mongrel_command)} _#{::Version}_"
+end
+depend :remote, :command, fetch(:mongrel_command)
+
+# Default system dependencies
+depend :remote, :command, "mongrel_rails"
+
+_cset :mongrel_pid_file, "tmp/pids/mongrel.pid"  #Stores Process ID for Mongrels
+_cset :mongrel_host, :local
+_cset :mongrel_port, 9200
+_cset :mongrel_servers, 2
+_cset(:mongrel_config_file) {File.join(deploy_to, "#{application}_mongrel_config.yml")}
+case mongrel_host
+when :local, :remote
+  _cset :mongrel_check_url, "http://localhost"
+else
+  _cset :mongrel_check_url, "http://#{mongrel_host}"
+end
+_cset :mongrel_max_memory, 110
+_cset :mongrel_max_cpu, 80
+
+
 after "deploy:setup",
   "configure:monit",
   "configure:mongrel"
+  "configure:apache",
+  "configure:nginx"
+
 
 after "deploy:cold",
   "deploy:monit:reload"
 
 namespace :configure do
 
-  # Runs the given block when generating webserver configuration is allowed.
-  # 
-  # Basically, runs the block unless "set :generate_webserver_config, false" is in deploy.rb
-  def run_when_generating_webserver_config_allowed
-    if generate_webserver_config
-      yield if block_given?
-    else
-      logger.trace "Skipped - Not generating webserver config"
-    end
-  end
-
 [:nginx, :apache].each do |webserver|
   desc %Q{
   [internal]Create #{webserver.to_s} config. Creates a load balancing virtual host \
@@ -149,4 +171,4 @@ end
         )
   end
   
-end
+end

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

@@ -18,8 +18,12 @@
 #    <http://www.gnu.org/licenses/>.
 #
 
+_cset :passenger_restart_strategy, :soft
+
+after "deploy:setup", "configure:apache"
+
 namespace :configure do
-  
+
   desc %Q{
   [internal]Create Apache config. Creates a load balancing virtual host \
   configuration based upon your specified settings
@@ -51,11 +55,6 @@ namespace :configure do
           )
     end
   end
-  
-  task :mongrel, :roles => :app, :except => {:no_release => true} do
-  end
-  
-  task :monit, :roles => :app, :except => {:no_release => true} do
-  end
-  
-end
+
+
+end

data/lib/brightbox/recipes/deploy.rb

@@ -1,5 +1,5 @@
 #    Brightbox - Easy Ruby Web Application Deployment
-#    Copyright (C) 2008, Neil Wilson, Brightbox Systems
+#    Copyright (C) 2013, Neil Wilson, John Leach, Brightbox Systems
 #
 #    This file is part of the Brightbox deployment system
 #
@@ -17,10 +17,6 @@
 #    Public License along with this program.  If not, see
 #    <http://www.gnu.org/licenses/>.
 #
-# Override standard tasks that don't do what we want
-
-# 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')
 
 if File.exists?("config/deploy.local.rb")
   Capistrano::Configuration.instance(true).load 'config/deploy.local.rb'
@@ -33,7 +29,7 @@ namespace :deploy do
     desc %Q{
       Reload the webserver
     }
-    task :reload, :roles => :web, :except => {:no_release => true } do
+    task :reload, :roles => :web, :except => {:no_release => true }, :on_no_matching_servers => :continue do
       %w(apache2 nginx).each do |webserver|
         initscript = "/etc/init.d/#{webserver}"
         sudo %Q{
@@ -45,7 +41,7 @@ namespace :deploy do
     desc %Q{
     [internal]reload web server if first release
     }
-    task :reload_if_new, :roles => :web, :except => {:no_release => true} do
+    task :reload_if_new, :roles => :web, :except => {:no_release => true}, :on_no_matching_servers => :continue do
       reset! :releases
       reload if releases.length == 1
     end
@@ -58,7 +54,7 @@ namespace :deploy do
       Return a 503 Service Temporarily Unavailable error code and display \
       the 'system maintenance' page.
     }
-    task :disable, :roles => :web, :except => { :no_release => true } do
+    task :disable, :roles => :web, :except => { :no_release => true }, :on_no_matching_servers => :continue do
       on_rollback {
         run "rm #{maintenance_page}"
       }
@@ -69,7 +65,7 @@ namespace :deploy do
       Makes the application web-accessible again. Removes the link \
       to the maintenance area.
     }
-    task :enable, :roles => :web, :except => { :no_release => true } do
+    task :enable, :roles => :web, :except => { :no_release => true }, :on_no_matching_servers => :continue do
       run "rm #{maintenance_page}"
     end
 
@@ -90,7 +86,7 @@ namespace :deploy do
     desc %Q{
       Execute Rake tasks that need to be run once per system
     }
-    task :singleton, :roles => :db, :only => {:primary => true} do
+    task :singleton, :roles => :db, :only => {:primary => true}, :on_no_matching_servers => :continue do
       run rake_task("db:create")
     end
 

data/lib/brightbox/recipes/helpers.rb

@@ -18,30 +18,11 @@
 #    <http://www.gnu.org/licenses/>.
 #
 def rake_task(taskname)
-  rake = fetch(:rake, "rake")
+  rake = fetch(:rake)
   rake_env = fetch(:rake_env, "")
-  in_rails_root("#{rake} #{rake_env} #{taskname}")
-end
-
-# Runs the command under bundle exec if there is a Gemfile, otherwise
-# runs it without
-def bundle_exec(command)
-  if bundle_disable
-    %Q{RAILS_ENV=#{rails_env} #{command}}
-  else
-%Q{
-if [ "#{bundle_force}" = "true" -o -f "#{bundle_gemfile}" ] ;
-then  RAILS_ENV=#{rails_env} bundle exec #{command} ;
-else RAILS_ENV=#{rails_env} #{command} ;
-fi
-}
-end
-end
-
-def in_rails_root(taskname)
-  rails_env = fetch(:rails_env, "production")
   directory = current_release
-  "cd #{directory} ; #{bundle_exec(taskname)}"
+  # FIXME
+  "cd #{directory} ; #{rake} RAILS_ENV=#{rails_env} #{rake_env} #{taskname}"
 end
 
 def on_one_line(cmd_list)
@@ -62,3 +43,14 @@ def depend location, type, *args
     cap_depend(location, type, *args) 
   end
 end
+
+# Runs the given block when generating webserver configuration is allowed.
+# 
+# Basically, runs the block unless "set :generate_webserver_config, false" is in deploy.rb
+def run_when_generating_webserver_config_allowed
+  if fetch(:generate_webserver_config, true)
+    yield if block_given?
+  else
+    logger.trace "Skipped - Not generating webserver config"
+  end
+end

data/lib/brightbox/recipes/packages.rb

@@ -2,8 +2,10 @@ before "gems:install", "packages:install"
 
 namespace :packages do
 
+  _cset(:packages_install, true)
+
   def install_package name
-    run %Q{dpkg-query --show -f '${Status}' #{name} 2>/dev/null|egrep -q "^install ok installed$" || sudo -p '#{sudo_prompt}' apt-get install -qy #{name}}
+    run %Q{dpkg-query --show -f '${Status}' #{name} 2>/dev/null|egrep -q "^install ok installed$" || #{sudo} apt-get install -qy #{name}}
   end
 
   def package_dependencies?
@@ -14,21 +16,28 @@ namespace :packages do
 
   def install_packages
     deps = package_dependencies?
-    puts "Updating apt-get"
-    sudo "apt-get update -qy >/dev/null"
-    deps.each do |pkg|
-      name = pkg
-      puts "Checking for #{name}"
-      install_package(name)
+    if deps.empty?
+      logger.info "Skipping, no packages defined for installation"
+    else
+      logger.info "Updating package information with apt-get"
+      run "#{sudo} apt-get update -qy >/dev/null"
+      deps.each do |pkg|
+        name = pkg
+        logger.info "Checking for package #{name}"
+        install_package(name)
+      end
     end
   end
 
   desc %Q{
   [internal]Run the packages install task in the application.
   }
-  task :install, :except => {:no_release => true} do
-    puts "Checking required packages are installed"
-    install_packages
+  task :install, :except => {:no_release => true, :packages_install => false}, :on_no_matching_servers => :continue do
+    if fetch(:packages_install)
+      install_packages
+    else
+      logger.info "Skipping packages:install as :packages_install is set to false"
+    end
   end
 
-end
+end

data/lib/brightbox/recipes/variables.rb

@@ -18,28 +18,15 @@
 #    <http://www.gnu.org/licenses/>.
 #
 # Provide default settings for variables
-_cset :mongrel_pid_file, "tmp/pids/mongrel.pid"  #Stores Process ID for Mongrels
+
 _cset :log_max_size, "100M"                 #Size at which to rotate log
 _cset :log_keep, "10"                       #Keep this many compressed logs
 _cset(:log_dir) {File.join(current_path, 'log')}
-_cset :mongrel_host, :local
-_cset :mongrel_port, 9200
-_cset :mongrel_servers, 2
-_cset(:mongrel_config_file) {File.join(deploy_to, "#{application}_mongrel_config.yml")}
-case mongrel_host
-when :local, :remote
-  _cset :mongrel_check_url, "http://localhost"
-else
-  _cset :mongrel_check_url, "http://#{mongrel_host}"
-end
-_cset :mongrel_max_memory, 110
-_cset :mongrel_max_cpu, 80
 _cset(:domain) { abort "You need to set the :domain variable, e.g set :domain 'www.example.com'" }
 _cset :domain_aliases, nil
 _cset :max_age, nil
 _cset :user, "rails"
 _cset :runner, user
-_cset :passenger_restart_strategy, :hard
 _cset :use_sudo, false
 _cset :ssl_certificate, nil
 _cset :ssl_intermediate, nil
@@ -48,12 +35,9 @@ _cset :generate_webserver_config, true
 _cset :rails_env, "production"
 ssh_options[:forward_agent] = true
 
-# Default system dependencies
-depend :remote, :command, "mongrel_rails"
-
 # Default shared areas
 _cset :local_shared_dirs, []
 _cset :local_shared_files, []
 _cset :global_shared_dirs, []
 _cset :global_shared_files, []
-_cset(:global_shared_path) { shared_path }
+_cset(:global_shared_path) { shared_path }

data/lib/brightbox/version.rb

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

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: brightbox
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 9
-  version: 2.3.9
+version: !ruby/object:Gem::Version
+  prerelease: 6
+  version: 2.4.0.pre1
 platform: ruby
-authors: 
+authors:
 - John Leach
 - Neil Wilson
 - David Smalley
@@ -17,36 +12,51 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  type: :runtime
   name: capistrano
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.14'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: *id001
+  name: bundler
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+    none: false
 description: 
 email: support@brightbox.co.uk
-executables: 
+executables:
 - brightbox
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - lib/brightbox/recipes.rb
 - lib/brightbox/version.rb
+- lib/brightbox/mongrel.rb
 - lib/brightbox/passenger.rb
 - lib/brightbox/recipes/variables.rb
 - lib/brightbox/recipes/helpers.rb
@@ -66,36 +76,26 @@ files:
 - bin/brightbox
 homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
 rubyforge_project: brightbox
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Brightbox rails deployment scripts for Capistrano
 test_files: []
-