engineyard 1.4.11 → 1.4.13

data/lib/engineyard/cli.rb

@@ -50,6 +50,8 @@ module EY
     method_option :extra_deploy_hook_options, :type => :hash, :default => {},
       :desc => "Additional options to be made available in deploy hooks (in the 'config' hash)"
     def deploy
+      EY.ui.info "Loading application data from EY Cloud..."
+
       app, environment = fetch_app_and_environment(options[:app], options[:environment], options[:account])
       environment.ignore_bad_master = options[:ignore_bad_master]
       deploy_ref  = if options[:app]
@@ -61,7 +63,7 @@ module EY
                         raise(DeployArgumentError)
                     end
 
-      EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
+      EY.ui.info "Beginning deploy of ref '#{deploy_ref}' for '#{app.name}' in '#{environment.name}' on server..."
 
       deploy_options = {'extras' => options[:extra_deploy_hook_options]}
       if options.has_key?('migrate') # thor set migrate => nil when --no-migrate

data/lib/engineyard/resolver.rb

@@ -24,7 +24,7 @@ module EY
         if options[:environment_name]
           message = "Multiple environments possible, please be more specific:\n\n"
           candidates.map{|e| [e[:account_name], e[:environment_name]]}.uniq.each do |account_name, environment_name|
-            message << "\t#{environment_name} # ey <command> --environment='#{environment_name}' --account='#{account_name}'\n"
+            message << "\t#{environment_name.ljust(25)} # ey <command> --environment='#{environment_name}' --account='#{account_name}'\n"
           end
           raise MultipleMatchesError.new(message)
         else
@@ -65,7 +65,7 @@ module EY
         candidates.map{|c| [c[:account_name], c[:app_name]]}.uniq.each do |account_name, app_name|
           message << "#{app_name}\n"
           candidates.select {|c| c[:app_name] == app_name && c[:account_name] == account_name}.map{|c| c[:environment_name]}.uniq.each do |env_name|
-            message << "\t#{env_name} # ey <command> --environment='#{env_name}' --app='#{app_name}' --account='#{account_name}'\n"
+            message << "\t#{env_name.ljust(25)} # ey <command> --environment='#{env_name}' --app='#{app_name}' --account='#{account_name}'\n"
           end
         end
         raise MultipleMatchesError.new(message)

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.4.11'
+  VERSION = '1.4.13'
 end

data/spec/ey/deploy_spec.rb

@@ -36,7 +36,7 @@ describe "ey deploy" do
   end
 
   def verify_ran(scenario)
-    @out.should match(/Beginning deploy for.*#{scenario[:application]}.*#{scenario[:environment]}/)
+    @out.should match(/Beginning deploy of ref '[^']+' for '#{scenario[:application]}' in '#{scenario[:environment]}'/)
     @out.should match(/deployment recorded in AppCloud/i)
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--app #{scenario[:application]}/)
   end
@@ -283,7 +283,7 @@ describe "ey deploy" do
 
     it "lets you choose by complete name even if the complete name is ambiguous" do
       fast_ey %w[deploy --environment railsapp_staging]
-      @out.should match(/Beginning deploy for.*'railsapp_staging'/)
+      @out.should match(/Beginning deploy of ref 'master' for '[\w]+' in 'railsapp_staging'/)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 4
-  - 11
-  version: 1.4.11
+  - 13
+  version: 1.4.13
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -101,12 +101,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 41
         segments: 
         - 1
         - 5
-        - 19
-        version: 1.5.19
+        - 21
+        version: 1.5.21
   requirement: *id006
   type: :runtime
   prerelease: false