engineyard-serverside 2.0.7 → 2.1.0.pre

data/spec/fixtures/repos/bundle_fails/README

@@ -0,0 +1 @@
+This repo has a bad Gemfile in it and no remote sources.

data/spec/fixtures/repos/bundle_fails/deploy/after_bundle.rb

@@ -0,0 +1 @@
+run 'touch after_bundle.ran'

data/spec/fixtures/repos/default/Gemfile

@@ -1,5 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
-gem 'pg'
 gem 'ey_config'

data/spec/fixtures/repos/default/Gemfile.lock

@@ -1,8 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ey_config (0.0.5)
-    pg (0.13.2)
     rake (0.9.2.2)
 
 PLATFORMS
@@ -10,5 +9,4 @@ PLATFORMS
 
 DEPENDENCIES
   ey_config
-  pg
   rake

data/spec/fixtures/repos/default/ey.yml

@@ -0,0 +1,3 @@
+environments:
+  env:
+    ignore_database_adapter_warning: true

data/spec/fixtures/repos/ey_yml/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 gem 'ey_config'

data/spec/fixtures/repos/ey_yml/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ey_config (0.0.5)
     rake (0.9.2.2)

data/spec/fixtures/repos/ey_yml/config/ey.yml

@@ -1,13 +1,17 @@
+defaults:
+  copy_exclude:
+  - .git
+  - README
+  migrate: true
+  migration_command: 'uh oh'
+  bundle_without: only test development
+  maintenance_on_migrate: false
+  maintenance_on_restart: false
 environments:
   env:
-    copy_exclude:
-    - .git
-    - README
-    migrate: true
-    migration_command: 'uh oh'
     branch: branch_from_ey_yml
     custom: custom_from_ey_yml
     bundle_without: only test
-    maintenance_on_migrate: false
-    maintenance_on_restart: false
     ignore_database_adapter_warning: true
+  env_other:
+    bundle_without: only development

data/spec/fixtures/repos/ey_yml_alt/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 gem 'ey_config'

data/spec/fixtures/repos/ey_yml_alt/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ey_config (0.0.5)
     rake (0.9.2.2)

data/spec/fixtures/repos/no_ey_config/Gemfile

@@ -1,4 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
-gem 'pg'

data/spec/fixtures/repos/no_ey_config/Gemfile.lock

@@ -1,12 +1,10 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    pg (0.11.0)
     rake (0.9.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pg
   rake

data/spec/fixtures/repos/no_ey_config/ey.yml

@@ -0,0 +1,3 @@
+environments:
+  env:
+    ignore_database_adapter_warning: true

data/spec/fixtures/repos/no_gemfile_lock/Gemfile

@@ -1,5 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
-gem 'pg'
 gem 'ey_config'

data/spec/fixtures/repos/no_gemfile_lock/ey.yml

@@ -0,0 +1,3 @@
+environments:
+  env:
+    ignore_database_adapter_warning: true

data/spec/fixtures/repos/sqlite3/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '3.1.3'
 gem 'sqlite3'

data/spec/fixtures/repos/sqlite3/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.1.3)
       actionpack (= 3.1.3)

data/spec/lockfile_parser_spec.rb

@@ -6,7 +6,7 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   def get_parser(file)
-    EY::Serverside::LockfileParser.new(load_lockfile(file))
+    EY::Serverside::DependencyManager::BundlerLock::Lockfile.new(load_lockfile(file))
   end
 
   def get_version(file)
@@ -19,12 +19,12 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   it "has a default version" do
-    EY::Serverside::LockfileParser.default_version.should == "1.1.5"
-    EY::Serverside::LockfileParser::DEFAULT.should == "1.1.5"
+    EY::Serverside::DependencyManager::Bundler.default_version.should_not be_nil
+    EY::Serverside::DependencyManager::Bundler::DEFAULT_VERSION.should_not be_nil
   end
 
   it "returns the default version for a 1.0 lockfile without a bundler dependency" do
-    get_version('1.0-no-bundler').should == EY::Serverside::LockfileParser::DEFAULT
+    get_version('1.0-no-bundler').should == EY::Serverside::DependencyManager::Bundler.default_version
   end
 
   it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do
@@ -47,6 +47,16 @@ describe "the bundler version retrieved from the lockfile" do
     lambda { get_version('not-a-lockfile') }.should raise_error(RuntimeError, /Malformed or pre bundler-1.0.0 Gemfile.lock/)
   end
 
+  context "rails version" do
+    it "retrieves rails version" do
+      get_parser('1.3.1-rails-3.2.13').rails_version.should == "3.2.13"
+    end
+
+    it "finds no rails version" do
+      get_parser('1.0.18-mysql2').rails_version.should == nil
+    end
+  end
+
   context "checking for gems in the dependencies" do
     it "does not have any database adapters in a gemfile lock without them" do
       get_parser('1.0.6-no-bundler').any_database_adapter?.should be_false
