engineyard-cloud-client 1.0.10 → 1.0.11

data/ChangeLog.md

@@ -4,13 +4,18 @@
 
   *
 
+## v1.0.11 (2013-03-07)
+
+  * Supports Instance#availability\_zone in API response.
+  * Renames Deployment#cancel to Deployment#timeout, though still support using #cancel.
+
 ## v1.0.10 (2013-02-20)
 
-  *
+  * Provide a test scenario for stuck deployments
 
 ## v1.0.9 (2013-02-20)
 
-  *
+  * Add the ability to cancel stuck deployments
 
 ## v1.0.8 (2013-02-14)
 

data/lib/engineyard-cloud-client/models/deployment.rb

@@ -51,12 +51,20 @@ module EY
       alias deployed_by user_name
       alias deployed_by= user_name=
 
-      def created_at
-        @created_at ||= super && Time.parse(super)
+      def created_at=(cat)
+        if String === cat
+          super Time.parse(cat)
+        else
+          super
+        end
       end
 
-      def finished_at
-        @finished_at ||= super && Time.parse(super)
+      def finished_at=(fat)
+        if String === fat
+          super Time.parse(fat)
+        else
+          super
+        end
       end
 
       def config
@@ -110,25 +118,24 @@ module EY
         put_to_api({:successful => successful, :output => output.read})
       end
 
-      def cancel
+      def timeout
         if finished?
           raise EY::CloudClient::Error, "Previous deployment is already finished. Aborting."
         else
           current_user_name = api.current_user.name
           self.successful = false
-          err << "!> Marked as canceled by #{current_user_name}"
+          err << "!> Marked as timed out by #{current_user_name}"
           finished
         end
       end
+      alias cancel timeout
 
       def finished?
         !finished_at.nil?
       end
 
       def update_with_response(response)
-        response['deployment'].each do |key,val|
-          send("#{key}=", val) if respond_to?("#{key}=")
-        end
+        self.attributes = response['deployment']
         self
       end
 

data/lib/engineyard-cloud-client/models/instance.rb

@@ -2,7 +2,7 @@ require 'engineyard-cloud-client/models/api_struct'
 
 module EY
   class CloudClient
-    class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment, :bridge)
+    class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment, :bridge, :availability_zone)
       alias hostname public_hostname
       alias bridge? bridge
 

data/lib/engineyard-cloud-client/test/fake_awsm/models/instance.rb

@@ -3,12 +3,13 @@ require 'dm-core'
 class Instance
   include DataMapper::Resource
 
-  property :id,              Serial
-  property :name,            String
-  property :role,            String
-  property :status,          String
-  property :amazon_id,       String
-  property :public_hostname, String
+  property :id,                Serial
+  property :name,              String
+  property :role,              String
+  property :status,            String
+  property :amazon_id,         String
+  property :public_hostname,   String
+  property :availability_zone, String, :default => 'us-east-1b'
 
   belongs_to :environment
 

data/lib/engineyard-cloud-client/test/fake_awsm/views/instances.rabl

@@ -1,2 +1,2 @@
 collection @instances, :root => :instances, :object_root => false
-attributes :id, :status, :amazon_id, :role, :bridge, :name, :public_hostname
+attributes :id, :status, :amazon_id, :role, :bridge, :name, :public_hostname, :availability_zone

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.10'
+    VERSION = '1.0.11'
   end
 end
 # Please be aware that the monkeys like tho throw poo sometimes.

data/spec/engineyard-cloud-client/api_spec.rb

@@ -38,4 +38,28 @@ describe EY::CloudClient do
       EY::CloudClient.new.authenticate!("a@b.com", "foo")
     }.should raise_error(EY::CloudClient::RequestFailed, /API is temporarily unavailable/)
   end
+
+  it "raises RequestFailed with a friendly error when the response contains a message in json" do
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 409, :content_type => 'application/json', :body => %|{"message":"Important information regarding your failure"}|)
+
+    lambda {
+      EY::CloudClient.new.authenticate!("a@b.com", "foo")
+    }.should raise_error(EY::CloudClient::RequestFailed, /Error: Important information regarding your failure/)
+  end
+
+  it "raises RequestFailed with a semi-useful error message when the body is empty" do
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 409, :content_type => 'text/plain', :body => "")
+
+    lambda {
+      EY::CloudClient.new.authenticate!("a@b.com", "foo")
+    }.should raise_error(EY::CloudClient::RequestFailed, /Error: 409 Conflict/)
+  end
+
+  it "raises RequestFailed with the response body when the content type is not json" do
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 409, :content_type => 'text/plain', :body => "What a useful error message!")
+
+    lambda {
+      EY::CloudClient.new.authenticate!("a@b.com", "foo")
+    }.should raise_error(EY::CloudClient::RequestFailed, /Error: 409 Conflict What a useful error message!/)
+  end
 end

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

@@ -111,7 +111,7 @@ describe EY::CloudClient::AppEnvironment do
     end
   end
 
-  describe "canceling" do
+  describe "timing out (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')
@@ -122,11 +122,11 @@ describe EY::CloudClient::AppEnvironment do
     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.timeout
       deployment.should be_finished
       deployment.should_not be_successful
       deployment.output.rewind
-      deployment.output.read.should =~ /Marked as canceled by Stuck Deployment/
+      deployment.output.read.should =~ /Marked as timed out by Stuck Deployment/
 
       EY::CloudClient::Deployment.last(@api, @app_env).should be_finished
     end
@@ -137,7 +137,7 @@ describe EY::CloudClient::AppEnvironment do
       deployment.successful = true
       deployment.finished
       deployment.should be_finished
-      expect { deployment.cancel }.to raise_error(EY::CloudClient::Error, "Previous deployment is already finished. Aborting.")
+      expect { deployment.timeout }.to raise_error(EY::CloudClient::Error, "Previous deployment is already finished. Aborting.")
     end
   end
 end

data/spec/engineyard-cloud-client/models/app_spec.rb

@@ -55,10 +55,4 @@ describe EY::CloudClient::App do
       app.account.name.should == "myaccount"
     end
   end
-
-  describe "#destroy" do
-    it "hits the destroy action in the API" do
-      pending
-    end
-  end
 end

data/spec/engineyard-cloud-client/models/environment_spec.rb

@@ -162,12 +162,6 @@ describe EY::CloudClient::Environment do
     end
   end
 
-  describe "#destroy" do
-    it "hits the destroy action in the API" do
-      pending
-    end
-  end
-
   describe "#rebuild" do
     it "hits the rebuild action in the API" do
       env = EY::CloudClient::Environment.from_hash(cloud_client, { "id" => 46534 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1988218974776192980
+      hash: -1264950529868210162
 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: -1988218974776192980
+      hash: -1264950529868210162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24