brightbox 0.24 → 0.25

data/bin/brightbox-monit

@@ -20,7 +20,7 @@ OptionParser.new do |opts|
   ) { |value| @railsroot = value }
   opts.on("-e", "--railsenv RAILS_ENV",
     "rails environment"
-  ) { |value| @railsroot = value }
+  ) { |value| @railsenv = value }
   opts.on("-p", "--port MONGREL_PORT",
     "Port of the first mongrel sevuce"
   ) { |value| @port = value.to_i }

data/lib/brightbox/recipes.rb

@@ -1,4 +1,5 @@
 require 'mongrel_cluster/recipes'
+require 'yaml'
 
 Capistrano.configuration(:must_exist).load do
 
@@ -16,12 +17,12 @@ end
 
 desc "Load the rails db schema on the primary db server"
 task :load_schema, :roles => :db, :primary => true do
-  run "cd #{current_path} && #{rake} RAILS_ENV=#{rails_env} db:schema:load"
+  run "cd #{current_path} && #{rake} RAILS_ENV=#{(rails_env||"production").to_s} db:schema:load"
 end
 
 desc "Configure monit to handle the mongrel servers for this app"
 task :configure_mongrel_cluster, :roles => :app do
-  sudo "/usr/bin/brightbox-monit -n #{application} -r #{current_path} -p #{mongrel_port} -s #{mongrel_servers} -h #{mongrel_host}"
+  sudo "/usr/bin/brightbox-monit -n #{application} -r #{current_path} -e #{(rails_env||"production").to_s} -p #{mongrel_port} -s #{mongrel_servers} -h #{mongrel_host}"
 end
 
 desc "Restart the mongrel servers using monit"
@@ -104,11 +105,17 @@ end
   
 def read_db_config
     db_config = YAML.load_file('config/database.yml')
-    set :db_adapter, db_config["production"]["adapter"]
-    set :db_user, db_config["production"]["username"]
-    set :db_password, db_config["production"]["password"] 
-    set :db_name, db_config["production"]["database"]
-    set :db_host, db_config["production"]["host"]
+    set :db_adapter, db_config[(rails_env||"production").to_s]["adapter"]
+    set :db_user, db_config[(rails_env||"production").to_s]["username"]
+    set :db_password, db_config[(rails_env||"production").to_s]["password"] 
+    set :db_name, db_config[(rails_env||"production").to_s]["database"]
+    set :db_host, db_config[(rails_env||"production").to_s]["host"]
+    if db_host !~ /^sqlreadwrite/
+      logger.important "WARNING: Database host is not sqlreadwrite as per the Brightbox requirements"
+    end
+    if db_name !~ /^#{db_user}\_/
+      logger.important "WARNING: Database name is not prefixed with MySQL username as per the Brightbox requirements"
+    end
 end
 
 end

metadata

@@ -1,65 +1,21 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: "0.24"
-date: 2007-11-02 00:00:00 +00:00
-summary: Brightbox rails deployment scripts for Capistrano
-require_paths: 
-- lib
-email: john@brightbox.co.uk
-homepage: http://rubyforge.org/projects/brightbox/
-rubyforge_project: 
-description: 
-autorequire: name
-default_executable: brightbox
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.25"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - John Leach
-files: 
-- bin/brightbox-apache
-- bin/brightbox-monit
-- bin/brightbox
-- lib/brightbox
-- lib/brightbox/recipes.rb
-- lib/brightbox/generators
-- lib/brightbox/generators/loader.rb
-- lib/brightbox/generators/brightbox
-- lib/brightbox/generators/brightbox/brightboxapache_generator.rb
-- lib/brightbox/generators/brightbox/brightbox_generator.rb
-- lib/brightbox/generators/brightbox/templates
-- lib/brightbox/generators/brightbox/templates/deploy.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: 
-- brightbox
-- brightbox-apache
-- brightbox-monit
-extensions: []
-
-requirements: []
+autorequire: name
+bindir: bin
+cert_chain: []
 
+date: 2007-12-28 00:00:00 +00:00
+default_executable: brightbox
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,9 +27,60 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: mongrel_cluster
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.2
     version: 
+description: 
+email: john@brightbox.co.uk
+executables: 
+- brightbox
+- brightbox-apache
+- brightbox-monit
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- bin/brightbox-apache
+- bin/brightbox-monit
+- bin/brightbox
+- lib/brightbox
+- lib/brightbox/recipes.rb
+- lib/brightbox/generators
+- lib/brightbox/generators/loader.rb
+- lib/brightbox/generators/brightbox
+- lib/brightbox/generators/brightbox/brightboxapache_generator.rb
+- lib/brightbox/generators/brightbox/brightbox_generator.rb
+- lib/brightbox/generators/brightbox/templates
+- lib/brightbox/generators/brightbox/templates/deploy.rb
+has_rdoc: false
+homepage: http://rubyforge.org/projects/brightbox/
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Brightbox rails deployment scripts for Capistrano
+test_files: []
+