engineyard-cloud-client 1.0.3 → 1.0.4

data/lib/engineyard-cloud-client.rb

@@ -3,6 +3,7 @@ module EY
   end
 end
 
+require 'engineyard-cloud-client/connection'
 require 'engineyard-cloud-client/model_registry'
 require 'engineyard-cloud-client/models'
 require 'engineyard-cloud-client/rest_client_ext'
@@ -11,58 +12,33 @@ require 'engineyard-cloud-client/version'
 require 'engineyard-cloud-client/errors'
 require 'multi_json'
 require 'pp'
+require 'forwardable'
 
 module EY
   class CloudClient
-    attr_reader :token, :registry
-    attr_accessor :ui
+    extend Forwardable
 
-    USER_AGENT_STRING = "EngineYardCloudClient/#{EY::CloudClient::VERSION}"
+    def_delegators :connection, :head, :get, :post, :put, :delete, :request, :endpoint, :token, :token=, :authenticate!, :authenticated?
 
-    def self.endpoint
-      @endpoint
-    end
-
-    def self.endpoint=(endpoint)
-      @endpoint = URI.parse(endpoint)
-      unless @endpoint.absolute?
-        raise BadEndpointError.new(endpoint)
-      end
-      @endpoint
-    end
-
-    def self.default_endpoint!
-      self.endpoint = "https://cloud.engineyard.com/"
-    end
-    default_endpoint!
+    attr_reader :connection
 
-    def initialize(token, ui)
-      self.token = token
-      self.ui = ui
+    # Initialize a new EY::CloudClient.
+    #
+    # Creates and stores a new Connection for communicating with EY Cloud.
+    #
+    # See EY::CloudClient::Connection for options.
+    def initialize(options={})
+      @connection = Connection.new(options)
     end
 
     def ==(other)
-      other.is_a?(self.class) && other.token == token
+      other.is_a?(self.class) && other.connection == connection
     end
 
     def registry
       @registry ||= ModelRegistry.new
     end
 
-    def token=(new_token)
-      unless new_token
-        raise ArgumentError, "EY Cloud API token required"
-      end
-      @token = new_token
-    end
-
-    def request(url, opts={})
-      opts[:headers] ||= {}
-      opts[:headers]["X-EY-Cloud-Token"] = token
-      ui.debug("Token", token)
-      self.class.request(url, ui, opts)
-    end
-
     def resolve_environments(constraints)
       EY::CloudClient::Environment.resolve(self, constraints)
     end
@@ -86,62 +62,7 @@ module EY
     end
 
     def current_user
-      EY::CloudClient::User.from_hash(self, request('/current_user')['user'])
-    end
-
-    def self.request(path, ui, opts={})
-      url = self.endpoint + "api/v2#{path}"
-      method = (opts.delete(:method) || 'get').to_s.downcase.to_sym
-      params = opts.delete(:params) || {}
-      headers = opts.delete(:headers) || {}
-      headers["Accept"] ||= "application/json"
-      headers["User-Agent"] = USER_AGENT_STRING
-
-      begin
-        ui.debug("Request", "#{method.to_s.upcase} #{url}")
-        ui.debug("Params", params.inspect)
-        case method
-        when :get, :delete, :head
-          unless params.empty?
-            url.query = RestClient::Payload::UrlEncoded.new(params).to_s
-          end
-          resp = RestClient.send(method, url.to_s, headers)
-        else
-          resp = RestClient.send(method, url.to_s, params, headers)
-        end
-      rescue RestClient::Unauthorized
-        raise InvalidCredentials
-      rescue Errno::ECONNREFUSED
-        raise RequestFailed, "Could not reach the cloud API"
-      rescue RestClient::ResourceNotFound
-        raise ResourceNotFound, "The requested resource could not be found"
-      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}"
-      rescue OpenSSL::SSL::SSLError
-        raise RequestFailed, "SSL is misconfigured on your cloud"
-      end
-
-      if resp.body.empty?
-        data = ''
-      elsif resp.headers[:content_type] =~ /application\/json/
-        begin
-          data = MultiJson.load(resp.body)
-          ui.debug("Response", "\n" + data.pretty_inspect)
-        rescue MultiJson::DecodeError
-          ui.debug("Raw response", resp.body)
-          raise RequestFailed, "Response was not valid JSON."
-        end
-      else
-        data = resp.body
-      end
-
-      data
-    end
-
-    def self.authenticate(email, password, ui)
-      request("/authenticate", ui, { :method => "post", :params => { :email => email, :password => password }})["api_token"]
+      EY::CloudClient::User.from_hash(self, get('/current_user')['user'])
     end
 
   end # API

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

@@ -0,0 +1,142 @@
+require 'engineyard-cloud-client/rest_client_ext'
+require 'multi_json'
+require 'uri'
+
+module EY
+  class CloudClient
+    class Connection
+      attr_reader :token, :output, :user_agent, :endpoint
+
+      BASE_USER_AGENT = "EngineYardCloudClient/#{EY::CloudClient::VERSION}".freeze
+      DEFAULT_ENDPOINT = "https://cloud.engineyard.com/".freeze
+
+      # Initialize a new EY::CloudClient::Connection with a hash including:
+      #
+      # :token:      (optional) Perform authenticated requests with this token
+      # :user_agent: (optional) A user agent name/version pair to add to the User-Agent header. (e.g. EngineYardCLI/2.0.0)
+      # :output:     (optional) Send output to a stream other than $stdout
+      # :endpoint:   (optional) An alternate Engine Yard Cloud endpoint URI
+      def initialize(options={})
+        @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]
+
+        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']
+
+        indent = 12                                           # 12 because that's what Thor used.
+        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
+          end
+        end
+        @output << "#{name.to_s.rjust(indent)}  #{value.rstrip}\n"       # just one newline
+      end
+
+      def ==(other)
+        other.is_a?(self.class) && [other.token, other.user_agent, other.endpoint] == [token, user_agent, endpoint]
+      end
+
+      %w[ get head post put delete ].each do |meth|
+        eval <<-RUBY, binding, __FILE__, __LINE__ + 1
+          def #{meth}(path, params=nil, headers=nil, &block)
+            request("#{meth}", path, params, headers, &block)
+          end
+        RUBY
+      end
+
+      def request(meth, path, params=nil, extra_headers=nil)
+        url    = endpoint + "api/v2#{path}"
+        meth   ||= 'get'
+        meth   = meth.to_s.downcase.to_sym
+        params ||= {}
+
+        headers = {
+          "User-Agent" => user_agent,
+          "Accept"     => "application/json",
+        }
+
+        if token
+          headers["X-EY-Cloud-Token"] = token
+        end
+
+        if extra_headers
+          headers.merge!(extra_headers)
+        end
+
+        debug(meth.to_s.upcase, url.to_s)
+        debug("Params",  params) if params
+        debug("Headers", headers)
+
+        resp = do_request(meth, url, params, headers)
+        data = parse_response(resp)
+
+        data
+      end
+
+      def authenticate!(email, password)
+        response = post("/authenticate", :email => email, :password => password)
+        self.token = response["api_token"]
+        token
+      end
+
+      def authenticated?
+        !token.nil? && !token.empty?
+      end
+
+      private
+
+      def do_request(meth, url, params, headers)
+        case meth
+        when :get, :delete, :head
+          if params
+            url.query = RestClient::Payload::UrlEncoded.new(params).to_s
+          end
+          RestClient.send(meth, url.to_s, headers)
+        else
+          RestClient.send(meth, url.to_s, params, headers)
+        end
+      rescue RestClient::Unauthorized
+        raise InvalidCredentials
+      rescue Errno::ECONNREFUSED
+        raise RequestFailed, "Could not reach the cloud API"
+      rescue RestClient::ResourceNotFound
+        raise ResourceNotFound, "The requested resource could not be found"
+      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}"
+      rescue OpenSSL::SSL::SSLError
+        raise RequestFailed, "SSL is misconfigured on your cloud"
+      end
+
+      def parse_response(resp)
+        if resp.body.empty?
+          ''
+        elsif resp.headers[:content_type] =~ /application\/json/
+          begin
+            data = MultiJson.load(resp.body)
+            debug("Response", data)
+            data
+          rescue MultiJson::DecodeError
+            debug("Response", resp.body)
+            raise RequestFailed, "Response was not valid JSON."
+          end
+        else
+          resp.body
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module EY
     class Account < ApiStruct.new(:id, :name)
 
       def self.all(api)
-        self.from_array(api, api.request('/accounts')["accounts"])
+        self.from_array(api, api.get("/accounts")["accounts"])
       end
 
       def add_app(app)

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

@@ -9,7 +9,7 @@ module EY
 
       # Return list of all Apps linked to all current user's accounts
       def self.all(api)
-        self.from_array(api, api.request('/apps?no_instances=true')["apps"])
+        self.from_array(api, api.get("/apps", 'no_instances' => 'true')["apps"])
       end
 
       # An everything-you-need helper to create an App
@@ -32,7 +32,7 @@ module EY
         raise EY::CloudClient::AttributeRequiredError.new("name") unless params["name"]
         raise EY::CloudClient::AttributeRequiredError.new("repository_uri") unless params["repository_uri"]
         raise EY::CloudClient::AttributeRequiredError.new("app_type_id") unless params["app_type_id"]
-        response = api.request("/accounts/#{account.id}/apps", :method => :post, :params => {"app" => params})
+        response = api.post("/accounts/#{account.id}/apps", "app" => params)
         from_hash(api, response['app'])
       end
 

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

@@ -7,15 +7,15 @@ module EY
 
       # Return a constrained list of app_environments given a set of constraints like:
       #
-      # * app_name
-      # * account_name
-      # * environment_name
+      # * app_name:  app name full or partial match string
+      # * account_name:  account name full or partial match string
+      # * environment_name:  environment name full or partial match string
       # * remotes:  An array of git remote URIs
       #
       def self.resolve(api, constraints)
         clean_constraints = constraints.reject { |k,v| v.nil? }
         params = {'constraints' => clean_constraints}
-        response = api.request("/app_environments/resolve", :method => :get, :params => params)['resolver']
+        response = api.get("/app_environments/resolve", params)['resolver']
         matches = from_array(api, response['matches'])
         ResolverResult.new(api, matches, response['errors'], response['suggestions'])
       end

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

@@ -14,7 +14,7 @@ module EY
 
       def self.get(api, app_environment, id)
         uri = api_root(app_environment.app.id, app_environment.environment.id) + "/#{id}"
-        response = api.request(uri, :method => :get)
+        response = api.get(uri)
         load_from_response api, app_environment, response
       rescue EY::CloudClient::ResourceNotFound
         nil
@@ -47,16 +47,16 @@ module EY
       alias deployed_by= user_name=
 
       def created_at
-        super && (@created_at ||= Time.parse(super))
+        @created_at ||= super && Time.parse(super)
       end
 
       def finished_at
-        super && (@finished_at ||= Time.parse(super))
+        @finished_at ||= super && Time.parse(super)
       end
 
       def config
         return {} unless deployed_by # not started yet so not all info is here
-        @config ||= {'deployed_by' => deployed_by}.merge(extra_config)
+        @config ||= {'input_ref' => ref, 'deployed_by' => deployed_by}.merge(extra_config)
       end
 
       def start
@@ -95,11 +95,11 @@ module EY
       private
 
       def post_to_api(params)
-        update_with_response api.request(collection_uri, :method => :post, :params => {:deployment => params})
+        update_with_response api.post(collection_uri, 'deployment' => params)
       end
 
       def put_to_api(params)
-        update_with_response api.request(member_uri("/finished"), :method => :put, :params => {:deployment => params})
+        update_with_response api.put(member_uri("/finished"), 'deployment' => params)
       end
 
       def collection_uri

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

@@ -4,27 +4,29 @@ require 'engineyard-cloud-client/errors'
 
 module EY
   class CloudClient
-    class Environment < ApiStruct.new(:id, :name, :framework_env, :instances_count,
+    class Environment < ApiStruct.new(:id, :name, :framework_env,
+                                      :instances_count,
+                                      :instance_status,
                                       :username, :app_server_stack_name,
                                       :load_balancer_ip_address
                                      )
 
       # Return list of all Environments linked to all current user's accounts
       def self.all(api)
-        self.from_array(api, api.request('/environments?no_instances=true')["environments"])
+        self.from_array(api, api.get("/environments", "no_instances" => "true")["environments"])
       end
 
       # Return a constrained list of environments given a set of constraints like:
       #
-      # * app_name
-      # * account_name
-      # * environment_name
+      # * app_name:  app name full or partial match string
+      # * account_name:  account name full or partial match string
+      # * environment_name:  environment name full or partial match string
       # * remotes:  An array of git remote URIs
       #
       def self.resolve(api, constraints)
         clean_constraints = constraints.reject { |k,v| v.nil? }
         params = {'constraints' => clean_constraints}
-        response = api.request("/environments/resolve", :method => :get, :params => params)['resolver']
+        response = api.get("/environments/resolve", params)['resolver']
         matches = from_array(api, response['matches'])
         ResolverResult.new(api, matches, response['errors'], response['suggestions'])
       end
@@ -52,7 +54,7 @@ module EY
 
         params = {"environment" => attrs.dup}
         unpack_cluster_configuration(params, cluster_configuration)
-        response = api.request("/apps/#{app.id}/environments", :method => :post, :params => params)
+        response = api.post("/apps/#{app.id}/environments", params)
         self.from_hash(api, response['environment'])
       end
       attr_accessor :apps, :account
@@ -99,7 +101,7 @@ module EY
       end
 
       def logs
-        Log.from_array(api, api.request("/environments/#{id}/logs", :method => :get)["logs"])
+        Log.from_array(api, api.get("/environments/#{id}/logs")["logs"])
       end
 
       def deploy_to_instances
@@ -114,13 +116,13 @@ module EY
         if bridge.nil?
           raise NoBridgeError.new(name)
         elsif !ignore_bad_bridge && bridge.status != "running"
-          raise BadBridgeStatusError.new(bridge.status, EY::CloudClient.endpoint)
+          raise BadBridgeStatusError.new(bridge.status, api.endpoint)
         end
         bridge
       end
 
       def update
-        api.request("/environments/#{id}/update_instances", :method => :put)
+        api.put("/environments/#{id}/update_instances")
         true # raises on failure
       end
       alias rebuild update
@@ -178,7 +180,7 @@ module EY
         if instances_count.zero?
           []
         else
-          instances_attrs = api.request("/environments/#{id}/instances")["instances"]
+          instances_attrs = api.get("/environments/#{id}/instances")["instances"]
           load_instances(instances_attrs)
         end
       end

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

@@ -5,7 +5,7 @@ module EY
     class Keypair < ApiStruct.new(:id, :name, :public_key)
 
       def self.all(api)
-        self.from_array(api, api.request('/keypairs')["keypairs"])
+        self.from_array(api, api.get("/keypairs")["keypairs"])
       end
 
       # Create a Keypair with your SSH public key so that you can access your Instances
@@ -24,8 +24,8 @@ module EY
         params = attrs.dup # no default fields
         raise EY::CloudClient::AttributeRequiredError.new("name") unless params["name"]
         raise EY::CloudClient::AttributeRequiredError.new("public_key") unless params["public_key"]
-        response = api.request("/keypairs", :method => :post, :params => {"keypair" => params})
-        self.from_hash(api, response['keypair'])
+        response = api.post("/keypairs", "keypair" => params)['keypair']
+        self.from_hash(api, response)
       end
     end
   end

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

@@ -12,13 +12,13 @@ module EY
       end
 
       def run
-        api.request("/environments/#{environment.id}/run_custom_recipes", :method => :put)
+        api.put("/environments/#{environment.id}/run_custom_recipes")
         true
       end
 
       def download
         tmp = Tempfile.new("recipes")
-        data = api.request("/environments/#{environment.id}/recipes")
+        data = api.get("/environments/#{environment.id}/recipes")
         tmp.write(data)
         tmp.flush
         tmp.close
@@ -37,10 +37,7 @@ module EY
       # Expects a File object opened for binary reading.
       # i.e. upload(File.open(recipes_path, 'rb'))
       def upload(file_to_upload)
-        api.request("/environments/#{environment.id}/recipes", {
-          :method => :post,
-          :params => {:file => file_to_upload}
-        })
+        api.post("/environments/#{environment.id}/recipes", :file => file_to_upload)
         true
       end
 

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

@@ -15,11 +15,12 @@ rescue LoadError
 engineyard-cloud-client needs the following gems to run in test mode:
 
 group 'engineyard-cloud-client-test' do
-  gem 'dm-core'
+  gem 'dm-core',           '~>1.2.0'
   gem 'dm-migrations'
   gem 'dm-aggregates'
+  gem 'dm-timestamps'
   gem 'dm-sqlite-adapter'
-  gem 'ey_resolver', '~>0.2.1'
+  gem 'ey_resolver',       '~>0.2.1'
   gem 'rabl'
 end
 
@@ -27,5 +28,4 @@ Please add the above to your Gemfile.
   ERROR
 end
 
-require 'engineyard-cloud-client/test/ui'
 require 'engineyard-cloud-client/test/scenario'

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

@@ -36,9 +36,10 @@ class FakeAwsm < Sinatra::Base
   before do
     if env['PATH_INFO'] =~ %r#/api/v2#
       user_agent = env['HTTP_USER_AGENT']
-      unless user_agent =~ %r#^EngineYardCloudClient/\d#
-        $stderr.puts 'No user agent header, expected EngineYardCloudClient/'
-        halt 400, 'No user agent header, expected EngineYardCloudClient/'
+      unless user_agent =~ %r#EngineYardCloudClient/\d#
+        msg = "No user agent header, expected EngineYardCloudClient/ got #{user_agent.inspect}"
+        $stderr.puts msg
+        halt 400, msg
       end
     end
     content_type "application/json"

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

@@ -1,6 +1,6 @@
 attributes :id, :domain_name, :uri
 child :environment do
-  attributes :id, :ssh_username, :name, :instances_count, :app_server_stack_name, :load_balancer_ip_address, :framework_env
+  attributes :id, :ssh_username, :name, :instances_count, :instance_status, :app_server_stack_name, :load_balancer_ip_address, :framework_env
   child :account do
     attributes :id, :name
   end

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

@@ -1,4 +1,4 @@
-attributes :id, :ssh_username, :name, :instances_count, :app_server_stack_name, :load_balancer_ip_address, :framework_env
+attributes :id, :ssh_username, :name, :instances_count, :instance_status, :app_server_stack_name, :load_balancer_ip_address, :framework_env
 child :account do
   attributes :id, :name
 end

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

@@ -1,5 +1,5 @@
 collection @environments, :root => :environments, :object_root => false
-attributes :id, :ssh_username, :name, :instances_count, :app_server_stack_name, :load_balancer_ip_address, :framework_env
+attributes :id, :ssh_username, :name, :instances_count, :instance_status, :app_server_stack_name, :load_balancer_ip_address, :framework_env
 child :account do
   attributes :id, :name
 end

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

@@ -2,7 +2,6 @@ require 'multi_json'
 require 'engineyard-cloud-client/rest_client_ext'
 require 'engineyard-cloud-client/test'
 require 'engineyard-cloud-client/test/fake_awsm'
-require 'engineyard-cloud-client/test/ui'
 
 module EY::CloudClient::Test
   class Scenario
@@ -32,8 +31,8 @@ module EY::CloudClient::Test
       @api_token = options['api_token']
     end
 
-    def cloud_client(ui = EY::CloudClient::Test::UI.new)
-      EY::CloudClient.new(@api_token, ui)
+    def cloud_client
+      EY::CloudClient.new(:endpoint => EY::CloudClient::Test::FakeAwsm.uri, :token => @api_token)
     end
 
     def inspect

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

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

@@ -2,50 +2,32 @@ require 'spec_helper'
 
 describe EY::CloudClient do
   it "holds an api token" do
-    EY::CloudClient.new('asdf', test_ui).token.should == "asdf"
+    EY::CloudClient.new(:token => 'asdf').connection.token.should == "asdf"
   end
 
-  it "holds a UI" do
-    EY::CloudClient.new('asdf', test_ui).ui.should == test_ui
+  it "uses production EY Cloud by default" do
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "cloudtoken"}|, :content_type => 'application/json')
+    client = EY::CloudClient.new
+    client.authenticate!("a@b.com", "foo")
+    client.connection.token.should == "cloudtoken"
   end
 
