brightbox 2.3.5 → 2.3.6

data/Rakefile

@@ -8,8 +8,13 @@ namespace :client do
 
   desc "Reinstall the client gem locally"
   task :reinstall => [:repackage] do
-    sh %Q{sudo gem uninstall -x -v #{@client.version} #{@client.name} }
-    sh %q{sudo gem install pkg/*.gem}
+    begin
+      sh %Q{sudo gem uninstall -x -v #{@client.version} #{@client.name} }
+    rescue RuntimeError => e
+      puts "Gem not installed, continuing."
+    end
+    
+    sh %Q{sudo gem install pkg/#{@client.name}-#{@client.version}.gem}
   end
 
 end

data/bin/brightbox

@@ -238,6 +238,9 @@ unless Rake::Task.task_defined?("db:check:config")
     # 
     # Specify your specific Rails version if it is not vendored
     # depend :remote, :gem, "rails", "=2.2.2"
+    #
+    # Set the apt packages your application or gems require. e.g.
+    # depend :remote, :apt, "libxml2-dev"
 
     ## Local Shared Area
     # These are the list of files and directories that you want

data/brightbox-gemspec.rb

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

data/lib/brightbox/recipes/callbacks.rb

@@ -37,6 +37,9 @@ after "deploy:finalize_update",
 after "deploy:update",
   "deploy:cleanup"
 
+after "deploy:initial",
+  "deploy:web:reload_if_new"
+
 after "deploy:start",
   "deploy:web:reload_if_new"
 

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

@@ -27,6 +27,17 @@ after "deploy:cold",
 
 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 \
@@ -43,28 +54,30 @@ namespace :configure do
 
   }
   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
-        )
+    run_when_generating_webserver_config_allowed 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
 end
 

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

@@ -32,19 +32,24 @@ namespace :configure do
 
   }
   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
-        )
+    # Bail out if we don't want to generate config
+    run_when_generating_webserver_config_allowed do
+      # Create the configs
+      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}
+          #{"-i #{ssl_intermediate}" if ssl_intermediate}
+      END
+          )
+    end
   end
   
   task :mongrel, :roles => :app, :except => {:no_release => true} do

data/lib/brightbox/recipes/deploy.rb

@@ -22,6 +22,10 @@
 # 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'
+end
+
 namespace :deploy do
 
   namespace :web do
@@ -94,6 +98,7 @@ namespace :deploy do
       Execute Rake tasks that need to be run on all deployments
     }
     task :global, :except => {:no_release => true} do
+      packages.install
       gems.install
     end
 

data/lib/brightbox/recipes/helpers.rb

@@ -30,4 +30,17 @@ def on_one_line(cmd_list)
   cmd_list.gsub!(/\n/m, ' ')
 end
 
-
+# Override cap's depend method so we can intercept any calls we want to
+# ourselves and act upon them.
+alias :cap_depend :depend
+# Our depend method
+def depend location, type, *args
+  # So far we only care about :remote, :apt. Intercept only that
+  if location == :remote && [:apt].include?(type)
+    # "Translate" this into a :match call cap can handle for us.
+    cap_depend(:remote, :match, "dpkg-query --show -f '${Status}' -- #{args.first}", /^install ok installed$/)
+  else
+    # we don't want to interfere with this, send it on it's merry way
+    cap_depend(location, type, *args) 
+  end
+end

data/lib/brightbox/recipes/packages.rb

@@ -0,0 +1,34 @@
+before "gems:install", "packages:install"
+
+namespace :packages do
+
+  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}}
+  end
+
+  def package_dependencies?
+    matches = (fetch(:dependencies,{})[:remote]||{})[:match] || []
+    # Because we're given the entire dpkg-query command back, pull out just the package name
+    matches.select {|x| x.first[/dpkg-query --show -f '\$\{Status\}'/] }.map {|x| x.first[/\-\- (.+)$/, 1] }
+  end
+
+  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)
+    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
+  end
+
+end

data/lib/brightbox/recipes/variables.rb

@@ -42,7 +42,9 @@ _cset :runner, user
 _cset :passenger_restart_strategy, :hard
 _cset :use_sudo, false
 _cset :ssl_certificate, nil
+_cset :ssl_intermediate, nil
 _cset :ssl_key, nil
+_cset :generate_webserver_config, true
 _cset :rails_env, "production"
 ssh_options[:forward_agent] = true
 

data/lib/brightbox/version.rb

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

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - John Leach
 - Neil Wilson
 - David Smalley
+- Caius Durling
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,24 +38,25 @@ files:
 - 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/version.rb
+- lib/brightbox/recipes.rb
 - lib/brightbox/recipes/configure.rb
+- lib/brightbox/recipes/shared_assets.rb
+- lib/brightbox/recipes/helpers.rb
+- lib/brightbox/recipes/deploy.rb
+- lib/brightbox/recipes/packages.rb
+- lib/brightbox/recipes/variables.rb
 - lib/brightbox/recipes/database.rb
+- lib/brightbox/recipes/configure/mongrel.rb
+- lib/brightbox/recipes/configure/passenger.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/variables.rb
-- lib/brightbox/recipes.rb
-- lib/brightbox/version.rb
+- lib/brightbox/recipes/callbacks.rb
+- lib/brightbox/passenger.rb
 - bin/brightbox
-has_rdoc: false
-homepage: http://wiki.brightbox.co.uk/docs:thebrightboxgem
+has_rdoc: true
+homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
 licenses: []
 
 post_install_message: 
@@ -77,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Brightbox rails deployment scripts for Capistrano