@@ -77,31 +87,35 @@ describe "the bundler version retrieved from the lockfile" do
     subject { get_parser('1.0.6-no-bundler') }
 
     it "uses the default version when there is no bundler version" do
-      subject.fetch_version(nil, nil).should == EY::Serverside::LockfileParser::DEFAULT
+      subject.fetch_version(nil, nil).should == EY::Serverside::DependencyManager::Bundler.default_version
+    end
+
+    it "uses the given version when there is no operator" do
+      subject.fetch_version(nil, '1.0.1').should == '1.0.1'
     end
 
     it "uses the given version when the qualifier is `='" do
-      subject.fetch_version('1.0.1', '=').should == '1.0.1'
+      subject.fetch_version('=', '1.0.1').should == '1.0.1'
     end
 
     it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
-      subject.fetch_version('1.1.1', '~>').should == EY::Serverside::LockfileParser::DEFAULT
+      subject.fetch_version('~>', '1.3.1').should == EY::Serverside::DependencyManager::Bundler.default_version
     end
 
     it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do
-      subject.fetch_version('1.0.0', '~>').should == '1.0.0'
+      subject.fetch_version('~>', '1.0.0').should == '1.0.0'
     end
 
     it "uses the given version when it's geater of equal than the default version" do
-      subject.fetch_version('1.2.0', '>=').should == '1.2.0'
+      subject.fetch_version('>=', '1.100.0').should == '1.100.0'
     end
 
     it "uses the default version when the given version is lower" do
-      subject.fetch_version('1.0.1', '>=').should == EY::Serverside::LockfileParser::DEFAULT
+      subject.fetch_version('>=', '1.0.1').should == EY::Serverside::DependencyManager::Bundler.default_version
     end
 
     it "selects only the first version expression" do
-      scan = subject.scan_bundler 'bundler (>=1.0.1, <2.0.0)'
+      scan = subject.scan_gem('bundler', 'bundler (>=1.0.1, <2.0.0)')
       scan.last.should == '1.0.1'
     end
   end

data/spec/rails31_deploy_spec.rb

@@ -2,12 +2,46 @@ require 'spec_helper'
 
 describe "Deploying a Rails 3.1 application" do
   context "with default production settings" do
-    before(:all) do
-      deploy_test_application('assets_enabled')
+    it "precompiles assets when asset compilation is detected" do
+      deploy_test_application('assets_detected')
+      deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'public', 'assets').should exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should include("Precompiling assets. ('app/assets' exists, 'public/assets' not found, not disabled in config.)")
     end
 
-    it "precompiles assets" do
+    it "precompiles assets, then reuses them on the next deploy if nothing has changed" do
+      deploy_test_application('assets_enabled_in_ey_yml')
       deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'public', 'assets').should exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+
+      redeploy_test_application
+      deploy_dir.join('current', 'precompiled').should_not exist # doesn't run the task
+      deploy_dir.join('current', 'public', 'assets').should exist # but the assets are there
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should =~ %r#Reusing existing assets\. \(configured asset_dependencies unchanged from \w{7}..\w{7}\)#
+
+      redeploy_test_application('config' => {'precompile_unchanged_assets' => 'true'})
+      deploy_dir.join('current', 'precompiled').should exist # doesn't run the task
+      deploy_dir.join('current', 'public', 'assets').should exist # but the assets are there
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should_not include("Reusing existing assets")
+    end
+
+    it "precompile assets again when redeploying a ref with changes" do
+      deploy_test_application('assets_enabled_in_ey_yml')
+      deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'public', 'assets').should exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should include("Precompiling assets. (precompile_assets: true)")
+
+      # changing the ref stands in for actually having assets change (see Strategies::IntegrationSpec#same?)
+      redeploy_test_application('branch' => 'somenewref')
+      deploy_dir.join('current', 'precompiled').should exist # it does runs the task
+      deploy_dir.join('current', 'public', 'assets').should exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should_not =~ %r#Reusing existing assets#
     end
   end
 
@@ -18,6 +52,7 @@ describe "Deploying a Rails 3.1 application" do
 
     it "precompiles assets" do
       deploy_dir.join('current', 'precompiled').should exist
+      read_output.should include("Precompiling assets. (precompile_assets: true)")
     end
   end
 
@@ -28,6 +63,7 @@ describe "Deploying a Rails 3.1 application" do
 
     it "precompiles assets" do
       deploy_dir.join('current', 'precompiled').should_not exist
+      read_output.should include("Precompiling assets. (precompile_assets: true)")
     end
   end
 
@@ -38,16 +74,18 @@ describe "Deploying a Rails 3.1 application" do
 
     it "precompiles assets" do
       deploy_dir.join('current', 'precompiled').should exist
+      read_output.should include("Precompiling assets. (precompile_assets: true)")
     end
   end
 
-  context "with asset support disabled in its config" do
+  context "with asset support disabled in config/application.rb" do
     before(:all) do
       deploy_test_application('assets_disabled')
     end
 
     it "does not precompile assets" do
       deploy_dir.join('current', 'precompiled').should_not exist
+      read_output.should include("Skipping asset precompilation. ('config/application.rb' disables assets.)")
     end
   end
 
@@ -56,8 +94,9 @@ describe "Deploying a Rails 3.1 application" do
       deploy_test_application('assets_disabled_in_ey_yml')
     end
 
-    it "precompiles assets" do
+    it "does not precompile assets" do
       deploy_dir.join('current', 'precompiled').should_not exist
+      read_output.should include("Skipping asset precompilation. (precompile_assets: false)")
     end
   end
 
@@ -71,6 +110,8 @@ describe "Deploying a Rails 3.1 application" do
       deploy_dir.join('current', 'precompiled').should_not exist
       deploy_dir.join('current', 'public', 'assets').should be_directory
       deploy_dir.join('current', 'public', 'assets').should_not be_symlink
+      deploy_dir.join('current', 'public', 'assets', 'custom_compiled_asset').should exist
+      read_output.should include("Skipping asset precompilation. ('public/assets' directory already exists.)")
     end
   end
 end

data/spec/restart_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-class TestRestartDeploy < EY::Serverside::Deploy
+class TestRestartDeploy < FullTestDeploy
   attr_reader :call_order
   def initialize(*a)
     super
@@ -21,7 +21,7 @@ describe "EY::Serverside::Deploy#restart_with_maintenance_page" do
 
   it "puts up the maintenance page if necessary, restarts, and takes down the maintenance page" do
     config = EY::Serverside::Deploy::Configuration.new('deploy_to' => deploy_dir, 'app' => 'app_name')
-    deployer = TestRestartWithMaintenancePage.new(test_servers, config, test_shell)
+    deployer = TestRestartWithMaintenancePage.realnew(test_servers, config, test_shell)
     deployer.restart_with_maintenance_page
     deployer.call_order.should == %w(
       require_custom_tasks
@@ -36,7 +36,7 @@ describe "glassfish stack" do
 
   it "requires a maintenance page" do
     config = EY::Serverside::Deploy::Configuration.new('deploy_to' => deploy_dir, 'app' => 'app_name', 'stack' => 'glassfish')
-    deployer = TestRestartDeploy.new(test_servers, config, test_shell)
+    deployer = TestRestartDeploy.realnew(test_servers, config, test_shell)
     deployer.restart_with_maintenance_page
     deployer.call_order.should include('enable_maintenance_page')
   end

data/spec/services_deploy_spec.rb

@@ -1,14 +1,16 @@
 require 'spec_helper'
 
 describe "Deploying an application with services" do
-  describe "a deploy without ey_config" do
+  let(:shared_services_file) { deploy_dir.join('shared', 'config', 'ey_services_config_deploy.yml') }
+  let(:symlinked_services_file) { deploy_dir.join('current', 'config', 'ey_services_config_deploy.yml') }
+  let(:services_yml) { {"servicio" => {"foo" => "bar"}}.to_yaml }
+
+  describe "without ey_config" do
     describe "with services" do
       before do
-        deploy_test_application('no_ey_config') do |deployer|
-          @shared_services_file = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
-          @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
-          deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-        end
+        deploy_test_application('no_ey_config', 'config' => {
+          'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+        })
       end
 
       it "warns about missing ey_config" do
@@ -29,22 +31,20 @@ describe "Deploying an application with services" do
 
   describe "deploy with invalid yaml ey_services_config_deploy" do
     before do
-      deploy_test_application do |deployer|
-        @shared_services_file    = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
-        @symlinked_services_file = deployer.config.paths.active_release_config.join('ey_services_config_deploy.yml')
-        @invalid_services_yml = "42"
-        deployer.mock_services_setup!("echo '#{@invalid_services_yml}' > #{@shared_services_file}")
-      end
+      @invalid_services_yml = "42"
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{@invalid_services_yml}' > #{shared_services_file}"
+      })
     end
 
     it "works without warning" do
-      @shared_services_file.should exist
-      @shared_services_file.should_not be_symlink
-      @shared_services_file.read.should == "#{@invalid_services_yml}\n"
+      shared_services_file.should exist
+      shared_services_file.should_not be_symlink
+      shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
-      @symlinked_services_file.should exist
-      @symlinked_services_file.should be_symlink
-      @shared_services_file.read.should == "#{@invalid_services_yml}\n"
+      symlinked_services_file.should exist
+      symlinked_services_file.should be_symlink
+      shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
       read_output.should_not =~ /WARNING/
     end
@@ -52,99 +52,102 @@ describe "Deploying an application with services" do
 
   describe "a succesful deploy" do
     before do
-      deploy_test_application do |deployer|
-        @shared_services_file    = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
-        @symlinked_services_file = deployer.config.paths.active_release_config.join('ey_services_config_deploy.yml')
-        @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
-
-        deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-      end
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+      })
     end
 
     it "creates and symlinks ey_services_config_deploy.yml" do