-  describe ".endpoint" do
-    after do
-      EY::CloudClient.default_endpoint!
-    end
-
-    it "defaults to production EY Cloud" do
-      EY::CloudClient.endpoint.should == URI.parse('https://cloud.engineyard.com')
-    end
-
-    it "accepts a valid endpoint" do
-      EY::CloudClient.endpoint = "http://fake.local/"
-      EY::CloudClient.endpoint.should == URI.parse('http://fake.local')
-    end
-
-    it "uses the endpoint to make requests" do
-      FakeWeb.register_uri(:post, "http://fake.local/api/v2/authenticate", :body => %|{"api_token": "fake.localtoken"}|, :content_type => 'application/json')
-
-      EY::CloudClient.endpoint = "http://fake.local/"
-      EY::CloudClient.authenticate("a@b.com", "foo", test_ui).should == "fake.localtoken"
-    end
-
-    it "raises on an invalid endpoint" do
-      lambda { EY::CloudClient.endpoint = "non/absolute" }.should raise_error(EY::CloudClient::BadEndpointError)
-    end
+  it "uses a custom endpoint to make requests" do
+    FakeWeb.register_uri(:post, "http://fake.local/api/v2/authenticate", :body => %|{"api_token": "fake.localtoken"}|, :content_type => 'application/json')
+    client = EY::CloudClient.new(:endpoint => "http://fake.local/")
+    client.authenticate!("a@b.com", "foo")
+    client.connection.token.should == "fake.localtoken"
   end
 
-  it "authenticates with valid credentials and returns the api token" do
-    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|, :content_type => 'application/json')
-
-    EY::CloudClient.authenticate("a@b.com", "foo", test_ui).should == "asdf"
+  it "raises on an invalid endpoint" do
+    lambda { EY::CloudClient.new(:endpoint => "non/absolute") }.should raise_error(EY::CloudClient::BadEndpointError)
   end
 
   it "raises InvalidCredentials when the credentials are invalid" do
     FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 401, :content_type => 'application/json')
 
     lambda {
-      EY::CloudClient.authenticate("a@b.com", "foo", test_ui)
+      EY::CloudClient.new.authenticate!("a@b.com", "foo")
     }.should raise_error(EY::CloudClient::InvalidCredentials)
   end
 
@@ -53,7 +35,7 @@ describe EY::CloudClient do
     FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 502, :content_type => 'text/html')
 
     lambda {
-      EY::CloudClient.authenticate("a@b.com", "foo", test_ui)
+      EY::CloudClient.new.authenticate!("a@b.com", "foo")
     }.should raise_error(EY::CloudClient::RequestFailed, /API is temporarily unavailable/)
   end
 end

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe EY::CloudClient::Account do
   before do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   describe ".all" do

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe EY::CloudClient::AppEnvironment do
   before(:each) do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   describe ".resolve" do

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe EY::CloudClient::App do
   before(:each) do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   describe ".all" do

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe EY::CloudClient::AppEnvironment do
   before(:each) do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   describe "deploying" do
@@ -31,7 +30,7 @@ describe EY::CloudClient::AppEnvironment do
 
       deployment.created_at.should_not be_nil
       deployment.finished_at.should be_nil
-      deployment.config.should == {'deployed_by' => 'Multiple Ambiguous Accounts', 'extra' => 'config'}
+      deployment.config.should == {'input_ref' => 'master', 'deployed_by' => 'Multiple Ambiguous Accounts', 'extra' => 'config'}
       deployment.commit.should =~ /[0-9a-f]{40}/
       deployment.resolved_ref.should_not be_nil
       deployment.out << "Test output"

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe EY::CloudClient::Environment do
   before(:each) do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   describe ".all" do

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

@@ -3,16 +3,13 @@ require 'spec_helper'
 describe EY::CloudClient::User do
   before do
     FakeWeb.allow_net_connect = true
-    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
   end
 
-  describe ".all" do
-    it "returns all accounts" do
-      api = scenario_cloud_client "User Name"
-      user = api.current_user
-      user.name.should == 'User Name'
-      user.accounts.size.should == 1
-      user.accounts.first.name.should == 'main'
-    end
+  it "loads current user and returns all accounts" do
+    api = scenario_cloud_client "User Name"
+    user = api.current_user
+    user.name.should == 'User Name'
+    user.accounts.size.should == 1
+    user.accounts.first.name.should == 'main'
   end
 end

data/spec/spec_helper.rb

@@ -44,7 +44,4 @@ RSpec.configure do |config|
     FakeWeb.allow_net_connect = false
   end
 
-  config.before(:each) do
-    EY::CloudClient.default_endpoint!
-  end
 end

data/spec/support/helpers.rb

@@ -1,12 +1,8 @@
 require 'rest_client'
 
 module SpecHelpers
-  def test_ui
-    @test_ui ||= EY::CloudClient::Test::UI.new
-  end
-
-  def cloud_client(token = 'asdf', ui = test_ui)
-    @cloud_client ||= EY::CloudClient.new(token, ui)
+  def cloud_client(token = 'asdf')
+    @cloud_client ||= EY::CloudClient.new(:token => token)
   end
 
   def scenario_cloud_client(scenario)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -160,17 +160,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +273,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/engineyard-cloud-client/connection.rb
 - lib/engineyard-cloud-client/errors.rb
 - lib/engineyard-cloud-client/model_registry.rb
 - lib/engineyard-cloud-client/models/account.rb
@@ -312,7 +313,6 @@ files:
 - lib/engineyard-cloud-client/test/fake_awsm/views/user.rabl
 - lib/engineyard-cloud-client/test/fake_awsm.rb
 - lib/engineyard-cloud-client/test/scenario.rb
-- lib/engineyard-cloud-client/test/ui.rb
 - lib/engineyard-cloud-client/test.rb
 - lib/engineyard-cloud-client/version.rb
 - lib/engineyard-cloud-client.rb
@@ -348,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4133734354650536829
+      hash: 2753056383473924638
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4133734354650536829
+      hash: 2753056383473924638
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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

@@ -1,33 +0,0 @@
-require 'engineyard-cloud-client/test'
-
-module EY::CloudClient::Test
-  class QuietUI
-    def info(*)
-    end
-
-    def debug(*)
-    end
-  end
-
-  class VerboseUI
-    def info(name, message = nil)
-      say name, message
-    end
-
-    def debug(name, message = nil)
-      name    = name.inspect    unless name.nil? or name.is_a?(String)
-      message = message.inspect unless message.nil? or message.is_a?(String)
-      say name, message
-    end
-
-    def say(status, message = nil)
-      if message
-        $stdout.puts "#{status.to_s.rjust(12)}  #{message}"
-      else
-        $stdout.puts status
-      end
-    end
-  end
-
-  UI = ENV['DEBUG'] ? VerboseUI : QuietUI
-end