engineyard-cloud-client 1.0.9 → 1.0.10

data/ChangeLog.md

@@ -4,6 +4,10 @@
 
   *
 
+## v1.0.10 (2013-02-20)
+
+  *
+
 ## v1.0.9 (2013-02-20)
 
   *

data/lib/engineyard-cloud-client/test/fake_awsm/config.ru

@@ -20,6 +20,7 @@ class FakeAwsm < Sinatra::Base
     Scenario::UnlinkedApp.new,
     Scenario::TwoApps.new,
     Scenario::LinkedApp.new,
+    Scenario::StuckDeployment.new,
     Scenario::MultipleAmbiguousAccounts.new,
     Scenario::LinkedAppNotRunning.new,
     Scenario::LinkedAppRedMaster.new,

data/lib/engineyard-cloud-client/test/fake_awsm/scenarios.rb

@@ -79,6 +79,13 @@ module Scenario
     end
   end  # LinkedApp
 
+  class StuckDeployment < LinkedApp
+    def initialize(name = 'Stuck Deployment', email = 'stuck.deployment@test.local', pass = 'stuck')
+      super
+      @app_env.deployments.create({"ref" => "master", "migrate" => false})
+    end
+  end
+
   class MultipleAmbiguousAccounts < LinkedApp
     def initialize(name = 'Multiple Ambiguous Accounts', email = 'multiple.ambiguous.accounts@test.local', pass = 'multi')
       super

data/lib/engineyard-cloud-client/version.rb

@@ -1,7 +1,7 @@
 # This file is maintained by a herd of rabid monkeys with Rakes.
 module EY
   class CloudClient
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end
 # Please be aware that the monkeys like tho throw poo sometimes.

data/spec/engineyard-cloud-client/integration/deployment_spec.rb

@@ -109,37 +109,35 @@ describe EY::CloudClient::AppEnvironment do
       deployment.finished
       EY::CloudClient::Deployment.last(@api, @app_env).should == deployment
     end
+  end
+
+  describe "canceling" do
+    before do
+      @api = scenario_cloud_client "Stuck Deployment"
+      result = EY::CloudClient::AppEnvironment.resolve(@api, 'app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
+      result.should be_one_match
+      @app_env = result.matches.first
+    end
 
-    context "canceling" do
-      before do
-        deployment = @app_env.new_deployment({
-          :ref             => 'master',
-          :migrate         => true,
-          :migrate_command => 'rake migrate',
-        })
-        deployment.start
-      end
-
-      it "marks the deployment finish and unsuccessful with a message" do
-        deployment = EY::CloudClient::Deployment.last(@api, @app_env)
-        deployment.should_not be_finished
-        deployment.cancel
-        deployment.should be_finished
-        deployment.should_not be_successful
-        deployment.output.rewind
-        deployment.output.read.should =~ /Marked as canceled by Linked App/
-
-        EY::CloudClient::Deployment.last(@api, @app_env).should be_finished
-      end
-
-      it "raises if the deployment is already finished" do
-        deployment = EY::CloudClient::Deployment.last(@api, @app_env)
-        deployment.out << "Test output"
-        deployment.successful = true
-        deployment.finished
-        deployment.should be_finished
-        expect { deployment.cancel }.to raise_error(EY::CloudClient::Error, "Previous deployment is already finished. Aborting.")
-      end
+    it "marks the deployment finish and unsuccessful with a message" do
+      deployment = EY::CloudClient::Deployment.last(@api, @app_env)
+      deployment.should_not be_finished
+      deployment.cancel
+      deployment.should be_finished
+      deployment.should_not be_successful
+      deployment.output.rewind
+      deployment.output.read.should =~ /Marked as canceled by Stuck Deployment/
+
+      EY::CloudClient::Deployment.last(@api, @app_env).should be_finished
+    end
+
+    it "raises if the deployment is already finished" do
+      deployment = EY::CloudClient::Deployment.last(@api, @app_env)
+      deployment.out << "Test output"
+      deployment.successful = true
+      deployment.finished
+      deployment.should be_finished
+      expect { deployment.cancel }.to raise_error(EY::CloudClient::Error, "Previous deployment is already finished. Aborting.")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3697782236831721463
+      hash: -1988218974776192980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -363,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3697782236831721463
+      hash: -1988218974776192980
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24