engineyard-serverside 1.5.2 → 1.5.4

data/lib/engineyard-serverside.rb

@@ -24,7 +24,6 @@ require 'engineyard-serverside/server'
 require 'engineyard-serverside/deploy'
 require 'engineyard-serverside/deploy_hook'
 require 'engineyard-serverside/lockfile_parser'
-require 'engineyard-serverside/bundle_installer'
 require 'engineyard-serverside/cli'
 require 'engineyard-serverside/configuration'
 require 'engineyard-serverside/deprecation'

data/lib/engineyard-serverside/configuration.rb

@@ -5,8 +5,9 @@ module EY
   module Serverside
     class Deploy::Configuration
       DEFAULT_CONFIG = Thor::CoreExt::HashWithIndifferentAccess.new({
-        "branch"       => "master",
-        "strategy"     => "Git",
+        "branch"         => "master",
+        "strategy"       => "Git",
+        "bundle_without" => "test development",
       })
 
       attr_reader :configuration
@@ -73,6 +74,10 @@ module EY
         configuration['migrate'] == "migrate" ? DEFAULT_CONFIG["migrate"] : configuration['migrate']
       end
 
+      def bundle_without
+        configuration['bundle_without']
+      end
+
       def user
         configuration['user'] || ENV['USER']
       end
@@ -130,6 +135,18 @@ module EY
         File.join(deploy_to, "shared")
       end
 
+      def bundled_gems_path
+        File.join(shared_path, "bundled_gems")
+      end
+
+      def ruby_version_file
+        File.join(bundled_gems_path, "RUBY_VERSION")
+      end
+
+      def system_version_file
+        File.join(bundled_gems_path, "SYSTEM_VERSION")
+      end
+
       def release_dir
         File.join(deploy_to, "releases")
       end

data/lib/engineyard-serverside/deploy.rb

@@ -14,7 +14,6 @@ module EY
       def deploy
         debug "Starting deploy at #{Time.now.asctime}"
         update_repository_cache
-        check_repository
         cached_deploy
       end
 
@@ -25,6 +24,7 @@ module EY
 
         info "~> Starting full deploy"
         copy_repository_cache
+        check_repository
 
         with_failed_release_cleanup do
           create_revision_file
@@ -52,14 +52,32 @@ module EY
       end
 
       def check_repository
-        if gemfile? && lockfile
-          unless lockfile.any_database_adapter?
-            warning <<-WARN
-Gemfile.lock does not contain a recognized databaseadapter.
+        if gemfile?
+          info "~> Gemfile found."
+          if lockfile
+            info "~> Gemfile.lock found."
+            unless lockfile.any_database_adapter?
+              warning <<-WARN
+Gemfile.lock does not contain a recognized database adapter.
 A database-adapter gem such as mysql2, mysql, or do_mysql was expected.
 This can prevent applications that use MySQL or PostreSQL from booting.
+
+To fix, add any needed adapter to your Gemfile, bundle, commit, and redeploy.
+Applications that don't use MySQL or PostgreSQL can safely ignore this warning.
+              WARN
+            end
+          else
+            warning <<-WARN
+Gemfile.lock is missing!
+You can get different versions of gems in production than what you tested with.
+You can get different versions of gems on every deployment even if your Gemfile hasn't changed.
+Deploying will take longer.
+
+To fix this problem, commit your Gemfile.lock to your repository and redeploy.
             WARN
           end
+        else
+          info "~> No Gemfile. Deploying without bundler support."
         end
       end
 
@@ -312,25 +330,20 @@ This can prevent applications that use MySQL or PostreSQL from booting.
         raise
       end
 
-      def warn_about_missing_lockfile
-        warning <<-WARN
-Gemfile.lock is missing!
-You can get different versions of gems in production than what you tested with.
-You can get different versions of gems on every deployment even if your Gemfile hasn't changed.
-Deploying will take longer.
-
-To fix this problem, commit your Gemfile.lock to your repository.
-        WARN
-      end
+      def bundler_config
+        version = LockfileParser.default_version
+        options = [
+          "--path #{c.bundled_gems_path}",
+          "--binstubs #{c.binstubs_path}",
+          "--without #{c.bundle_without}"
+        ]
 
-      def get_bundler_installer
         if lockfile
