brightbox 2.2.2 → 2.3

data/bin/brightbox

@@ -227,6 +227,17 @@ unless Rake::Task.task_defined?("db:check:config")
     ### Other options you can set ##
     # Comma separated list of additional domains for Apache
     # set :domain_aliases, "www.example.com,dev.example.com"
+    
+    ## Dependencies
+    # Set the commands and gems that your application requires. e.g.
+    # depend :remote, :gem, "will_paginate", ">=2.2.2"
+    # depend :remote, :command, "brightbox"
+    # 
+    # Gem with a source (such as github)
+    # depend :remote, :gem, "tmm1-amqp", ">=0.6.0", "http://gems.github.com"
+    # 
+    # Specify your specific Rails version if it is not vendored
+    # depend :remote, :gem, "rails", "=2.2.2"
 
     ## Local Shared Area
     # These are the list of files and directories that you want
@@ -325,12 +336,7 @@ unless Rake::Task.task_defined?("db:check:config")
     # 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
+    # set :runner, user\n\n
   FILE
 }
 

data/lib/brightbox/recipes/configure.rb

@@ -18,35 +18,43 @@
 #    <http://www.gnu.org/licenses/>.
 #
 
+# 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
-  "railsapp-monit _#{::Version}_"
+  "#{fetch(:monit_command)} _#{::Version}_"
 end
-depend :remote, :command, monit_setup
+depend :remote, :command, fetch(:monit_command)
 
 def apache_setup
-  "railsapp-apache _#{::Version}_"
+  "#{fetch(:apache_command)} _#{::Version}_"
 end
-depend :remote, :command, apache_setup
+depend :remote, :command, fetch(:apache_command)
 
 def nginx_setup
-  "railsapp-nginx _#{::Version}_"
+  "#{fetch(:nginx_command)} _#{::Version}_"
 end
-depend :remote, :command, nginx_setup
+depend :remote, :command, fetch(:nginx_command)
 
 def mongrel_setup
-  "railsapp-mongrel _#{::Version}_"
+  "#{fetch(:mongrel_command)} _#{::Version}_"
 end
-depend :remote, :command, mongrel_setup
+depend :remote, :command, fetch(:mongrel_command)
 
 def logrotate_setup
-  "railsapp-logrotate _#{::Version}_"
+  "#{fetch(:logrotate_command)} _#{::Version}_"
 end
-depend :remote, :command, logrotate_setup
+depend :remote, :command, fetch(:logrotate_command)
 
 def maintenance_setup
-  "railsapp-maintenance _#{::Version}_"
+  "#{fetch(:maintenance_command)} _#{::Version}_"
 end
-depend :remote, :command, maintenance_setup
+depend :remote, :command, fetch(:maintenance_command)
 
 Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), 'configure', 'mongrel.rb')
 

data/lib/brightbox/recipes/deploy.rb

@@ -87,9 +87,6 @@ namespace :deploy do
       Execute Rake tasks that need to be run once per system
     }
     task :singleton, :roles => :db, :only => {:primary => true} do
-      unless disable_db_check
-        run rake_task("db:check:config")
-      end
       run rake_task("db:create")
     end
 

data/lib/brightbox/recipes/gems.rb

@@ -26,10 +26,11 @@ namespace :gems do
     install_gem("brightbox-server-tools", ::Version)
   end
   
-  def install_gem(gem, version)
+  def install_gem(gem, version, source = nil)
+    source_arg = source.nil? ? "" : "--source #{source}"
     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}"
+        sudo gem install --no-ri --no-rdoc --version '#{version}' #{source_arg} #{gem}"
     }
   end
   
@@ -43,8 +44,9 @@ namespace :gems do
     deps.each do |gemspec|
       gem = gemspec[0]
       version = gemspec[1]
+      source = gemspec[2]
       puts "Checking for #{gem} at #{version}"
-      install_gem(gem, version)
+      install_gem(gem, version, source)
     end
   end
 
@@ -52,12 +54,8 @@ namespace :gems do
   [internal]Run the gems install task in the application.
   }
   task :install, :except => {:no_release => true} do
-    if gem_dependencies?
-      install_gems
-      sudo rake_task("gems:install")
-    else
-      sudo rake_task("gems:install")
-    end
+    puts "Checking required gems are installed"
+    install_gems
   end
 
 end

data/lib/brightbox/recipes/variables.rb

@@ -39,7 +39,6 @@ _cset :domain_aliases, nil
 _cset :max_age, nil
 _cset :user, "rails"
 _cset :runner, user
-_cset :disable_db_check, false
 _cset :passenger_restart_strategy, :hard
 _cset :use_sudo, false
 _cset :ssl_certificate, nil
@@ -55,4 +54,4 @@ _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.2.2"
+  VERSION = "2.3"
 end
 # Set global scope version so that OptionParser picks it up.
 ::Version = Brightbox::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: "2.3"
 platform: ruby
 authors: 
 - John Leach
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 +00:00
+date: 2009-02-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency