engineyard-serverside 2.0.7 → 2.1.0.pre

data/spec/shell_spec.rb

@@ -3,14 +3,6 @@ require 'tempfile'
 require 'timecop'
 
 describe EY::Serverside::Shell do
-  if "".respond_to?(:force_encoding)
-    it "status works for ut8" do
-      output = StringIO.new
-      shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => Time.local(2008, 9, 1, 12, 10, 25))
-      shell.status("\u2603".force_encoding("binary"))
-    end
-  end
-
   it "has a timestamp before each line" do
     time1 = Time.local(2008, 9, 1, 12, 0, 0)
     time2 = Time.local(2008, 9, 1, 12, 3, 5)

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ end
 
 require 'pp'
 require 'engineyard-serverside'
+require 'engineyard-serverside-adapter'
 require File.expand_path('../support/integration', __FILE__)
 
 FIXTURES_DIR = Pathname.new(__FILE__).dirname.join("fixtures")
@@ -27,15 +28,6 @@ module EY
       @node = nil
     end
 
-    class Future
-      def inspect
-        <<-EOM
-#{self.class.name} result below: (run with DEBUG=1 to see the full log)
-#{result.inspect}
-        EOM
-      end
-    end
-
     class Strategies::Git
       def short_log_message(_) "" end
     end
@@ -60,7 +52,7 @@ Spec::Runner.configure do |config|
   class VerboseStringIO < StringIO
     def <<(str)
       if ENV['VERBOSE'] || ENV['DEBUG']
-        $stderr << str
+        STDERR << str
       end
       super
     end
@@ -100,10 +92,20 @@ Spec::Runner.configure do |config|
     read_stdout + "\n" + read_stderr
   end
 
-  def test_shell
+  def capture
+    begin
+      $stdout = @stdout = VerboseStringIO.new
+      $stderr = @stderr = VerboseStringIO.new
+      yield
+    ensure
+      $stdout, $stderr = STDOUT, STDERR
+    end
+  end
+
+  def test_shell(verbose=true)
     @test_shell ||= begin
                       @log_path = tmpdir.join("serverside-deploy-#{Time.now.to_i}-#{$$}.log")
-                      EY::Serverside::Shell.new(:verbose => true, :log_path => @log_path, :stdout => stdout, :stderr => stderr)
+                      EY::Serverside::Shell.new(:verbose => verbose, :log_path => @log_path, :stdout => stdout, :stderr => stderr)
                     end
   end
 
@@ -117,28 +119,26 @@ Spec::Runner.configure do |config|
 
   # set up EY::Serverside::Server like we're on a solo
   def test_servers
-    EY::Serverside::Servers.from_hashes([{:hostname => 'localhost', :roles => %w[solo], :user => ENV['USER']}])
+    @test_servers ||= EY::Serverside::Servers.from_hashes([{:hostname => 'localhost', :roles => %w[solo], :user => ENV['USER']}])
   end
 
   # When a repo fixture name is specified, the files found in the specified
   # spec/fixtures/repos dir are copied into the test github repository.
   def deploy_test_application(repo_fixture_name = 'default', extra_config = {}, &block)
-    servers = test_servers
-
-    # run a deploy
-    @config = EY::Serverside::Deploy::Configuration.new({
-      "strategy"      => "IntegrationSpec",
-      "deploy_to"     => deploy_dir.to_s,
-      "group"         => GROUP,
-      "stack"         => 'nginx_passenger',
-      "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{deploy_dir}/path-when-migrating",
-      'app'           => 'rails31',
-      'environment_name' => 'env',
-      'account_name'  => 'acc',
-      'framework_env' => 'staging',
-      'branch'        => 'somebranch',
-      'repo'          => FIXTURES_DIR.join('repos', repo_fixture_name)
-    }.merge(extra_config))
+    options = {
+      "strategy"         => "IntegrationSpec",
+      "deploy_to"        => deploy_dir.to_s,
+      "group"            => GROUP,
+      "stack"            => 'nginx_passenger',
+      "migrate"          => "ruby -e 'puts ENV[\"PATH\"]' > #{deploy_dir}/path-when-migrating",
+      "app"              => 'rails31',
+      "environment_name" => 'env',
+      "account_name"     => 'acc',
+      "framework_env"    => 'staging',
+      "branch"           => 'somebranch',
+      "verbose"          => true,
+      "repo"             => FIXTURES_DIR.join('repos', repo_fixture_name),
+    }.merge(extra_config)
 
     # pretend there is a shared bundled_gems directory
     deploy_dir.join('shared', 'bundled_gems').mkpath
@@ -146,15 +146,60 @@ Spec::Runner.configure do |config|
       deploy_dir.join('shared', 'bundled_gems', name).open("w") { |f| f.write("old\n") }
     end
 
+    # Create the command to send to CLI.start, even though most of the options are ignored
+    @adapter = EY::Serverside::Adapter.new do |args|
+      args.app              = options['app']
+      args.environment_name = options['environment_name']
+      args.account_name     = options['account_name']
+      args.migrate          = options['migrate']
+      args.ref              = options['branch']
+      args.repo             = options['repo']
+      args.config           = {
+        "services_check_command" => "which echo",
+        "services_setup_command" => "echo 'services setup command'",
+        "strategy" => options["strategy"],
+        "deploy_to" => options["deploy_to"],
+        "group" => options["group"]
+      }.merge(options['config'] || {})
+      args.framework_env    = options['framework_env']
+      args.stack            = options['stack']
+      args.verbose          = options['verbose']
+      args.instances        = test_servers.map {|s| {:hostname => s.hostname, :roles => s.roles.to_a, :name => s.name} }
+    end
+
+    @argv = @adapter.deploy.commands.last.to_argv[2..-1]
+
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(servers, @config, test_shell)
-    yield @deployer if block_given?
-    @deployer.deploy
+    FullTestDeploy.on_create_callback = block
+    capture do
+      EY::Serverside::CLI.start(@argv)
+    end
+  ensure
+    @deployer = EY::Serverside::Deploy.deployer
+    @config = EY::Serverside::Deploy.config
   end
 
-  def redeploy_test_application(&block)
-    raise "Please deploy_test_application first" unless @deployer
-    yield @deployer if block_given?
-    @deployer.deploy
+  def redeploy_test_application(extra_config = {}, &block)
+    raise "Please deploy_test_application first" unless @argv
+
+    @action = @adapter.deploy do |args|
+      extra_config.each do |key,val|
+        case key
+        when 'branch' then args.ref    = val
+        when 'config' then args.config = args.config.merge(val || {})
+        else               args.send("#{key}=", val)
+        end
+      end
+    end
+
+    @argv = @action.commands.last.to_argv[2..-1]
+
+    FullTestDeploy.on_create_callback = block
+    capture do
+      EY::Serverside::CLI.start(@argv)
+    end
+  ensure
+    @deployer = EY::Serverside::Deploy.deployer
+    @config = EY::Serverside::Deploy.config
   end
 end

data/spec/sqlite3_deploy_spec.rb

@@ -6,11 +6,10 @@ describe "Deploying an application with sqlite3 as the only DB adapter in the Ge
     @shared_path   = nil
     @framework_env = nil
 
-    deploy_test_application('sqlite3') do |deployer|
-      @shared_path   = deployer.config.paths.shared
-      @release_path  = deployer.config.paths.active_release
-      @framework_env = deployer.framework_env
-    end
+    deploy_test_application('sqlite3')
+    @shared_path   = @deployer.config.paths.shared
+    @release_path  = @deployer.config.paths.active_release
+    @framework_env = @deployer.framework_env
   end
 
   it 'should symlink database.sqlite3.yml' do

data/spec/support/integration.rb

@@ -1,11 +1,18 @@
 class FullTestDeploy < EY::Serverside::Deploy
   attr_reader :commands
 
+  class << self
+    attr_accessor :on_create_callback
+  end
+
+  def self.realnew(servers, config, shell)
+    on_create_callback.call(config) if on_create_callback # holy hax batman, this is insanity
+    super
+  end
+
   def initialize(*)
     super
     @commands = []
-    @gemfile_contents = nil
-    @lockfile_contents = nil
   end
 
   # passwordless sudo is neither guaranteed nor desired
@@ -18,20 +25,6 @@ class FullTestDeploy < EY::Serverside::Deploy
     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_command
     Escape.shell_command(["echo", super]) + "> #{config.paths.active_release}/restart"
   end
@@ -40,15 +33,7 @@ class FullTestDeploy < EY::Serverside::Deploy
   # deploy does not
   def bundle
     my_env = ENV.to_hash
-
-    if defined?(Bundler)
-      Bundler.with_clean_env do
-        result = super
-      end
-    else
-      result = super
-    end
-
+    result = super
     ENV.replace(my_env)
     result
   end
@@ -57,20 +42,16 @@ class FullTestDeploy < EY::Serverside::Deploy
     config.framework_env
   end
 
-  def services_command_check
-    @mock_services_command_check || "which echo"
-  end
-
-  def mock_services_command_check!(value)
-    @mock_services_command_check = value
-  end
+end
 
-  def services_setup_command
-    @mock_services_setup_command || "echo 'services setup command'"
+class EY::Serverside::Deploy
+  class << self
+    alias_method :realnew, :new
+    attr_reader :config, :deployer
   end
