brightbox 2.3.8 → 2.3.9

data/lib/brightbox/recipes/database.rb

@@ -20,9 +20,7 @@
 
 namespace :db do
 
-  desc %Q{
-  [internal]Create the database if it doesn't exist
-  }
+  desc "[internal]Create the database if it doesn't exist"
   task :create, :roles => :db, :only => { :primary => true } do
     run rake_task("db:create")
   end
@@ -38,3 +36,10 @@ namespace :db do
   end
 
 end
+
+namespace :deploy do
+  desc "Run the migrate rake task."
+  task :migrate, :roles => :db, :only => { :primary => true } do
+    run rake_task("db:migrate")
+  end
+end

data/lib/brightbox/recipes/helpers.rb

@@ -23,10 +23,25 @@ def rake_task(taskname)
   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
-  %Q{sh -c 'cd #{directory}; RAILS_ENV=#{rails_env} #{taskname}'}
+  "cd #{directory} ; #{bundle_exec(taskname)}"
 end
 
 def on_one_line(cmd_list)

data/lib/brightbox/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 9
+  version: 2.3.9
 platform: ruby
 authors: 
 - John Leach
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +00:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -65,7 +64,6 @@ files:
 - lib/brightbox/recipes/configure.rb
 - lib/brightbox/maintenance.rb
 - bin/brightbox
-has_rdoc: true
 homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
 licenses: []
 
@@ -95,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Brightbox rails deployment scripts for Capistrano