engineyard 1.4.13 → 1.4.14

data/lib/engineyard/api.rb

@@ -52,6 +52,7 @@ module EY
 
     class InvalidCredentials < EY::Error; end
     class RequestFailed < EY::Error; end
+    class ResourceNotFound < RequestFailed; end
 
     def self.request(path, opts={})
       require 'rest_client'
@@ -79,7 +80,7 @@ module EY
       rescue Errno::ECONNREFUSED
         raise RequestFailed, "Could not reach the cloud API"
       rescue RestClient::ResourceNotFound
-        raise RequestFailed, "The requested resource could not be found"
+        raise ResourceNotFound, "The requested resource could not be found"
       rescue RestClient::BadGateway
         raise RequestFailed, "AppCloud API is temporarily unavailable. Please try again soon."
       rescue RestClient::RequestFailed => e

data/lib/engineyard/cli.rb

@@ -65,7 +65,7 @@ module EY
 
       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]}
+      deploy_options = {'extras' => {'deployed_by' => api.user.name}.merge(options[:extra_deploy_hook_options])}
       if options.has_key?('migrate') # thor set migrate => nil when --no-migrate
         deploy_options['migrate'] = options['migrate'].respond_to?(:to_str) ? options['migrate'] : !!options['migrate']
       end

data/lib/engineyard/model/deployment.rb

@@ -14,6 +14,8 @@ module EY
       def self.get(app, environment, id, api)
         response = api.request(api_root(app.id, environment.id) + "/#{id}", :method => :get)
         load_from_response app, environment, response
+      rescue EY::API::ResourceNotFound
+        nil
       end
 
       def self.load_from_response(app, environment, response)

data/lib/engineyard/model/instance.rb

@@ -20,7 +20,7 @@ module EY
       private :adapter
 
       def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
-        successful, output = false, ""
+        successful, output = false, "Deploy initiated.\n"
         deployment = Deployment.started(environment, app, ref, migration_command)
 
         deploy_command = adapter(app, verbose).deploy do |args|
@@ -30,6 +30,14 @@ module EY
         end
 
         successful = invoke(deploy_command) { |chunk| output << chunk }
+      rescue Interrupt
+        EY.ui.info "Interrupted. Exiting..."
+        output << "Interrupted.\n"
+        raise
+      rescue StandardError => e
+        EY.ui.info "Error encountered during deploy."
+        output <<  "Error encountered during deploy.\n#{e.class} #{e}\n"
+        raise
       ensure
         if deployment
           deployment.finished(successful, output)
@@ -80,7 +88,8 @@ module EY
         exit_code = nil
         cmd = Escape.shell_command(['bash', '-lc', remote_command])
         EY.ui.debug(cmd)
-        puts cmd if verbose
+        block.call("Triggering deploy on #{environment.username}@#{hostname}.\n")
+        block.call(cmd) if verbose
         if ENV["NO_SSH"]
           block.call("NO_SSH is set. No output.")
           true

data/lib/engineyard/resolver.rb

@@ -1,7 +1,7 @@
 module EY
   class Resolver
     attr_reader :api
-    
+
     def initialize(api)
       @api = api
     end
@@ -79,7 +79,7 @@ module EY
     def app_deployments
       @app_deployments ||= api.apps.map do |app|
         app.environments.map do |environment|
-          { 
+          {
             :app_name => app.name.downcase,
             :repository_uri => app.repository_uri,
             :environment_name => environment.name.downcase,

data/lib/engineyard/version.rb

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

data/spec/ey/deploy_spec.rb

@@ -246,7 +246,7 @@ describe "ey deploy" do
 
       it "gets passed along to engineyard-serverside" do
         fast_ey %w[deploy]
-        @ssh_commands.last.should =~ /--config '\{\"bert\":\"ernie\"\}'/
+        @ssh_commands.last.should =~ /--config \S+"bert":"ernie"/
       end
     end
 

data/spec/ey/status_spec.rb

@@ -14,7 +14,7 @@ describe "ey environments" do
     @out.should =~ /Environment:\s+giblets/
     @out.should =~ /Ref:\s+HEAD/
     @out.should =~ /Resolved Ref:\s+HEAD/
-    @out.should =~ /Deployed by:\s+User/
+    @out.should =~ /Deployed by:\s+User Name/
     @out.should =~ /Created at:/
     @out.should =~ /Finished at:/
     @out.should =~ /This deployment was successful/

data/spec/ey/whoami_spec.rb

@@ -10,7 +10,7 @@ describe "ey whoami" do
 
     it "outputs the currently logged in user" do
       ey %w[whoami]
-      @out.should include("User (test@test.test)")
+      @out.should include("User Name (test@test.test)")
     end
   end
 
@@ -31,7 +31,7 @@ describe "ey whoami" do
       @out.should include("Email:")
       @out.should include("Password:")
 
-      @out.should include("User (test@test.test)")
+      @out.should include("User Name (test@test.test)")
     end
   end
 end

data/spec/support/fake_awsm.ru

@@ -44,7 +44,7 @@ class FakeAwsm < Sinatra::Base
   end
 
   get "/api/v2/current_user" do
-    { "user" => { "id" => 1, "name" => "User", "email" => "test@test.test" } }.to_json
+    { "user" => { "id" => 1, "name" => "User Name", "email" => "test@test.test" } }.to_json
   end
 
   get "/api/v2/apps" do
@@ -111,7 +111,7 @@ class FakeAwsm < Sinatra::Base
         "ref" => "HEAD",
         "resolved_ref" => "HEAD",
         "commit" => 'a'*40,
-        "user_name" => "User",
+        "user_name" => "User Name",
         "migrate_command" => "rake db:migrate --trace",
         "created_at" => Time.now.utc - 3600,
         "finished_at" => Time.now.utc - 3400,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 4
-  - 13
-  version: 1.4.13
+  - 14
+  version: 1.4.14
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 Z
+date: 2011-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement