engineyard 1.3.10 → 1.3.11

data/lib/engineyard/model/deployment.rb

@@ -2,47 +2,58 @@ require 'escape'
 
 module EY
   module Model
-    class Deployment < ApiStruct.new(:id, :app, :created_at, :environment, :finished_at, :migration_command, :output, :ref, :successful)
-      def self.started(environment, app, ref, migration_command)
-        from_hash({
-          :app               => app,
-          :environment       => environment,
-          :migration_command => migration_command,
-          :ref               => ref,
-          :created_at        => Time.now.utc,
+    class Deployment < ApiStruct.new(:id, :app, :created_at, :commit, :environment, :finished_at, :migrate_command, :output, :ref, :resolved_ref, :successful)
+      def self.started(environment, app, ref, migrate_command)
+        deployment = from_hash({
+          :app             => app,
+          :environment     => environment,
+          :migrate_command => migrate_command,
+          :ref             => ref,
+        })
+        deployment.start
+        deployment
+      end
+
+      def start
+        post_to_api({
+          :migrate         => !!migrate_command,
+          :migrate_command => migrate_command,
+          :output          => output,
+          :ref             => ref,
         })
       end
 
       def finished(successful, output)
         self.successful = successful
         self.output = output
-        self.finished_at = Time.now.utc
-        post_to_appcloud!
+        put_to_api({:successful => successful, :output => output})
       end
 
       private
 
-      def post_to_appcloud!
-        api.request(api_uri, :method => :post, :params => params)
-        EY.ui.info "Deployment recorded in AppCloud"
+      def post_to_api(params)
+        update_with_response api.request(collection_uri, :method => :post, :params => {:deployment => params})
       end
 
-      def params
-        {:deployment => {
-          :created_at      => created_at,
-          :finished_at     => finished_at,
-          :migrate         => !!migration_command,
-          :migrate_command => migration_command,
-          :output          => output,
-          :ref             => ref,
-          :successful      => successful,
-          }}
+      def put_to_api(params)
+        update_with_response api.request(member_uri("/finished"), :method => :put, :params => {:deployment => params})
+      end
+
+      def update_with_response(response)
+        data = response['deployment']
+        data.each do |key,val|
+          self[key] = val if members.include?(key)
+        end
       end
 
-      def api_uri
+      def collection_uri
         "/apps/#{app.id}/environments/#{environment.id}/deployments"
       end
 
+      def member_uri(path = nil)
+        "/apps/#{app.id}/environments/#{environment.id}/deployments/#{id}#{path}"
+      end
+
       def api
         app.api
       end

data/lib/engineyard/model/instance.rb

@@ -20,17 +20,21 @@ module EY
       private :adapter
 
       def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
+        successful, output = false, ""
         deployment = Deployment.started(environment, app, ref, migration_command)
 
         deploy_command = adapter(app, verbose).deploy do |args|
           args.config  = extra_configuration if extra_configuration
           args.migrate = migration_command if migration_command
-          args.ref     = ref
+          args.ref     = deployment.resolved_ref
         end
 
-        successful, output = invoke_with_output(deploy_command)
-        deployment.finished(successful, output)
-        successful
+        successful = invoke(deploy_command) { |chunk| output << chunk }
+      ensure
+        if deployment
+          deployment.finished(successful, output)
+          EY.ui.info "#{successful ? 'Successful' : 'Failed'} deployment recorded in AppCloud"
+        end
       end
 
       def rollback(app, extra_configuration=nil, verbose=false)
@@ -67,32 +71,27 @@ module EY
 
     private
 
-      def ssh(remote_command)
+      def ssh(remote_command, &block)
+        raise(ArgumentError, "Block required!") unless block_given?
         user = environment.username
-        out = ""
-        tee = lambda do |chunk|
-          out << chunk
-          $stdout << chunk
-        end
-
         cmd = Escape.shell_command(%w[ssh -o StrictHostKeyChecking=no -q] << "#{user}@#{hostname}" << remote_command)
         EY.ui.debug(cmd)
         if ENV["NO_SSH"]
-          [true, "NO_SSH is set."]
+          block.call("NO_SSH is set. No output.")
+          true
         else
-          status = Open4.spawn(cmd, :out => tee, :err => tee, :quiet => true)
-          [status.success?, out]
+          status = Open4.spawn(cmd, :out => block, :err => block, :quiet => true)
+          status.success?
         end
       end
 
-      def invoke(action)
-        invoke_with_output(action).first
-      end
-
-      def invoke_with_output(action)
+      def invoke(action, &block)
         action.call do |cmd|
           puts cmd if action.verbose
-          ssh cmd
+          ssh cmd do |chunk|
+            $stdout << chunk
+            block.call(chunk) if block
+          end
         end
       end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.10'
+  VERSION = '1.3.11'
 end

data/spec/ey/deploy_spec.rb

@@ -38,7 +38,7 @@ describe "ey deploy" do
 
   def verify_ran(scenario)
     @out.should match(/Beginning deploy for.*#{scenario[:application]}.*#{scenario[:environment]}/)
-    @out.should match(/Deployment recorded in AppCloud/)
+    @out.should match(/deployment recorded in AppCloud/i)
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--app #{scenario[:application]}/)
   end
 
@@ -200,27 +200,27 @@ describe "ey deploy" do
     context "without a configured default branch" do
       it "defaults to the checked-out local branch" do
         ey "deploy"
-        @ssh_commands.last.should =~ /--ref current-branch/
+        @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
 
       it "deploys another branch if given" do
         ey "deploy --ref master"
-        @ssh_commands.last.should =~ /--ref master/
+        @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
       it "deploys a tag if given" do
         ey "deploy --ref v1"
-        @ssh_commands.last.should =~ /--ref v1/
+        @ssh_commands.last.should =~ /--ref resolved-v1/
       end
 
       it "allows using --branch to specify a branch" do
         ey "deploy --branch master"
-        @ssh_commands.last.should match(/--ref master/)
+        @ssh_commands.last.should match(/--ref resolved-master/)
       end
 
       it "allows using --tag to specify the tag" do
         ey "deploy --tag v1"
-        @ssh_commands.last.should match(/--ref v1/)
+        @ssh_commands.last.should match(/--ref resolved-v1/)
       end
     end
 
@@ -250,7 +250,7 @@ describe "ey deploy" do
 
       it "deploys the default branch by default" do
         ey "deploy"
-        @ssh_commands.last.should =~ /--ref master/
+        @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
       it "complains about a non-default branch without --ignore-default_branch" do
@@ -260,7 +260,7 @@ describe "ey deploy" do
 
       it "deploys a non-default branch with --ignore-default-branch" do
         ey "deploy -r current-branch --ignore-default-branch"
-        @ssh_commands.last.should =~ /--ref current-branch/
+        @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
     end
   end
@@ -327,7 +327,7 @@ describe "ey deploy" do
     it "allows you to specify an app when not in a directory" do
       ey "deploy --app rails232app --ref master"
       @ssh_commands.last.should match(/--app rails232app/)
-      @ssh_commands.last.should match(/--ref master/)
+      @ssh_commands.last.should match(/--ref resolved-master/)
     end
 
     it "requires that you specify a ref when specifying the application" do

data/spec/support/fake_awsm.ru

@@ -107,7 +107,11 @@ class FakeAwsm < Sinatra::Base
   end
 
   post "/api/v2/apps/:app_id/environments/:environment_id/deployments" do
-    {"deployment" => params[:deployment].merge({"id" => 2, "commit" => 'a'*40})}.to_json
+    {"deployment" => params[:deployment].merge({"id" => 2, "commit" => 'a'*40, "resolved_ref" => "resolved-#{params[:deployment][:ref]}"})}.to_json
+  end
+
+  put "/api/v2/apps/:app_id/environments/:environment_id/deployments/:deployment_id/finished" do
+    {"deployment" => params[:deployment].merge({"id" => 2, "finished_at" => Time.now})}.to_json
   end
 
   post "/api/v2/authenticate" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 10
-  version: 1.3.10
+  - 11
+  version: 1.3.11
 platform: ruby
 authors: 
 - EY Cloud Team