engineyard-cloud-client 1.0.14 → 1.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGMzOTBkZDIxYjQyYTAwNjVmNThmZDkxMDJkZmM2NWIxYTA0MzUwZg==
+    OWRmNTExNmI5NjU0NGY2ODFjYjhjMDk3MDJhYzIwMzY4MjI1ZDVjYw==
   data.tar.gz: !binary |-
-    NDA2NmJlZjk0MjhjMDczYjU4NDBiNzlmMzJlZmIxOTQzMzhlMWFhNA==
-!binary "U0hBNTEy":
+    OTg3NjBjZmM4ZGU4OTc2YzVkMmJhZjA3YWNjMmYwZGM0NGI5NzE1Yg==
+SHA512:
   metadata.gz: !binary |-
-    M2FiNTY5Y2Y2NWVkZDQ2N2YzMzc2N2IzZDA5MDQ1Y2UzY2NhMzg3NDhmOTc5
-    NWRjOGU4Yjc1NDNkYWNjMjcyYjg4OTIzY2FiNDMyNWQxNTRhNmUzOGQyZjVj
-    M2YwZWFhOGZiY2QwNTgxYjMxZjgwODVmYjIyZWRkNDg5NTZmZTQ=
+    MTY1ODg3MTY2M2ZlNGVhMTUyYTRkMGM0MzRhYTUwMTFmOTIwY2QxNDk2ZTg1
+    MGRjNmEwNDhjMWE3YTJjOTdkYTBlZDIyZGYxZmY0MTM5ODY2YWRjZjI0OWZi
+    MGM4YzE3NWNjYTJiYjEzOTZjOWRiYzQ2MmZhYTA0ODAwOGMyZWM=
   data.tar.gz: !binary |-
-    YjFiYmE5YTg1ODA3ZjM1YmQwNTg3NmUyYjAxMWQwNWRhYzgxYjAyNGMyNzMx
-    NmU0ZjQwZGI1ZWQ1NDdmNGNmZDFhYWFmNTg4ZTk1MjliYmQxNzUxOWIyNGVk
-    NWUzZjVjMGU1MmYyMTIyNmQ3NWRmYzEwM2EyNjhjOGYwMzFmMzg=
+    ZmJlMGU5MTkyYzkyNDdlNzBlZGM4OTZhOWU4OWMzNjQ2NDRmZjE2YTNmMmE4
+    NGQ4MjgyNmZhYWYwNzE1N2JhZTU4YmZjZjU0MjYwZDI0NDk5Y2M5YzMwMjRj
+    ZDE4MDY4Njk2NWJkYTg2ZGY0ZjBjMTA1N2ZiODFiMzI5M2M5NzA=

data/ChangeLog.md

@@ -4,6 +4,10 @@
 
   *
 
+## v1.0.15 (2013-11-15)
+
+  *
+
 ## v1.0.14 (2013-09-04)
 
   * Add sorting comparator spaceship (<=>) to each of the models.

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

@@ -7,7 +7,8 @@ require 'uri'
 module EY
   class CloudClient
     class Connection
-      attr_reader :token, :output, :user_agent, :endpoint
+      attr_reader :output, :user_agent, :endpoint
+      attr_accessor :token
 
       BASE_USER_AGENT = "EngineYardCloudClient/#{EY::CloudClient::VERSION}".freeze
       DEFAULT_ENDPOINT = "https://cloud.engineyard.com/".freeze
@@ -22,17 +23,13 @@ module EY
         @output     = options[:output] || $stdout
         @user_agent = [options[:user_agent], BASE_USER_AGENT].compact.join(' ').strip
         @endpoint   = URI.parse(options[:endpoint] || DEFAULT_ENDPOINT)
-        self.token  = options[:token]
+        @token      = options[:token]
 
         unless @endpoint.absolute?
           raise BadEndpointError.new(@endpoint)
         end
       end
 
-      def token=(new_token)
-        @token = new_token
-      end
-
       def debug(name, value)
         return unless ENV['DEBUG']
 

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

@@ -9,6 +9,7 @@ module EY
     class InvalidInstanceRole    < Error; end
     class InstanceNotProvisioned < Error; end
     class MultipleMatchesError   < RequestFailed; end
+    class InvalidInstanceName    < Error; end
 
     class BadEndpointError < Error
       def initialize(endpoint)

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

@@ -23,6 +23,38 @@ module EY
         ResolverResult.new(api, matches, response['errors'], response['suggestions'])
       end
 
+      # Accepts an api object, environment name and optional account name
+      # and returns the best matching environment for the given constraints.
+      #
+      # This is a shortcut for resolve_environments.
+      # Raises if nothing is found or if more than one environment is found.
+      def self.resolve_one(api, constraints)
+        resolver = resolve(api, constraints)
+
+        resolver.one_match { |match| return match  }
+
+        resolver.no_matches do |errors, suggestions|
+          message = nil
+          if suggestions.any?
+            message = "Suggestions found:\n"
+            suggestions.sourt_by{|suggest| [suggest['account_name'], suggest['app_name']] }.each do |suggest|
+              message << "\t#{suggest['account_name']}/#{suggest['app_name']}/#{suggest['env_name']}\n"
+            end
+          end
+
+          raise ResourceNotFound.new([errors,message].compact.join("\n").strip)
+        end
+
+        resolver.many_matches do |matches|
+          message = "Multiple app_environments possible, please be more specific:\n"
+          matches.sort_by {|ae| ae.app}.each do |ae|
+            message << "\t#{ae.hierarchy_name}\n"
+          end
+          raise MultipleMatchesError.new(message)
+        end
+      end
+
+
       def initialize(api, attrs)
         super
 

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

@@ -219,12 +219,26 @@ module EY
       # Note that the role for an instance MUST be either "app" or "util".
       # No other value is acceptable. The "name" parameter can be anything,
       # but it only applies to utility instances.
+      #
+      # Note also that if you add a util instance, you *must* specify a
+      # name. This method will raise if you don't.
       def add_instance(opts)
         unless %w[app util].include?(opts[:role].to_s)
           # Fail immediately because we don't have valid arguments.
           raise InvalidInstanceRole, "Instance role must be one of: app, util"
         end
 
+        # Sanitize the name to remove whitespace if there is any
+        if opts[:name]
+          name = opts[:name].gsub(/\s+/, '')
+        end
+
+        if opts[:role] == 'util'
+          unless name && name.length > 0
+            raise InvalidInstanceName, "When specifying a util instance you must also specify a name."
+          end
+        end
+
         # We know opts[:role] is right, name can be passed straight to the API.
         # Return the response body for error output, logging, etc.
         return api.post("/environments/#{id}/add_instances", :request => {
@@ -308,7 +322,8 @@ module EY
 
         response = api.post("/environments/#{id}/remove_instances", :request => {
           :provisioned_id => instance.amazon_id,
-          :role => instance.role
+          :role => instance.role,
+          :name => instance.name
         })
 
         # Reset instances so they are fresh if they are requested again.

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

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

@@ -6,12 +6,18 @@ describe EY::CloudClient::AppEnvironment do
   end
 
   describe ".resolve" do
-    it "finds an environment" do
+    it "finds an app environment" do
       api = scenario_cloud_client "Multiple Ambiguous Accounts"
       result = api.resolve_app_environments('app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
       result.should be_one_match
     end
 
+    it "finds an app environment" do
+      api = scenario_cloud_client "Multiple Ambiguous Accounts"
+      result = EY::CloudClient::AppEnvironment.resolve_one(api, 'app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
+      result.should be_a(EY::CloudClient::AppEnvironment)
+    end
+
     it "returns multiple matches with ambiguous query" do
       api = scenario_cloud_client "Multiple Ambiguous Accounts"
       result = EY::CloudClient::AppEnvironment.resolve(api, 'app_name' => 'rails232app', 'environment_name' => 'giblets')

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

@@ -305,7 +305,8 @@ describe EY::CloudClient::Environment do
           'role' => 'util',
           'public_hostname' => 'some-hostname',
           'status' => 'running',
-          'amazon_id' => 'i-xxxxxxx'
+          'amazon_id' => 'i-xxxxxxx',
+          'name' => 'foo'
         },
         {
           'id' => 8675309,
@@ -382,6 +383,14 @@ describe EY::CloudClient::Environment do
         :content_type => "application/json", :body => MultiJson.dump('instances' => @instances_response))
       FakeWeb.should have_requested(:get, "https://cloud.engineyard.com/api/v2/environments/#{@env.id}/instances?")
     end
+
+    it "removes a util instance when name is supplied" do
+      i = @env.instance_by_id(54321) # util name "foo"
+      expect {
+        @env.remove_instance(i)
+      }.to_not raise_error
+      FakeWeb.should have_requested(:post, "https://cloud.engineyard.com/api/v2/environments/#{@env.id}/remove_instances")
+    end
   end
 
   describe "#add_instances(name: 'foo', role: 'app')" do
@@ -419,6 +428,18 @@ describe EY::CloudClient::Environment do
       FakeWeb.should_not have_requested(:post, "https://cloud.engineyard.com/api/v2/environments/#{@env.id}/add_instances")
     end
 
+    it "will raise if you specify util, but not name" do
+      expect {
+        @env.add_instance(:role => "util")
+      }.to raise_error EY::CloudClient::InvalidInstanceName
+    end
+
+    it "will raise with a blank name for util" do
+      expect {
+        @env.add_instance(:role => "util", :name => " ") # a space isn't a valid name, so test that too
+      }.to raise_error EY::CloudClient::InvalidInstanceName
+    end
+
     it "sends a POST request to the API" do
       @env.add_instance(:role => "app")
       FakeWeb.should have_requested(:post, "https://cloud.engineyard.com/api/v2/environments/#{@env.id}/add_instances")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -355,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: EY Cloud API Client