engineyard-serverside 1.4.12 → 1.4.13

data/lib/engineyard-serverside/deploy.rb

@@ -137,7 +137,7 @@ module EY
                                 get_bundler_installer(lockfile)
                               else
                                 warn_about_missing_lockfile
-                                bundler_09_installer(default_09_bundler)
+                                get_default_bundler_installer
                               end
 
           sudo "#{serverside_bin} install_bundler #{bundler_installer.version}"
@@ -320,7 +320,7 @@ module EY
         info "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
         info "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
         info "!>"
-        info "!> This deployment will use bundler #{default_09_bundler} to run 'bundle install'."
+        info "!> This deployment will use bundler #{LockfileParser.default_version} to run 'bundle install'."
         info "!>"
       end
 
@@ -337,13 +337,23 @@ module EY
       end
       public :get_bundler_installer
 
+      def get_default_bundler_installer
+        # deployment mode is not supported without a Gemfile.lock, so we turn that off.
+        bundler_10_installer(LockfileParser.default_version, deployment_mode = false)
+      end
+      public :get_default_bundler_installer
+
       def bundler_09_installer(version)
         BundleInstaller.new(version, '--without=development --without=test')
       end
 
-      def bundler_10_installer(version)
-        BundleInstaller.new(version,
-          "--deployment --path #{c.shared_path}/bundled_gems --binstubs #{c.binstubs_path} --without development test")
+      # 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
     end   # DeployBase
 

data/lib/engineyard-serverside/deprecation.rb

@@ -1,10 +1,10 @@
 module EY
   module Serverside
     def self.deprecation_warning(msg)
-      STDERR.puts "DEPRECATION WARNING: #{msg}"      
+      $stderr.puts "DEPRECATION WARNING: #{msg}"
     end
   end
-  
+
   def self.const_missing(const)
     if EY::Serverside.const_defined?(const)
       EY::Serverside.deprecation_warning("EY::#{const} has been deprecated. use EY::Serverside::#{const} instead")
@@ -13,7 +13,7 @@ module EY
       super
     end
   end
-  
+
   def self.node
     EY::Serverside.deprecation_warning("EY.node has been deprecated. use EY::Serverside.node instead")
     EY::Serverside.node
@@ -23,5 +23,4 @@ module EY
     EY::Serverside.deprecation_warning("EY.dna_json has been deprecated. use EY::Serverside.dna_json instead")
     EY::Serverside.dna_json
   end
-
-end
+end

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -2,6 +2,9 @@ require 'yaml'
 module EY
   module Serverside
     class LockfileParser
+      def self.default_version
+        Parse10::DEFAULT
+      end
 
       attr_reader :bundler_version, :lockfile_version
 
@@ -37,7 +40,7 @@ module EY
         end
         def safe_yaml_load(loadable)
           YAML.load(loadable) #won't always raise... soemtimes parses the contents as 1 big string
-        rescue ArgumentError => e  # not yaml
+        rescue ArgumentError, SyntaxError # not yaml
           nil
         end
       end

data/lib/engineyard-serverside/strategies/git.rb

@@ -101,7 +101,11 @@ module EY
         end
 
         def branch?(ref)
-          `#{git} branch -r`.map { |x| x.strip }.include?("origin/#{ref}")
+          remote_branches = `#{git} branch -r`
+          remote_branches.each_line do |line|
+            return true if line.include?("origin/#{ref}")
+          end
+          false
         end
 
         def set_up_git_ssh(app)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.12'
+    VERSION = '1.4.13'
   end
 end

data/lib/vendor/dataflow/dataflow.rb

@@ -6,7 +6,7 @@ module Dataflow
     attr_accessor :forker
   end
   self.forker = Thread.method(:fork)
-  
+
   def self.included(cls)
     class << cls
       def declare(*readers)
@@ -21,7 +21,7 @@ module Dataflow
       end
     end
   end
-  
+
   def local(&block)
     return Variable.new unless block_given?
     vars = Array.new(block.arity) { Variable.new }
