engineyard 2.0.0.pre5.1 → 2.0.0.rc1

data/lib/engineyard/deploy_config/migrate.rb

@@ -90,11 +90,11 @@ module EY
       end
 
       def perform_from_interaction
-        ui.warn "********************************************************************************"
+        ui.warn "**********************************************************************"
         ui.warn "No default migrate choice for environment: #{env_config.name}"
         ui.warn "Migrate can be toggled per-deploy using --migrate or --no-migrate."
         ui.warn "Let's set a default migration choice."
-        ui.warn "********************************************************************************"
+        ui.warn "**********************************************************************"
         @perform = ui.agree('Migrate every deploy by default? ', true)
         env_config.migrate = @perform
         if @perform
@@ -109,6 +109,13 @@ module EY
         ui.error "Timeout when waiting for input. Maybe this is not a terminal?"
         ui.error "ey deploy no longer migrates when no default is set in ey.yml."
         ui.error "Run interactively for step-by-step ey.yml migration setup."
+        ui.error ""
+        ui.error "Alternatively, you may add ey.yml to your project directly:"
+        ui.error "---"
+        ui.error "environments:"
+        ui.error "  #{env_config.name}:"
+        ui.error "    migrate: true"
+        ui.error "    migration_command: 'rake db:migrate'"
         return false
       end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.0.pre5.1'
+  VERSION = '2.0.0.rc1'
 end

data/spec/engineyard/repo_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe EY::Repo do
-  let(:path) { p = Pathname.new(Dir.tmpdir).join('ey-test'); p.mkpath; p }
+  let(:path) { p = TMPDIR.join('ey-test'); p.mkpath; p }
 
   before(:each) do
     Dir.chdir(path) { `git init -q` }

data/spec/ey/web/disable_spec.rb

@@ -13,7 +13,7 @@ describe "ey web disable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/engineyard-serverside.*deploy enable_maintenance_page.*--app #{scenario[:application]}/)
+    @ssh_commands.should have_command_like(/engineyard-serverside.*enable_maintenance.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"

data/spec/ey/web/enable_spec.rb

@@ -13,7 +13,7 @@ describe "ey web enable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/engineyard-serverside.*deploy disable_maintenance_page.*--app #{scenario[:application]}/)
+    @ssh_commands.should have_command_like(/engineyard-serverside.*disable_maintenance.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"

data/spec/spec_helper.rb

@@ -35,6 +35,8 @@ Dir[File.join(EY_ROOT,'/spec/support/*.rb')].each do |helper|
   require helper
 end
 
+TMPDIR = Pathname.new(__FILE__).dirname.parent.join('tmp')
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -47,6 +49,15 @@ RSpec.configure do |config|
   config.extend SpecHelpers::Given
   config.extend SpecHelpers::Fixtures
 
+  def clean_tmpdir
+    TMPDIR.rmtree if TMPDIR.exist?
+  end
+
+  # Cleaning the tmpdir has to happen outside of the test cycle because git repos
+  # last longer than the before/after :all test block in order to speed up specs.
+  config.before(:suite) { clean_tmpdir }
+  config.after(:suite) { clean_tmpdir }
+
   def clean_eyrc
     ENV['EYRC'] = File.join('/tmp','eyrc')
     if ENV['EYRC'] && File.exist?(ENV['EYRC'])
@@ -64,6 +75,11 @@ RSpec.configure do |config|
   config.before(:each) do
     EY::CloudClient.default_endpoint!
   end
+
+  config.after(:all) do
+    clean_eyrc
+  end
+
 end
 
 EY.define_git_repo("default") do |git_dir|

data/spec/support/git_repos.rb

@@ -12,8 +12,8 @@ module EY
       return git_repo_dir_cache[name] if git_repo_dir_cache.has_key?(name)
       raise ArgumentError, "No definition for git repo #{name}" unless git_repo_setup[name]
 
-      git_dir = Pathname.new("/tmp/engineyard_test_repo_#{Time.now.tv_sec}_#{Time.now.tv_usec}_#{$$}")
-      git_dir.mkdir
+      git_dir = TMPDIR.join("engineyard_test_repo_#{Time.now.tv_sec}_#{Time.now.tv_usec}_#{$$}")
+      git_dir.mkpath
       Dir.chdir(git_dir) do
         system("git init -q")
         system('git config user.email ey@spec.test')

data/spec/support/helpers.rb

@@ -155,16 +155,16 @@ module SpecHelpers
     end
 
     if path_prepends
-      tempdir = File.join(Dir.tmpdir, "ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")
-      Dir.mkdir(tempdir)
+      tempdir = TMPDIR.join("ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")
+      tempdir.mkpath
       path_prepends.each do |name, contents|
-        File.open(File.join(tempdir, name), 'w') do |f|
+        tempdir.join(name).open('w') do |f|
           f.write(contents)
           f.chmod(0755)
         end
       end
 
-      ey_env['PATH'] = tempdir + ':' + ENV['PATH']
+      ey_env['PATH'] = "#{tempdir}:#{ENV['PATH']}"
     end
 
     eybin = File.expand_path('../bundled_ey', __FILE__)

data/spec/support/shared_behavior.rb

@@ -254,7 +254,7 @@ shared_examples_for "it invokes engineyard-serverside" do
     end
 
     it "passes --verbose to engineyard-serverside" do
-      @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--verbose/)
+      @ssh_commands.should have_command_like(/engineyard-serverside.*--verbose/)
     end
 
     it "passes along instance information to engineyard-serverside" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5.1
+  version: 2.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement