engineyard 2.2.1 → 2.3.0

data/spec/ey/timeout_deploy_spec.rb

@@ -13,6 +13,6 @@ describe "ey timeout-deploy" do
   it "complains when there is no stuck deployment" do
     login_scenario "one app, one environment"
     fast_failing_ey ["timeout-deploy"]
-    @err.should include(%|No unfinished deployment was found for main/rails232app/giblets.|)
+    @err.should include(%|No unfinished deployment was found for main / rails232app / giblets.|)
   end
 end

data/spec/spec_helper.rb

@@ -56,13 +56,6 @@ RSpec.configure do |config|
   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'])
-      File.unlink(ENV['EYRC'])
-    end
-  end
-
   config.before(:all) do
     clean_eyrc
     FakeWeb.allow_net_connect = false

data/spec/support/helpers.rb

@@ -249,14 +249,28 @@ module SpecHelpers
     @scenario_api_token
   end
 
+  def clean_tmpdir
+    TMPDIR.rmtree if TMPDIR.exist?
+  end
+
   def read_yaml(file)
-    YAML.load(File.read(File.expand_path(file)))
+    contents = File.read(File.expand_path(file))
+    YAML.load(contents)
+  rescue Exception => e
+    raise "#{e}\n#{contents}"
   end
 
   def write_yaml(data, file)
     File.open(file, "w"){|f| YAML.dump(data, f) }
   end
 
+  def clean_eyrc
+    ENV['EYRC'] = File.join('/tmp','eyrc')
+    if ENV['EYRC'] && File.exist?(ENV['EYRC'])
+      File.unlink(ENV['EYRC'])
+    end
+  end
+
   def read_eyrc
     read_yaml(ENV['EYRC'])
   end
@@ -265,6 +279,34 @@ module SpecHelpers
     write_yaml(data, ENV['EYRC'])
   end
 
+  def ey_yml
+    EY::Config.pathname
+  end
+
+  def clean_ey_yml
+    ey_yml.unlink if ey_yml && ey_yml.exist?
+    FileUtils.rm_r 'config' if FileTest.exist?('config')
+  end
+
+  def read_ey_yml
+    read_yaml(EY::Config.pathname)
+  end
+
+  def write_ey_yml(data)
+    write_yaml(data, EY::Config.pathname_for_write)
+  end
+
+  def expect_config(*keys)
+    root = keys.unshift('defaults') unless %w[defaults environments].include?(keys.first)
+    config = read_ey_yml
+    value = keys.inject(config) { |conf, key| conf[key] }
+    expect(value)
+  end
+
+  def exist
+    be_exist
+  end
+
   def with_env(new_env_vars)
     raise ArgumentError, "with_env takes a block" unless block_given?
     old_env_vars = {}

data/spec/support/shared_behavior.rb

@@ -86,6 +86,7 @@ shared_examples_for "it takes an environment name and an account name" do
       run_ey({:environment => "giblets", :account => "main"})
       verify_ran(make_scenario({
           :environment      => 'giblets',
+          :account          => 'main',
           :application      => 'rails232app',
           :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
           :ssh_username     => 'turkey',
@@ -113,6 +114,7 @@ shared_examples_for "it takes an environment name" do
     run_ey(:environment => nil)
     verify_ran(make_scenario({
           :environment      => 'giblets',
+          :account          => 'main',
           :application      => 'rails232app',
           :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
           :ssh_username     => 'turkey',
@@ -168,10 +170,11 @@ shared_examples_for "it takes an environment name" do
 
     it "works when the substring is unambiguous" do
       login_scenario "one app, many similarly-named environments"
-      run_ey({:environment => 'prod', :migrate => true}, {:debug => true})
+      run_ey({:environment => 'prod', :migrate => 'rake db:migrate'}, {:debug => true})
       verify_ran(make_scenario({
         :environment      => 'railsapp_production',
         :application      => 'rails232app',
+        :account          => 'main',
         :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
         :ssh_username     => 'turkey',
       }))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 1.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -291,13 +291,15 @@ files:
 - lib/engineyard/cli/web.rb
 - lib/engineyard/cli.rb
 - lib/engineyard/config.rb
-- lib/engineyard/deploy_config/migrate.rb
 - lib/engineyard/deploy_config/ref.rb
 - lib/engineyard/deploy_config.rb
 - lib/engineyard/error.rb
 - lib/engineyard/eyrc.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/serverside_runner.rb
+- lib/engineyard/templates/ey.yml.erb
+- lib/engineyard/templates/ey_yml.rb
+- lib/engineyard/templates.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb
@@ -345,6 +347,7 @@ files:
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
+- spec/ey/init_spec.rb
 - spec/ey/list_environments_spec.rb
 - spec/ey/login_spec.rb
 - spec/ey/logout_spec.rb
@@ -354,6 +357,7 @@ files:
 - spec/ey/recipes/download_spec.rb
 - spec/ey/recipes/upload_spec.rb
 - spec/ey/rollback_spec.rb
+- spec/ey/servers_spec.rb
 - spec/ey/ssh_spec.rb
 - spec/ey/status_spec.rb
 - spec/ey/timeout_deploy_spec.rb
@@ -373,11 +377,13 @@ homepage: http://github.com/engineyard/engineyard
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! "Thanks for installing engineyard 2.1.\n\nNeed help? Problem?
+post_install_message: ! "Thanks for installing the engineyard gem!\n\nNeed help? Problem?
   https://support.cloud.engineyard.com\nNot working? Uninstall this version to downgrade.\n\nIMPORTANT:\n
-  \ Please verify eydeploy.rb files in staging after upgrading!\n  Many internals
-  have changed that could break eydeploy.rb.\n\nDeploying for the first time? The
-  Engine Yard Pandas want to help you!\nEmail pandas@engineyard.com with your questions.\n"
+  \ Please verify eydeploy.rb files in staging after upgrading!\n  Internals frequently
+  change that could break eydeploy.rb.\n\nGetting started:\n  1. Run `ey init` to
+  generate an annotated config file.\n  2. Review the ey.yml file and commit it to
+  your repository.\n  3. Run `ey deploy` when you're ready to deploy.\nThe Engine
+  Yard Pandas want to help you!\nEmail pandas@engineyard.com with your questions.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -407,6 +413,7 @@ test_files:
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
+- spec/ey/init_spec.rb
 - spec/ey/list_environments_spec.rb
 - spec/ey/login_spec.rb
 - spec/ey/logout_spec.rb
@@ -416,6 +423,7 @@ test_files:
 - spec/ey/recipes/download_spec.rb
 - spec/ey/recipes/upload_spec.rb
 - spec/ey/rollback_spec.rb
+- spec/ey/servers_spec.rb
 - spec/ey/ssh_spec.rb
 - spec/ey/status_spec.rb
 - spec/ey/timeout_deploy_spec.rb

data/lib/engineyard/deploy_config/migrate.rb

@@ -1,129 +0,0 @@
-module EY
-  class DeployConfig
-    class Migrate
-
-      DEFAULT = 'rake db:migrate'
-
-      def initialize(cli_opts, env_config, ui)
-        @cli_opts = cli_opts
-        @env_config = env_config
-        @ui = ui
-
-        @perform = nil
-        @command = nil
-      end
-
-      # Returns an array of [perform_migration, migrate_command] on success.
-      # Yields the block if no migrate options are set.
-      def when_outside_repo
-        if perform_from_cli_opts
-          if @perform
-            @command ||= command_from_opts || DEFAULT
-          else
-            @command = nil
-          end
-          [@perform, @command]
-        else
-          raise RefAndMigrateRequiredOutsideRepo.new(@cli_opts)
-        end
-      end
-
-      # Returns an array of [perform_migration, migrate_command] on success.
-      # Should always return successfully.
-      def when_inside_repo
-        if perform_from_cli_opts || perform_from_config || perform_from_interaction
-          if @perform
-            @command ||= command_from_opts || command_from_config || DEFAULT
-          else
-            @command = nil
-          end
-          [@perform, @command]
-        else
-          raise MigrateRequired.new(@cli_opts)
-        end
-      end
-
-      private
-
-      attr_reader :cli_opts, :env_config, :ui
-
-      def command_from_opts
-        cli_migrate = cli_opts.fetch('migrate', nil)
-        cli_migrate.respond_to?(:to_str) && cli_migrate.to_str
-      end
-
-      def command_from_config
-        env_config.migrate_command
-      end
-
-      def perform_from_cli_opts
-        @perform = cli_opts.fetch('migrate') { return false } # yields on not found
-        true
-      end
-
-      def perform_from_config
-        @perform = env_config.fetch('migrate') { return perform_implied_via_command_in_config }
-        if @perform
-          unless command_from_config
-            env_config.migration_command = DEFAULT
-          end
-        end
-        true
-      end
-
-      # if the command is set in ey.yml and perform isn't explicitly turned off,
-      # then we'll write out the old default of migrating always, since that's
-      # probably what is expected.
-      def perform_implied_via_command_in_config
-        if @perfom.nil? && @command = command_from_config
-          @perform = true
-          env_config.migrate = @perform
-          ui.info "********************************************************************************"
-          ui.info "#{env_config.path} config for #{env_config.name} has been updated to"
-          ui.info "migrate by default to maintain previous expected default behavior."
-          ui.info ""
-          ui.info "Please git commit #{env_config.path} with these new changes.", :yellow
-          ui.info ""
-          true
-        else
-          false
-        end
-      end
-
-      def perform_from_interaction
-        @perform = ui.agree("Run migrations by default on #{env_config.name}? ", true)
-        env_config.migrate = @perform
-        if @perform
-          command_from_interaction
-        end
-        ui.info "#{env_config.path}: migrate settings saved for #{env_config.name}."
-        ui.info "You can override this default with --migrate or --no-migrate."
-        ui.info "Please git commit #{env_config.path} with these new changes.", :yellow
-        true
-      rescue Timeout::Error
-        @perform = nil
-        @command = nil
-        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
-
-      # only interactively request a command if we interactively requested the perform setting.
-      # don't call this outside of the interactive setting (otherwise, why even have a default?)
-      def command_from_interaction
-        default = env_config.migration_command || DEFAULT
-        @command = ui.ask("Migration command? ", false, default)
-        env_config.migration_command = @command
-        @command
-      end
-    end
-  end
-end