@@ -60,13 +60,17 @@ module Dataflow
   # initialized instance variables in get/set methods for memory and
   # performance reasons
   class Variable
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    # Briefly disable the warning we would get when undefining object_id.
+    # We actually rely on the ability to do that, so...
+    v = $VERBOSE; $VERBOSE = nil
+    instance_methods.each { |m| undef_method(m) unless m =~ /^__|instance_eval/ }
+    $VERBOSE = v # back to sanity
     LOCK = Monitor.new
     def initialize(&block) @__trigger__ = block if block_given? end
-    
+
     # Lazy-load conditions to be nice on memory usage
     def __binding_condition__() @__binding_condition__ ||= LOCK.new_cond end
-    
+
     def __unify__(value)
       LOCK.synchronize do
         __activate_trigger__ if @__trigger__
@@ -91,7 +95,7 @@ module Dataflow
 
     def __wait__
       LOCK.synchronize do
-        unless @__bound__          
+        unless @__bound__
           if @__trigger__
             __activate_trigger__
           else

data/lib/vendor/dataflow/dataflow/equality.rb

@@ -6,23 +6,39 @@
 # ears. Please run the rubyspec before committing changes to this file.
 
 class Object
+  alias original_equality ==
+
   def ==(other)
     object_id == other.object_id
   end
 end
 
 class Symbol
+  alias original_equality ==
+
   def ==(other)
     object_id == other.object_id
   end
 end
 
 class Regexp
-  def ==(other)
-    other.is_a?(Regexp) && 
-    casefold? == other.casefold? &&
-    kcode == other.kcode &&
-    options == other.options &&
-    source == other.source
+  alias original_equality ==
+
+  if /lol/.respond_to?(:encoding)
+    def ==(other)
+      other.is_a?(Regexp) &&
+      casefold? == other.casefold? &&
+      encoding == other.encoding &&
+      options == other.options &&
+      source == other.source
+    end
+  else
+    def ==(other)
+      other.is_a?(Regexp) &&
+      casefold? == other.casefold? &&
+      kcode == other.kcode &&
+      options == other.options &&
+      source == other.source
+    end
   end
 end

data/lib/vendor/dataflow/spec/equality_spec.rb

@@ -17,7 +17,7 @@ describe 'Unifying a bound value' do
           unify var2, type
           var.should == var2
           var2.should == var
-          lambda {unify var, var2}.should_not raise_error        
+          lambda {unify var, var2}.should_not raise_error
         end
       end
 