-          bundler_10_installer(lockfile.bundler_version)
-        else
-          warn_about_missing_lockfile
-          # deployment mode is not supported without a Gemfile.lock, so we turn that off.
-          bundler_10_installer(LockfileParser.default_version, deployment_mode = false)
+          version = lockfile.bundler_version
+          options.unshift('--deployment') # deployment mode is not supported without a Gemfile.lock
         end
+
+        return [version, options.join(' ')]
       end
 
       def lockfile
@@ -342,44 +355,32 @@ To fix this problem, commit your Gemfile.lock to your repository.
         end
       end
 
-      # Set +deploymemt_mode+ to false to avoid passing the --deployment flag.
-      def bundler_10_installer(version, deployment_mode = true)
-        options = ["--path #{c.shared_path}/bundled_gems",
-                   "--binstubs #{c.binstubs_path}",
-                   "--without development test"]
-        options.unshift('--deployment') if deployment_mode
-        BundleInstaller.new(version, options.join(' '))
-      end
-
       def check_ruby_bundler
         if gemfile?
-          info "~> Gemfile detected, bundling gems"
+          info "~> Bundling gems..."
 
-          bundler_installer = get_bundler_installer
+          bundler_version, install_switches = bundler_config
 
-          sudo "#{clean_environment} && #{serverside_bin} install_bundler #{bundler_installer.version}"
+          sudo "#{clean_environment} && #{serverside_bin} install_bundler #{bundler_version}"
 
-          bundled_gems_path = File.join(c.shared_path, "bundled_gems")
-          ruby_version_file = File.join(bundled_gems_path, "RUBY_VERSION")
-          system_version_file = File.join(bundled_gems_path, "SYSTEM_VERSION")
-          ruby_version = `ruby -v`
+          ruby_version   = `ruby -v`
           system_version = `uname -m`
 
-          if File.directory?(bundled_gems_path)
+          if File.directory?(c.bundled_gems_path)
             rebundle = false
 
-            rebundle = true if File.exist?(ruby_version_file) && File.read(ruby_version_file) != ruby_version
-            rebundle = true if File.exist?(system_version_file) && File.read(system_version_file) != system_version
+            rebundle = true if File.exist?(c.ruby_version_file)   && File.read(c.ruby_version_file)   != ruby_version
+            rebundle = true if File.exist?(c.system_version_file) && File.read(c.system_version_file) != system_version
 
             if rebundle
               info "~> Ruby version change detected, cleaning bundled gems"
-              run "rm -Rf #{bundled_gems_path}"
+              run "rm -Rf #{c.bundled_gems_path}"
             end
           end
 
-          run "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
+          run "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
 
-          run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
+          run "mkdir -p #{c.bundled_gems_path} && ruby -v > #{c.ruby_version_file} && uname -m > #{c.system_version_file}"
         end
       end
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.2'
+    VERSION = '1.5.4'
   end
 end

data/spec/bundler_deploy_spec.rb

@@ -15,14 +15,15 @@ describe "Deploying an application that uses Bundler" do
 
     # run a deploy
     config = EY::Serverside::Deploy::Configuration.new({
-        "strategy"      => "IntegrationSpec",
-        "deploy_to"     => @deploy_dir,
-        "group"         => `id -gn`.strip,
-        "stack"         => 'nginx_passenger',
-        "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
-        'app'           => 'foo',
-        'framework_env' => 'staging'
-      })
+      "strategy"       => "IntegrationSpec",
+      "deploy_to"      => @deploy_dir,
+      "group"          => `id -gn`.strip,
+      "stack"          => 'nginx_passenger',
+      "migrate"        => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
+      'app'            => 'foo',
+      'framework_env'  => 'staging',
+      'bundle_without' => 'release test',
+    })
 
     # pretend there is a shared bundled_gems directory
     FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
@@ -68,6 +69,12 @@ describe "Deploying an application that uses Bundler" do
       File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
     end
 
+    it "runs 'bundle install' with custom --without options" do
+      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd.should_not be_nil
+      bundle_install_cmd.should include("--without release test")
+    end
+
     it "creates a ruby version file" do
       File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
     end

data/spec/deprecation_spec.rb

@@ -19,7 +19,7 @@ describe EY::Serverside do
   end
 
   it "preserves the old constants" do