-
-  def mock_services_setup!(value)
-    @mock_services_setup_command = value
+  def self.new(servers, cfg, shell)
+    @config = cfg
+    @deployer = FullTestDeploy.realnew(servers, cfg, shell)
   end
 end
 
@@ -106,6 +87,10 @@ class EY::Serverside::Strategies::IntegrationSpec
     shell.status "Garbage collecting cached git repository to reduce disk usage."
   end
 
+  def same?(prev, active, path)
+    prev == active # for our tests, being the same commit is sufficient
+  end
+
   private
 
   def install_git_base

metadata

@@ -1,173 +1,177 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 7
-  version: 2.0.7
+version: !ruby/object:Gem::Version
+  version: 2.1.0.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.2
-  prerelease: false
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 10
-        - 0
-        version: "10.0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
-        version: 1.0.5
+      - !ruby/object:Gem::Version
+        version: 1.0.11
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.11
+- !ruby/object:Gem::Dependency
+  name: engineyard-serverside-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: pg
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 13
-        - 2
-        version: 0.13.2
   prerelease: false
-  type: :development
-  requirement: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/about.rb
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/cli_helpers.rb
 - lib/engineyard-serverside/configuration.rb
 - lib/engineyard-serverside/default_maintenance_page.html
+- lib/engineyard-serverside/dependency_manager/base.rb
+- lib/engineyard-serverside/dependency_manager/bundler.rb
+- lib/engineyard-serverside/dependency_manager/bundler_lock.rb
+- lib/engineyard-serverside/dependency_manager/legacy_helpers.rb
+- lib/engineyard-serverside/dependency_manager/npm.rb
+- lib/engineyard-serverside/dependency_manager.rb
 - lib/engineyard-serverside/deploy.rb
 - lib/engineyard-serverside/deploy_hook.rb
 - lib/engineyard-serverside/deprecation.rb
-- lib/engineyard-serverside/lockfile_parser.rb
 - lib/engineyard-serverside/maintenance.rb
 - lib/engineyard-serverside/paths.rb
 - lib/engineyard-serverside/propagator.rb
-- lib/engineyard-serverside/rails_asset_support.rb
+- lib/engineyard-serverside/rails_assets/strategy.rb
+- lib/engineyard-serverside/rails_assets.rb
 - lib/engineyard-serverside/server.rb
 - lib/engineyard-serverside/servers.rb
 - lib/engineyard-serverside/shell/command_result.rb
@@ -266,9 +270,18 @@ files:
 - 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/1.3.1-rails-3.2.13
 - spec/fixtures/lockfiles/not-a-lockfile
+- spec/fixtures/repos/assets_detected/app/assets/empty
+- spec/fixtures/repos/assets_detected/config/application.rb
+- spec/fixtures/repos/assets_detected/config/ey.yml
+- spec/fixtures/repos/assets_detected/Gemfile
+- spec/fixtures/repos/assets_detected/Gemfile.lock
+- spec/fixtures/repos/assets_detected/Rakefile
+- spec/fixtures/repos/assets_detected/README
 - spec/fixtures/repos/assets_disabled/app/assets/empty
 - spec/fixtures/repos/assets_disabled/config/application.rb
+- spec/fixtures/repos/assets_disabled/config/ey.yml
 - spec/fixtures/repos/assets_disabled/Gemfile
 - spec/fixtures/repos/assets_disabled/Gemfile.lock
 - spec/fixtures/repos/assets_disabled/Rakefile
@@ -280,12 +293,6 @@ files:
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_disabled_in_ey_yml/README
-- spec/fixtures/repos/assets_enabled/app/assets/empty
-- spec/fixtures/repos/assets_enabled/config/application.rb
-- spec/fixtures/repos/assets_enabled/Gemfile
-- spec/fixtures/repos/assets_enabled/Gemfile.lock
-- spec/fixtures/repos/assets_enabled/Rakefile
-- spec/fixtures/repos/assets_enabled/README
 - spec/fixtures/repos/assets_enabled_all/app/assets/empty
 - spec/fixtures/repos/assets_enabled_all/config/application.rb
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml
@@ -307,11 +314,16 @@ files:
 - spec/fixtures/repos/assets_enabled_util_only/README
 - spec/fixtures/repos/assets_in_hook/app/assets/empty
 - spec/fixtures/repos/assets_in_hook/config/application.rb
+- spec/fixtures/repos/assets_in_hook/config/ey.yml
 - spec/fixtures/repos/assets_in_hook/deploy/before_compile_assets.rb
 - spec/fixtures/repos/assets_in_hook/Gemfile
 - spec/fixtures/repos/assets_in_hook/Gemfile.lock
 - spec/fixtures/repos/assets_in_hook/Rakefile
 - spec/fixtures/repos/assets_in_hook/README
+- spec/fixtures/repos/bundle_fails/deploy/after_bundle.rb
+- spec/fixtures/repos/bundle_fails/Gemfile
+- spec/fixtures/repos/bundle_fails/README
+- spec/fixtures/repos/default/ey.yml
 - spec/fixtures/repos/default/Gemfile
 - spec/fixtures/repos/default/Gemfile.lock
 - spec/fixtures/repos/default/README
@@ -338,9 +350,11 @@ files:
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb
 - spec/fixtures/repos/hooks/README
+- spec/fixtures/repos/no_ey_config/ey.yml
 - spec/fixtures/repos/no_ey_config/Gemfile
 - spec/fixtures/repos/no_ey_config/Gemfile.lock
 - spec/fixtures/repos/no_ey_config/README
+- spec/fixtures/repos/no_gemfile_lock/ey.yml
 - spec/fixtures/repos/no_gemfile_lock/Gemfile
 - spec/fixtures/repos/no_gemfile_lock/README
 - spec/fixtures/repos/nodejs/package.json
@@ -365,40 +379,29 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb
@@ -422,9 +425,18 @@ test_files:
 - 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/1.3.1-rails-3.2.13
 - spec/fixtures/lockfiles/not-a-lockfile
+- spec/fixtures/repos/assets_detected/app/assets/empty
+- spec/fixtures/repos/assets_detected/config/application.rb
+- spec/fixtures/repos/assets_detected/config/ey.yml
+- spec/fixtures/repos/assets_detected/Gemfile
+- spec/fixtures/repos/assets_detected/Gemfile.lock
+- spec/fixtures/repos/assets_detected/Rakefile
+- spec/fixtures/repos/assets_detected/README
 - spec/fixtures/repos/assets_disabled/app/assets/empty
 - spec/fixtures/repos/assets_disabled/config/application.rb
+- spec/fixtures/repos/assets_disabled/config/ey.yml
 - spec/fixtures/repos/assets_disabled/Gemfile
 - spec/fixtures/repos/assets_disabled/Gemfile.lock
 - spec/fixtures/repos/assets_disabled/Rakefile
@@ -436,12 +448,6 @@ test_files:
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_disabled_in_ey_yml/README
-- spec/fixtures/repos/assets_enabled/app/assets/empty
-- spec/fixtures/repos/assets_enabled/config/application.rb
-- spec/fixtures/repos/assets_enabled/Gemfile
-- spec/fixtures/repos/assets_enabled/Gemfile.lock
-- spec/fixtures/repos/assets_enabled/Rakefile
-- spec/fixtures/repos/assets_enabled/README
 - spec/fixtures/repos/assets_enabled_all/app/assets/empty
 - spec/fixtures/repos/assets_enabled_all/config/application.rb
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml
@@ -463,11 +469,16 @@ test_files:
 - spec/fixtures/repos/assets_enabled_util_only/README
 - spec/fixtures/repos/assets_in_hook/app/assets/empty
 - spec/fixtures/repos/assets_in_hook/config/application.rb
+- spec/fixtures/repos/assets_in_hook/config/ey.yml
 - spec/fixtures/repos/assets_in_hook/deploy/before_compile_assets.rb
 - spec/fixtures/repos/assets_in_hook/Gemfile
 - spec/fixtures/repos/assets_in_hook/Gemfile.lock
 - spec/fixtures/repos/assets_in_hook/Rakefile
 - spec/fixtures/repos/assets_in_hook/README
+- spec/fixtures/repos/bundle_fails/deploy/after_bundle.rb
+- spec/fixtures/repos/bundle_fails/Gemfile
+- spec/fixtures/repos/bundle_fails/README
+- spec/fixtures/repos/default/ey.yml
 - spec/fixtures/repos/default/Gemfile
 - spec/fixtures/repos/default/Gemfile.lock
 - spec/fixtures/repos/default/README
@@ -494,9 +505,11 @@ test_files:
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb
 - spec/fixtures/repos/hooks/README
+- spec/fixtures/repos/no_ey_config/ey.yml
 - spec/fixtures/repos/no_ey_config/Gemfile
 - spec/fixtures/repos/no_ey_config/Gemfile.lock
 - spec/fixtures/repos/no_ey_config/README
+- spec/fixtures/repos/no_gemfile_lock/ey.yml
 - spec/fixtures/repos/no_gemfile_lock/Gemfile
 - spec/fixtures/repos/no_gemfile_lock/README
 - spec/fixtures/repos/nodejs/package.json