data/spec/basic_deploy_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "Deploying an application without Bundler" do
+  before(:all) do
+    $DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
+    $DISABLE_LOCKFILE = true
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
+
+    # run a deploy
+    config = EY::Serverside::Deploy::Configuration.new({
+        "strategy"      => "IntegrationSpec",
+        "deploy_to"     => @deploy_dir,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_passenger',
+        "migrate"       => nil,
+        'app'           => 'foo',
+        'framework_env' => 'staging'
+      })
+
+    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @deployer = FullTestDeploy.new(config)
+    @deployer.deploy
+  end
+
+  it "creates a REVISION file" do
+    File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
+  end
+
+  it "restarts the app servers" do
+    File.exist?(File.join(@deploy_dir, 'current', 'restart')).should be_true
+  end
+
+  it "runs all the hooks" do
+    File.exist?(File.join(@deploy_dir, 'current', 'before_bundle.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_bundle.ran'  )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_migrate.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_migrate.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_symlink.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_symlink.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_restart.ran' )).should be_true
+  end
+end

data/spec/bundler_deploy_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe "Deploying an application that uses Bundler" do
+  def deploy_test_application
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
+
+    # 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'
+      })
+
+    # pretend there is a shared bundled_gems directory
+    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
+      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
+    end
+
+    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @deployer = FullTestDeploy.new(config)
+    @deployer.deploy
+  end
+
+  context "with a Gemfile.lock" do
+    before(:all) do
+      $DISABLE_GEMFILE = false
+      $DISABLE_LOCKFILE = false
+      deploy_test_application
+    end
+
+    it "runs the right bundler command" do
+      install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
+      install_bundler_command_ran.should_not be_nil
+      install_bundler_command_ran.should == "#{@binpath} install_bundler 1.0.10"
+    end
+
+    it "runs 'bundle install' with --deployment" do
+      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd.should_not be_nil
+      bundle_install_cmd.should include('--deployment')
+    end
+
+    it "removes bundled_gems directory if the ruby version changed" do
+      clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+      clear_bundle_cmd.should_not be_nil
+    end
+
+    it "removes bundled_gems directory if the system version changed" do
+      clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+      clear_bundle_cmd.should_not be_nil
+    end
+
+    it "has the binstubs in the path when migrating" do
+      File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
+    end
+
+    it "creates a ruby version file" do
+      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
+    end
+
+    it "creates a system version file" do
+      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
+    end
+
+    it "generates bundler binstubs" do
+      File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
+    end
+  end
+
+  context "without a Gemfile.lock" do
+    before(:all) do
+      $DISABLE_GEMFILE = false
+      $DISABLE_LOCKFILE = true
+      deploy_test_application
+    end
+
+    it "default to Bundler 1.0.10" do
+      install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
+      install_bundler_command_ran.should_not be_nil
+      install_bundler_command_ran.should == "#{@binpath} install_bundler 1.0.10"
+    end
+
+    it "runs 'bundle install' without --deployment" do
+      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd.should_not be_nil
+      bundle_install_cmd.should_not include('--deployment')
+    end
+
+    it "creates a ruby version file" do
+      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
+    end
+
+    it "creates a system version file" do
+      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
+    end
+  end
+end
+

data/spec/custom_deploy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "the EY::Serverside::Deploy API" do
   it "calls tasks in the right order" do

data/spec/deploy_hook_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "the deploy-hook API" do
   before(:each) do

data/spec/deprecation_spec.rb

@@ -1,25 +1,45 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
+require 'stringio'
 
 describe EY::Serverside do
-  
+  before do
+    @original_stderr = $stderr
+    @warnings = StringIO.new
+    $stderr = @warnings
+  end
+
+  after do
+    $stderr = @original_stderr
+  end
+
+  def check_deprecation(new_const, prints_warning = true)
+    old_name = new_const.to_s.gsub('EY::Serverside::', 'EY::')
+    eval(old_name).should == new_const
+    @warnings.string.should include(old_name) if prints_warning
+  end
+
   it "preserves the old constants" do
-    EY::BundleInstaller.should == EY::Serverside::BundleInstaller
-    EY::CLI.should == EY::Serverside::CLI
-    EY::Deploy.should == EY::Serverside::Deploy
-    EY::DeployBase.should == EY::Serverside::DeployBase
-    EY::Deploy::Configuration.should == EY::Serverside::Deploy::Configuration
-    EY::DeployHook.should == EY::Serverside::DeployHook
-    EY::LockfileParser.should == EY::Serverside::LockfileParser
-    EY::LoggedOutput.should == EY::Serverside::LoggedOutput
-    EY::Server.should == EY::Serverside::Server
-    EY::Task.should == EY::Serverside::Task    
-    EY::Strategies.should == EY::Serverside::Strategies
-    EY::Strategies::Git.should == EY::Serverside::Strategies::Git
-    
-    lambda{ EY::WTFNotDefined }.should raise_error(NameError, /uninitialized constant EY::WTFNotDefined/)    
+    names = %w[BundleInstaller CLI Deploy DeployBase Deploy::Configuration
+               DeployHook LockfileParser LoggedOutput Server Task
+               Strategies Strategies::Git]
 
-    #TODO: what about EY.node and EY.dna..
+    names.map do |name|
+      const = eval("::EY::Serverside::#{name}")
+      # The way deprecations are implemented currently, we don't print
+      # warning messages for constants that aren't directly under EY::
+      prints_warning = name.include?('::') ? false : true
+      check_deprecation(const, prints_warning)
+    end
+  end
 