-    names = %w[BundleInstaller CLI Deploy DeployBase Deploy::Configuration
+    names = %w[CLI Deploy DeployBase Deploy::Configuration
                DeployHook LockfileParser LoggedOutput Server Task
                Strategies Strategies::Git]
 

data/spec/lockfile_parser_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "the bundler version retrieved from the lockfile" do
   def load_lockfile(file)
-    File.read(File.expand_path("../support/lockfiles/#{file}", __FILE__))
+    File.read(File.expand_path("../fixtures/lockfiles/#{file}", __FILE__))
   end
 
   def get_parser(file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 -07:00
+date: 2011-10-21 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,6 @@ extra_rdoc_files: []
 
 files: 
 - bin/engineyard-serverside
-- lib/engineyard-serverside/bundle_installer.rb
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/configuration.rb
 - lib/engineyard-serverside/default_maintenance_page.html
@@ -272,6 +271,19 @@ files:
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
+- spec/fixtures/lockfiles/0.9-no-bundler
+- spec/fixtures/lockfiles/0.9-with-bundler
+- spec/fixtures/lockfiles/1.0-no-bundler
+- spec/fixtures/lockfiles/1.0.0.rc.1-with-bundler
+- spec/fixtures/lockfiles/1.0.18-do_mysql
+- spec/fixtures/lockfiles/1.0.18-do_postgres
+- spec/fixtures/lockfiles/1.0.18-mysql
+- spec/fixtures/lockfiles/1.0.18-mysql2
+- spec/fixtures/lockfiles/1.0.18-pg
+- spec/fixtures/lockfiles/1.0.6-no-bundler
+- spec/fixtures/lockfiles/1.0.6-with-any-bundler
+- spec/fixtures/lockfiles/1.0.6-with-bundler
+- spec/fixtures/lockfiles/not-a-lockfile
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
@@ -281,19 +293,6 @@ files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
-- spec/support/lockfiles/0.9-no-bundler
-- spec/support/lockfiles/0.9-with-bundler
-- spec/support/lockfiles/1.0-no-bundler
-- spec/support/lockfiles/1.0.0.rc.1-with-bundler
-- spec/support/lockfiles/1.0.18-do_mysql
-- spec/support/lockfiles/1.0.18-do_postgres
-- spec/support/lockfiles/1.0.18-mysql
-- spec/support/lockfiles/1.0.18-mysql2
-- spec/support/lockfiles/1.0.18-pg
-- spec/support/lockfiles/1.0.6-no-bundler
-- spec/support/lockfiles/1.0.6-with-any-bundler
-- spec/support/lockfiles/1.0.6-with-bundler
-- spec/support/lockfiles/not-a-lockfile
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
@@ -337,6 +336,19 @@ test_files:
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
+- spec/fixtures/lockfiles/0.9-no-bundler
+- spec/fixtures/lockfiles/0.9-with-bundler
+- spec/fixtures/lockfiles/1.0-no-bundler
+- spec/fixtures/lockfiles/1.0.0.rc.1-with-bundler
+- spec/fixtures/lockfiles/1.0.18-do_mysql
+- spec/fixtures/lockfiles/1.0.18-do_postgres
+- spec/fixtures/lockfiles/1.0.18-mysql
+- spec/fixtures/lockfiles/1.0.18-mysql2
+- spec/fixtures/lockfiles/1.0.18-pg
+- spec/fixtures/lockfiles/1.0.6-no-bundler
+- spec/fixtures/lockfiles/1.0.6-with-any-bundler
+- spec/fixtures/lockfiles/1.0.6-with-bundler
+- spec/fixtures/lockfiles/not-a-lockfile
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
@@ -346,16 +358,3 @@ test_files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
-- spec/support/lockfiles/0.9-no-bundler
-- spec/support/lockfiles/0.9-with-bundler
-- spec/support/lockfiles/1.0-no-bundler
-- spec/support/lockfiles/1.0.0.rc.1-with-bundler
-- spec/support/lockfiles/1.0.18-do_mysql
-- spec/support/lockfiles/1.0.18-do_postgres
-- spec/support/lockfiles/1.0.18-mysql
-- spec/support/lockfiles/1.0.18-mysql2
-- spec/support/lockfiles/1.0.18-pg
-- spec/support/lockfiles/1.0.6-no-bundler
-- spec/support/lockfiles/1.0.6-with-any-bundler
-- spec/support/lockfiles/1.0.6-with-bundler
-- spec/support/lockfiles/not-a-lockfile

data/lib/engineyard-serverside/bundle_installer.rb

@@ -1,6 +0,0 @@
-module EY
-  module Serverside
-    class BundleInstaller < Struct.new(:version, :options)
-    end
-  end
-end