engineyard-cloud-client 1.0.8 → 1.0.9

data/ChangeLog.md

@@ -4,6 +4,10 @@
 
   *
 
+## v1.0.9 (2013-02-20)
+
+  *
+
 ## v1.0.8 (2013-02-14)
 
   * Loosen the multi\_json gem version requirement to allow 1.0 compatible security fixes.

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

@@ -40,7 +40,7 @@ module EY
         unless String === value
           value = value.pretty_inspect.rstrip                 # remove trailing whitespace
           if value.index("\n")                                # if the inspect is multi-line
-            value.gsub!(/[\r\n]./, "\n" + ' ' * (indent + 2)) # indent it
+            value = value.gsub(/^/, " "*(indent + 2)).lstrip  # indent it
           end
         end
         @output << "#{name.to_s.rjust(indent)}  #{value.rstrip}\n"       # just one newline
@@ -118,11 +118,33 @@ module EY
       rescue RestClient::BadGateway
         raise RequestFailed, "EY Cloud API is temporarily unavailable. Please try again soon."
       rescue RestClient::RequestFailed => e
-        raise RequestFailed, "#{e.message} #{e.response}"
+        raise RequestFailed, "Error: #{parse_error(e)}"
       rescue OpenSSL::SSL::SSLError
         raise RequestFailed, "SSL is misconfigured on your cloud"
       end
 
+      def parse_error(error)
+        resp = error.response
+        debug("Error", error.message)
+
+        if resp.body.empty?
+          debug("Response", '<<Response body is empty>>')
+          error.message
+        elsif resp.headers[:content_type] =~ /application\/json/
+          begin
+            data = MultiJson.load(resp.body)
+            debug("Response", data)
+            data['message'] ? data['message'] : "#{error.message} #{data.inspect}"
+          rescue MultiJson::DecodeError
+            debug("Response", resp.body)
+            "#{error.message} #{resp.body}"
+          end
+        else
+          debug("Response", resp.body)
+          "#{error.message} #{resp.body}"
+        end
+      end
+
       def parse_response(resp)
         if resp.body.empty?
           ''

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

@@ -11,9 +11,9 @@ module EY
         end
       end
 
-      def set(klass, obj)
-        if obj.respond_to?(:id) && obj.id
-          @registry[klass][obj.id] = obj
+      def set(klass, id, obj)
+        if id && obj
+          @registry[klass][id] = obj
         end
       end
     end

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

@@ -24,7 +24,7 @@ module EY
               obj.attributes = attrs_or_struct
             else
               obj = new(api, attrs_or_struct)
-              api.registry.set(self, obj)
+              api.registry.set(self, obj.id, obj)
             end
             obj
           end

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

@@ -110,6 +110,17 @@ module EY
         put_to_api({:successful => successful, :output => output.read})
       end
 
+      def cancel
+        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}"
+          finished
+        end
+      end
+
       def finished?
         !finished_at.nil?
       end

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

@@ -97,7 +97,7 @@ class FakeAwsm < Sinatra::Base
       ""
     else
       status 404
-      return {"message" => "Keypair not found with id #{params['id'].inspect}"}.to_json
+      json  "message" => "Keypair not found with id #{params['id'].inspect}"
     end
   end
 
@@ -133,7 +133,7 @@ class FakeAwsm < Sinatra::Base
   end
 
   get "/api/v2/environments/:env_id/logs" do
-    {
+    json(
       "logs" => [
         {
           "id" => 'i-12345678',
@@ -142,7 +142,7 @@ class FakeAwsm < Sinatra::Base
           "custom" => "CUSTOM LOG OUTPUT"
         }
       ]
-    }.to_json
+    )
   end
 
   get "/api/v2/environments/:env_id/recipes" do
@@ -210,7 +210,7 @@ class FakeAwsm < Sinatra::Base
       render :rabl, :deployment, :format => "json"
     else
       status(404)
-      {"message" => "Deployment not found: last"}.to_json
+      json "message" => "Deployment not found: last"
     end
   end
 
@@ -224,10 +224,10 @@ class FakeAwsm < Sinatra::Base
   post "/api/v2/authenticate" do
     user = User.first(:email => params[:email], :password => params[:password])
     if user
-      {"api_token" => user.api_token, "ok" => true}.to_json
+      json  "api_token" => user.api_token, "ok" => true
     else
       status(401)
-      {"ok" => false}.to_json
+      json  "ok" => false
     end
   end
 

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

@@ -15,7 +15,7 @@ module EY::CloudClient::Test
       unless system("ruby -c '#{config_ru}' > /dev/null")
         raise SyntaxError, "There is a syntax error in fake_awsm/config.ru! FIX IT!"
       end
-      @server = RealWeb.start_server_in_fork(config_ru, :timeout => 5)
+      @server = RealWeb.start_server_in_fork(config_ru, :timeout => 10, :verbose => ENV['DEBUG'])
       @server.base_uri.to_s
     end
   end

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

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

@@ -109,5 +109,37 @@ describe EY::CloudClient::AppEnvironment do
       deployment.finished
       EY::CloudClient::Deployment.last(@api, @app_env).should == deployment
     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
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe EY::CloudClient::ApiStruct do
-  class Foo < EY::CloudClient::ApiStruct.new(:fruit, :veggie); end
+  class Foo < EY::CloudClient::ApiStruct.new(:id, :fruit, :veggie); end
 
   it "acts like a normal struct" do
     f = Foo.new(cloud_client, "fruit" => "banana")

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

@@ -16,7 +16,7 @@ describe EY::CloudClient::App do
       }
 
       FakeWeb.register_uri(:get, "https://cloud.engineyard.com/api/v2/apps?no_instances=true",
-        :body => response.to_json, :content_type => "application/json")
+        :body => MultiJson.dump(response), :content_type => "application/json")
 
       apps = EY::CloudClient::App.all(cloud_client)
 
@@ -40,7 +40,7 @@ describe EY::CloudClient::App do
       }
 
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/accounts/1234/apps",
-        :body => response.to_json, :content_type => "application/json")
+        :body => MultiJson.dump(response), :content_type => "application/json")
 
       app = EY::CloudClient::App.create(cloud_client, {
         "account"        => account,

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

@@ -36,7 +36,7 @@ describe EY::CloudClient::Environment do
       }
 
       FakeWeb.register_uri(:get, "https://cloud.engineyard.com/api/v2/environments?no_instances=true",
-        :body => response.to_json, :content_type => "application/json")
+        :body => MultiJson.dump(response), :content_type => "application/json")
 
       environments = EY::CloudClient::Environment.all(cloud_client)
 
@@ -80,7 +80,7 @@ describe EY::CloudClient::Environment do
            "instance_status"=>"none"}}
 
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/apps/12345/environments",
-        :body => response.to_json, :content_type => "application/json")
+        :body => MultiJson.dump(response), :content_type => "application/json")
 
       env = EY::CloudClient::Environment.create(cloud_client, {
         "app"                   => app,
@@ -143,7 +143,7 @@ describe EY::CloudClient::Environment do
            "instance_status"=>"starting"}}
 
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/apps/12345/environments",
-        :body => response.to_json, :content_type => "application/json")
+        :body => MultiJson.dump(response), :content_type => "application/json")
 
       env = EY::CloudClient::Environment.create(cloud_client, {
         "app"                   => app,
@@ -218,7 +218,7 @@ describe EY::CloudClient::Environment do
 
       FakeWeb.register_uri(:get,
         "https://cloud.engineyard.com/api/v2/environments/#{env.id}/instances",
-        :body => {"instances" => [instance_data]}.to_json,
+        :body => MultiJson.dump({"instances" => [instance_data]}),
         :content_type => 'application/json'
       )
 

data/spec/spec_helper.rb

@@ -36,7 +36,6 @@ support.each{|helper| require helper }
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 
   config.include SpecHelpers
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -251,6 +251,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem connects to the EY Cloud API
 email: cloud@engineyard.com
 executables: []
@@ -338,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1071401773858451620
+      hash: -3697782236831721463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -347,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1071401773858451620
+      hash: -3697782236831721463
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24