brightbox 2.3.6 → 2.3.7

data/bin/brightbox

@@ -30,6 +30,8 @@ require 'brightbox/version'
 
 @options = {}
 
+@app_server = :passenger
+
 def has_required_options?
   [@server].all?
 end
@@ -57,7 +59,7 @@ opts = OptionParser.new do |opts|
   ) { |value| @server = value }
   
   opts.on("-a TYPE", "--app TYPE", [:mongrel, :passenger],
-    "App server type, mongrel or passenger"
+    "App server type, mongrel or passenger (default is passenger)"
     ) { |value| @app_server = value }
 
   begin
@@ -106,37 +108,7 @@ files = {
 
   "lib/tasks/bbgem.rake" => unindent(<<-FILE),
     # Generated with '#{opts.program_name}' on #{Time.now}
-unless Rake::Task.task_defined?("gems:install") 
-  def install_gems
-    gems={
-      "ferret" => "~> 0.11",
-      "will_paginate" => "> 0"
-    }
-    gems.each_pair do |gem, version|
-      puts "Checking for \#{gem} at \#{version}"
-      system("gem spec \#{gem} --version '\#{version}' 2>/dev/null|egrep -q '^name:' ||
-              sudo gem install -y --no-ri --no-rdoc --version '\#{version}' \#{gem}")
-    end
-  end
-
-  def gems_upgrade_notice
-    puts "This is a dummy task installed by the Brightbox command"
-    puts "If you need gems to make your application work"
-    puts "Uncomment the install command and alter the gems on the list"
-    puts "... or upgrade to Rails >= 2.1 and use the inbuilt facilities"
-  end
-
-  namespace(:gems) do
-    desc "Installs all required gems for this application."
-    task :install do
-      gems_upgrade_notice
-      #install_gems 
-    end
-  end
-end
-
 unless Rake::Task.task_defined?("db:create") 
-
   namespace(:db) do
     task :create do
       puts "This is a dummy task installed by the Brightbox command"
@@ -148,8 +120,18 @@ unless Rake::Task.task_defined?("db:create")
 end
 unless Rake::Task.task_defined?("db:check:config") 
 
+  def rails_env
+    if defined?(Rails) and Rails.respond_to? :env
+      Rails.env
+    elsif defined?(RAILS_ENV)
+      RAILS_ENV
+    else
+      "production"
+    end
+  end
+
   def pe(message)
-    p "\#{RAILS_ENV}: \#{message}"
+    p "\#{rails_env}: \#{message}"
   end
 
   def brightbox_sanity_checks(config)
@@ -158,8 +140,8 @@ unless Rake::Task.task_defined?("db:check:config")
     end
     db=config['database']
     host=config['host']
-    if host && host != 'sqlreadwrite.brightbox.net'
-      pe "using '\#{host}', not the 'sqlreadwrite.brightbox.net' cluster"
+    if host && host !~ /^.*(sqlreadwrite|mysql\.vm)\.brightbox.net$/
+      pe "'\#{host}' does not look like one of the Brightbox MySQL clusters"
     elsif db && db !~ /\\A\#{config['username']}/
       pe "database name should start with '\#{config['username']}' if using cluster"
     end
@@ -181,7 +163,7 @@ unless Rake::Task.task_defined?("db:check:config")
     desc "Check database.yml config"
     task :config do
       p "Checking database mysql configuration..."
-      if config=read_database_yml[RAILS_ENV]
+      if config=read_database_yml[rails_env]
         case config['adapter']
         when nil
           pe "adapter entry missing."
@@ -218,8 +200,10 @@ unless Rake::Task.task_defined?("db:check:config")
     # Target directory for the application on the web and app servers.
     set(:deploy_to) { File.join("", "home", user, application) }
 
-    # URL of your source repository. This is the default one that comes on 
-    # every Brightbox, you can use your own (we'll let you :)
+    # URL of your source repository. By default this will just upload
+    # the local directory.  You should probably change this if you use
+    # another repository, like git or subversion.
+
     set :repository, "."
     set :scm, :none
     set :deploy_via, :copy
@@ -232,6 +216,10 @@ unless Rake::Task.task_defined?("db:check:config")
     # Set the commands and gems that your application requires. e.g.
     # depend :remote, :gem, "will_paginate", ">=2.2.2"
     # depend :remote, :command, "brightbox"
+    #
+    # If you're using Bundler, then you don't need to specify your
+    # gems here as well as there (and the bundler gem is installed for
+    # you automatically)
     # 
     # Gem with a source (such as github)
     # depend :remote, :gem, "tmm1-amqp", ">=0.6.0", :source => "http://gems.github.com"

data/lib/brightbox/recipes/bundler.rb

@@ -0,0 +1,70 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2010 John Leach
+#
+#    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/>.
+#
+
+after "gems:install", "bundler:install"
+depend :remote, :gem, "bundler", ">=1.0.0"
+
+namespace :bundler do
+
+  _cset(:bundle_dir) { File.join(shared_path, "bundle") }
+  _cset(:bundle_gemfile) { File.join(latest_release, "Gemfile") }
+  _cset(:bundle_without, "development test")
+  _cset(:bundle_flags, "--deployment")
+  # 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
+  _cset(:bundle_force, false)
+  _cset(:bundle_symlink, true)
+
+  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" )
+  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} "
+    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
+    else
+      run "if [ -e #{bundle_gemfile} ] ; then #{install_cmd} ; else true ; fi"
+    end
+  end
+
+  desc %Q{
+  [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}"
+  end
+
+end

data/lib/brightbox/recipes/helpers.rb

@@ -19,11 +19,14 @@
 #
 def rake_task(taskname)
   rake = fetch(:rake, "rake")
-  rails_env = fetch(:rails_env, "production")
   rake_env = fetch(:rake_env, "")
-  directory = current_release 
+  in_rails_root("#{rake} #{rake_env} #{taskname}")
+end
 
-  %Q{sh -c 'cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{rake_env} #{taskname}'}
+def in_rails_root(taskname)
+  rails_env = fetch(:rails_env, "production")
+  directory = current_release
+  %Q{sh -c 'cd #{directory}; RAILS_ENV=#{rails_env} #{taskname}'}
 end
 
 def on_one_line(cmd_list)

data/lib/brightbox/version.rb

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: 2.3.6
+  hash: 13
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 7
+  version: 2.3.7
 platform: ruby
 authors: 
 - John Leach
@@ -12,19 +18,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +00:00
+date: 2010-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: support@brightbox.co.uk
 executables: 
@@ -35,25 +46,24 @@ extra_rdoc_files: []
 
 files: 
 - LICENSE
-- Rakefile
-- brightbox-gemspec.rb
-- lib/brightbox/maintenance.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/version.rb
+- lib/brightbox/passenger.rb
 - lib/brightbox/recipes/variables.rb
-- lib/brightbox/recipes/database.rb
+- lib/brightbox/recipes/helpers.rb
 - lib/brightbox/recipes/configure/mongrel.rb
 - lib/brightbox/recipes/configure/passenger.rb
+- lib/brightbox/recipes/database.rb
+- lib/brightbox/recipes/deploy.rb
 - lib/brightbox/recipes/deploy/mongrel.rb
 - lib/brightbox/recipes/deploy/passenger.rb
-- lib/brightbox/recipes/gems.rb
 - lib/brightbox/recipes/callbacks.rb
-- lib/brightbox/passenger.rb
+- lib/brightbox/recipes/packages.rb
+- lib/brightbox/recipes/gems.rb
+- lib/brightbox/recipes/bundler.rb
+- lib/brightbox/recipes/shared_assets.rb
+- lib/brightbox/recipes/configure.rb
+- lib/brightbox/maintenance.rb
 - bin/brightbox
 has_rdoc: true
 homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
@@ -65,21 +75,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Brightbox rails deployment scripts for Capistrano

data/Rakefile

@@ -1,28 +0,0 @@
-require 'rake/gempackagetask'
-require "brightbox-gemspec.rb"
-
-namespace :client do
-  Rake::GemPackageTask.new(@client).define
-
-  task :default => [:reinstall, :clobber_package]
-
-  desc "Reinstall the client gem locally"
-  task :reinstall => [:repackage] do
-    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
-
-namespace :server do
-  Rake::GemPackageTask.new(@server).define
-end
-
-task :clobber_package => "client:clobber_package"
-task :package => ["client:package", "server:package"]
-task :repackage => ["client:repackage", "server:package"]

data/brightbox-gemspec.rb

@@ -1,46 +0,0 @@
-#    Brightbox - Easy Ruby Web Application Deployment
-#    Copyright (C) 2008, Neil Wilson, 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/>.
-#
-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", "Caius Durling"]
-  spec.email = "support@brightbox.co.uk"
-  spec.homepage = "http://wiki.brightbox.co.uk/docs:gemv2:start"
-  spec.rubyforge_project = 'brightbox'
-  spec.has_rdoc = false
-end
-
-@server = Gem::Specification.new do |s|
-  add_common(s)
-  s.name = "brightbox-server-tools"
-  s.files = FileList["LICENSE", "Rakefile", "*.rb", "bin/railsapp-*","lib/**/*.{rb,gz}"].exclude(/recipe/).to_a
-  s.summary = "Brightbox Server configuration scripts"
-  s.executables = FileList["bin/railsapp-*"].sub(/bin\//,'')
-end
-
-@client = Gem::Specification.new do |s|
-  add_common(s)
-  s.name = "brightbox"
-  s.files = FileList["LICENSE", "Rakefile", "*.rb", "lib/**/*.rb","bin/brightbox"].exclude("lib/brightbox/webserver-common.rb").to_a
-  s.add_dependency("capistrano", ">= 2.5")
-  s.summary = "Brightbox rails deployment scripts for Capistrano"
-  s.executable = 'brightbox'
-end
-