+  it "deprecates EY.dna_json and EY.node" do
+    EY.dna_json.should == EY::Serverside.dna_json
+    @warnings.string.should include("EY.dna_json")
+    EY.node.should == EY::Serverside.node
+    @warnings.string.should include("EY.node")
   end
 
+  it "doesn't interfere with unrelated constants" do
+    lambda{ EY::WTFNotDefined }.should raise_error(NameError, /uninitialized constant.*EY::WTFNotDefined/)
+  end
 end

data/spec/git_strategy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "the git deploy strategy" do
   subject do

data/spec/lockfile_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "the bundler version retrieved from the lockfile" do
   def get_full_path(file)

data/spec/restart_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestRestartDeploy < EY::Serverside::Deploy
   attr_reader :call_order

data/spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
 
 describe EY::Serverside::Server do
   before(:each) do

data/spec/spec_helper.rb

@@ -1,8 +1,14 @@
 $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 
-Bundler.require :default, :test
+if defined?(Bundler)
+  Bundler.require :default, :test
+else
+  require 'rubygems'
+end
+
 require 'pp'
 require 'engineyard-serverside'
+require File.expand_path('../support/integration', __FILE__)
 
 module EY
   module Serverside
@@ -15,7 +21,12 @@ module EY
       def info(_) end
 
       def logged_system(cmd)
-        system("#{cmd} 2>/dev/null")
+        output = `#{cmd} 2>&1`
+        successful = ($? == 0)
+        if ENV['VERBOSE'] && !successful
+          $stderr.puts "\nCommand `#{cmd}` exited with status #{$?.exitstatus}: '#{output.strip}'"
+        end
+        successful
       end
     end
 
@@ -33,6 +44,8 @@ Kernel.system "tar xzf #{GITREPO_DIR}.tar.gz -C #{FIXTURES_DIR}"
 
 Spec::Runner.configure do |config|
   config.before(:all) do
+    $DISABLE_GEMFILE = false
+    $DISABLE_LOCKFILE = false
     EY::Serverside.dna_json = {}.to_json
   end
 end

data/spec/support/integration.rb

@@ -0,0 +1,139 @@
+class FullTestDeploy < EY::Serverside::Deploy
+  attr_reader :infos, :debugs, :commands
+
+  def initialize(*)
+    super
+    @infos = []
+    @debugs = []
+    @commands = []
+  end
+
+  # stfu
+  def info(msg)
+    @infos << msg
+  end
+
+  # no really, stfu
+  def debug(msg)
+    @debugs << msg
+  end
+
+  # passwordless sudo is neither guaranteed nor desired
+  def sudo(cmd)
+    run(cmd)
+  end
+
+  def run(cmd)
+    @commands << cmd
+    super
+  end
+
+  def version_specifier
+    # Normally, the deploy task invokes the hook task by executing
+    # the rubygems-generated wrapper (it's what's in $PATH). It
+    # specifies the version to make sure that the pieces don't get
+    # out of sync. However, in test mode, there's no
+    # rubygems-generated wrapper, and so the hook task doesn't get
+    # run because thor thinks we're trying to invoke the _$VERSION_
+    # task instead, which doesn't exist.
+    #
+    # By stripping that out, we can get the hooks to actually run
+    # inside this test.
+    nil
+  end
+
+  def restart
+    FileUtils.touch("#{c.release_path}/restart")
+  end
+
+  # we're probably running this spec under bundler, but a real
+  # deploy does not
+  def bundle
+    my_env = ENV.to_hash
+
+    ENV.delete("BUNDLE_GEMFILE")
+    ENV.delete("BUNDLE_BIN_PATH")
+
+    result = super
+
+    ENV.replace(my_env)
+    result
+  end
+
+  def get_bundler_installer(lockfile)
+    installer = super
+    installer.options << ' --quiet'   # stfu already!
+    installer
+  end
+end
+
+module EY::Serverside::Strategies::IntegrationSpec
+  module Helpers
+
+    def update_repository_cache
+      cached_copy = File.join(c.shared_path, 'cached-copy')
+
+      deploy_hook_dir = File.join(cached_copy, 'deploy')
+      FileUtils.mkdir_p(deploy_hook_dir)
+      %w[bundle migrate symlink restart].each do |action|
+        %w[before after].each do |prefix|
+          hook = "#{prefix}_#{action}"
+          File.open(File.join(deploy_hook_dir, "#{hook}.rb"), 'w') do |f|
+            f.write(%Q{run 'touch "#{c.release_path}/#{hook}.ran"'})
+          end
+        end
+      end
+
+      FileUtils.mkdir_p(File.join(c.shared_path, 'config'))
+      FileUtils.mkdir_p(cached_copy)
+      generate_gemfile_in(cached_copy)
+    end
+
+    def create_revision_file_command
+      "echo 'revision, yo' > #{c.release_path}/REVISION"
+    end
+
+    def short_log_message(revision)
+      "FONDLED THE CODE"
+    end
+
+    def gemfile_contents
+      <<-EOF
+source :gemcutter
+
+gem "bundler", "~> 1.0.0.rc.6"
+gem "rake"
+EOF
+    end
+
+    def lockfile_contents
+      <<-EOF
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.8.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0.rc.6)
+  rake
+EOF
+    end
+
+    def generate_gemfile_in(dir)
+      `echo "this is my file; there are many like it, but this one is mine" > #{dir}/file`
+      gemfile_path = File.join(dir, 'Gemfile')
+      lockfile_path = File.join(dir, 'Gemfile.lock')
+
+      unless $DISABLE_GEMFILE
+        File.open(gemfile_path, 'w') {|f| f.write(gemfile_contents) }
+      end
+      unless $DISABLE_LOCKFILE
+        File.open(lockfile_path, 'w') {|f| f.write(lockfile_contents) }
+      end
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 4
-  - 12
-  version: 1.4.12
+  - 13
+  version: 1.4.13
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -07:00
+date: 2011-09-21 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +33,11 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  name: rspec
-  prerelease: false
-  type: :development
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rake
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,9 +47,6 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  prerelease: false
-  type: :development
   requirement: *id002
 description: 
 email: cloud@engineyard.com
@@ -263,20 +263,21 @@ files:
 - lib/vendor/thor/thor.gemspec
 - lib/vendor/thor/Thorfile
 - LICENSE
+- spec/basic_deploy_spec.rb
+- spec/bundler_deploy_spec.rb
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
-- spec/real_deploy_spec.rb
 - spec/restart_spec.rb
 - 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
@@ -316,25 +317,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
+- spec/basic_deploy_spec.rb
+- spec/bundler_deploy_spec.rb
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
-- spec/real_deploy_spec.rb
 - spec/restart_spec.rb
 - 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

data/spec/real_deploy_spec.rb

@@ -1,219 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-module EY::Serverside::Strategies::IntegrationSpec
-  module Helpers
-
-    def update_repository_cache
-      cached_copy = File.join(c.shared_path, 'cached-copy')
-
-      deploy_hook_dir = File.join(cached_copy, 'deploy')
-      FileUtils.mkdir_p(deploy_hook_dir)
-      %w[bundle migrate symlink restart].each do |action|
-        %w[before after].each do |prefix|
-          hook = "#{prefix}_#{action}"
-          File.open(File.join(deploy_hook_dir, "#{hook}.rb"), 'w') do |f|
-            f.write(%Q{run 'touch "#{c.release_path}/#{hook}.ran"'})
-          end
-        end
-      end
-
-      FileUtils.mkdir_p(File.join(c.shared_path, 'config'))
-
-      FileUtils.mkdir_p(cached_copy)
-      Dir.chdir(cached_copy) do
-        `echo "this is my file; there are many like it, but this one is mine" > file`
-        File.open('Gemfile', 'w') do |f|
-          f.write <<-EOF
-source :gemcutter
-
-gem "bundler", "~> 1.0.0.rc.6"
-gem "rake"
-EOF
-        end
-
-        File.open("Gemfile.lock", "w") do |f|
-          f.write <<-EOF
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rake (0.8.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0.rc.6)
-  rake
-EOF
-        end
-      end
-    end
-
-    def create_revision_file_command
-      "echo 'revision, yo' > #{c.release_path}/REVISION"
-    end
-
-    def short_log_message(revision)
-      "FONDLED THE CODE"
-    end
-
-  end
-end
-
-describe "deploying an application" do
-  class FullTestDeploy < EY::Serverside::Deploy
-    attr_reader :infos, :debugs, :commands
-
-    def initialize(*)
-      super
-      @infos = []
-      @debugs = []
-      @commands = []
-    end
-
-    # stfu
-    def info(msg)
-      @infos << msg
-    end
-
-    # no really, stfu
-    def debug(msg)
-      @debugs << msg
-    end
-
-    # passwordless sudo is neither guaranteed nor desired
-    def sudo(cmd)
-      run(cmd)
-    end
-
-    def run(cmd)
-      @commands << cmd
-      super
-    end
-
-    def version_specifier
-      # Normally, the deploy task invokes the hook task by executing
-      # the rubygems-generated wrapper (it's what's in $PATH). It
-      # specifies the version to make sure that the pieces don't get
-      # out of sync. However, in test mode, there's no
-      # rubygems-generated wrapper, and so the hook task doesn't get
-      # run because thor thinks we're trying to invoke the _$VERSION_
-      # task instead, which doesn't exist.
-      #
-      # By stripping that out, we can get the hooks to actually run
-      # inside this test.
-      nil
-    end
-
-    def restart
-      FileUtils.touch("#{c.release_path}/restart")
-    end
-
-    # we're probably running this spec under bundler, but a real
-    # deploy does not
-    def bundle
-      my_env = ENV.to_hash
-
-      ENV.delete("BUNDLE_GEMFILE")
-      ENV.delete("BUNDLE_BIN_PATH")
-
-      result = super
-
-      ENV.replace(my_env)
-      result
-    end
-
-    def get_bundler_installer(lockfile)
-      installer = super
-      installer.options << ' --quiet'   # stfu already!
-      installer
-    end
-
-  end
-
-  before(:all) do
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
-
-    # set up EY::Serverside::Server like we're on a solo
-    EY::Serverside::Server.reset
-    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
-
-    # 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'
-      })
-
-    # pretend there is a shared bundled_gems directory
-    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
-    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
-      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
-    end
-
-    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config)
-    @deployer.deploy
-  end
-
-  it "runs the right bundler command" do
-    install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
-    install_bundler_command_ran.should_not be_nil
-    install_bundler_command_ran.should == "#{@binpath} install_bundler 1.0.10"
-  end
-
-  it "creates a REVISION file" do
-    File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
-  end
-
-  it "restarts the app servers" do
-    File.exist?(File.join(@deploy_dir, 'current', 'restart')).should be_true
-  end
-
-  it "runs 'bundle install' with --deployment" do
-    bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
-    bundle_install_cmd.should_not be_nil
-    bundle_install_cmd.should include('--deployment')
-  end
-
-  it "creates a ruby version file" do
-    File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
-  end
-
-  it "creates a system version file" do
-    File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
-  end
-
-  it "removes bundled_gems directory if the ruby version changed" do
-    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
-    clear_bundle_cmd.should_not be_nil
-  end
-
-  it "removes bundled_gems directory if the system version changed" do
-    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
-    clear_bundle_cmd.should_not be_nil
-  end
-
-  it "creates binstubs somewhere out of the way" do
-    File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
-  end
-
-  it "has the binstubs in the path when migrating" do
-    File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
-  end
-
-  it "runs all the hooks" do
-    File.exist?(File.join(@deploy_dir, 'current', 'before_bundle.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_bundle.ran'  )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_migrate.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_migrate.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_symlink.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_symlink.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_restart.ran' )).should be_true
-  end
-end