-      @shared_services_file.should exist
-      @shared_services_file.should_not be_symlink
-      @shared_services_file.read.should == "#{@services_yml}\n"
+      shared_services_file.should exist
+      shared_services_file.should_not be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
-      @symlinked_services_file.should exist
-      @symlinked_services_file.should be_symlink
-      @shared_services_file.read.should == "#{@services_yml}\n"
+      symlinked_services_file.should exist
+      symlinked_services_file.should be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
       read_output.should_not =~ /WARNING/
     end
+  end
 
-    describe "followed by a deploy that can't find the command" do
-      before do
-        redeploy_test_application do |deployer|
-          deployer.mock_services_command_check!("which nonexistatncommand")
-        end
-      end
-
-      it "silently fails" do
-        @shared_services_file.should exist
-        @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+  describe "a successful deploy followed by a deploy that can't find the command" do
+    before do
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+      })
+      redeploy_test_application('config' => {
+        'services_check_command' => 'false'
+      })
+    end
 
-        @symlinked_services_file.should exist
-        @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+    it "silently fails" do
+      shared_services_file.should exist
+      shared_services_file.should_not be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
-      end
+      symlinked_services_file.should exist
+      symlinked_services_file.should be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
+      read_output.should_not =~ /WARNING/
     end
 
-    describe "followed by a deploy that fails to fetch services" do
-      it "logs a warning and symlinks the existing config file when there is existing services file" do
-        redeploy_test_application do |deployer|
-          deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
-        end
-        @shared_services_file.should exist
-        @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+  end
 
-        @symlinked_services_file.should exist
-        @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+  describe "a successful followed by a deploy that fails to fetch services" do
+    it "logs a warning and symlinks the existing config file when there is existing services file" do
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+      })
+      redeploy_test_application('config' => {'services_setup_command' => 'false'})
 
-        read_output.should include('WARNING: External services configuration not updated')
-      end
+      shared_services_file.should exist
+      shared_services_file.should_not be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
-      it "does not log a warning or symlink a config file when there is no existing services file" do
-        redeploy_test_application do |deployer|
-          deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
-          @shared_services_file.delete
-        end
+      symlinked_services_file.should exist
+      symlinked_services_file.should be_symlink
+      shared_services_file.read.should == "#{services_yml}\n"
 
-        @shared_services_file.should_not exist
-        @symlinked_services_file.should_not exist
+      read_output.should include('WARNING: External services configuration not updated')
+    end
 
-        read_output.should_not =~ /WARNING/
-      end
+    it "does not log a warning or symlink a config file when there is no existing services file" do
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+      })
+      shared_services_file.delete
+      redeploy_test_application('config' => {'services_setup_command' => 'false'})
+
+      shared_services_file.should_not exist
+      symlinked_services_file.should_not exist
 
+      read_output.should_not =~ /WARNING/
     end
+  end
 
-    describe "followed by another successfull deploy" do
-      before do
-        redeploy_test_application do |deployer|
-          @services_yml = {"servicio" => {"foo" => "bar2"}}.to_yaml
-          deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-        end
-      end
+  describe "a successful deploy followed by another successfull deploy" do
+    before do
+      deploy_test_application('default', 'config' => {
+        'services_setup_command' => "echo '#{services_yml}' > #{shared_services_file}"
+      })
+      @new_services_yml = {"servicio" => {"foo" => "bar2"}}.to_yaml
+      redeploy_test_application('config' => {
+        'services_setup_command' => "echo '#{@new_services_yml}' > #{shared_services_file}"
+      })
+    end
 
-      it "replaces the config with the new one (and symlinks)" do
-        @shared_services_file.should exist
-        @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+    it "replaces the config with the new one (and symlinks)" do
+      shared_services_file.should exist
+      shared_services_file.should_not be_symlink
+      shared_services_file.read.should == "#{@new_services_yml}\n"
 
-        @symlinked_services_file.should exist
-        @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "#{@services_yml}\n"
+      symlinked_services_file.should exist
+      symlinked_services_file.should be_symlink
+      shared_services_file.read.should == "#{@new_services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
-      end
+      read_output.should_not =~ /WARNING/
     end
-
   end
 
 end