engineyard 1.3.21 → 1.3.22

data/lib/engineyard/api.rb

@@ -46,6 +46,7 @@ module EY
 
     def self.request(path, opts={})
       require 'rest_client'
+      require 'engineyard/rest_client_ext'
       require 'json'
 
       url = EY.config.endpoint + "api/v2#{path}"

data/lib/engineyard/rest_client_ext.rb

@@ -0,0 +1,9 @@
+module RestClient
+  module AbstractResponse
+    private
+
+    def parse_cookie cookie_content
+      {}
+    end
+  end
+end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.21'
+  VERSION = '1.3.22'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 3
-  - 21
-  version: 1.3.21
+  - 22
+  version: 1.3.22
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 -07:00
+date: 2011-08-09 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
+  type: :runtime
+  requirement: *id001
   name: thor
   prerelease: false
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +46,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
+  type: :runtime
+  requirement: *id002
   name: rest-client
   prerelease: false
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +62,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
+  type: :runtime
+  requirement: *id003
   name: highline
   prerelease: false
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
+  requirement: *id004
   name: json_pure
   prerelease: false
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +92,12 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
+  type: :runtime
+  requirement: *id005
   name: escape
   prerelease: false
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -108,12 +108,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
+  type: :runtime
+  requirement: *id006
   name: engineyard-serverside-adapter
   prerelease: false
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +124,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
+  type: :runtime
+  requirement: *id007
   name: net-ssh
   prerelease: false
-  type: :runtime
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -140,12 +140,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  type: :development
+  requirement: *id008
   name: rspec
   prerelease: false
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
+  requirement: *id009
   name: rake
   prerelease: false
-  type: :development
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
+  requirement: *id010
   name: fakeweb
   prerelease: false
-  type: :development
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +182,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
+  requirement: *id011
   name: fakeweb-matcher
   prerelease: false
-  type: :development
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,28 +196,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: fakefs
-  prerelease: false
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
+  requirement: *id012
+  name: fakefs
   prerelease: false
-  type: :development
-  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -226,12 +210,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
+  requirement: *id013
   name: sinatra
   prerelease: false
-  type: :development
-  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -242,12 +226,12 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
+  type: :development
+  requirement: *id014
   name: realweb
   prerelease: false
-  type: :development
-  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -258,10 +242,10 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  type: :development
+  requirement: *id015
   name: open4
   prerelease: false
-  type: :development
-  version_requirements: *id016
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -294,10 +278,10 @@ files:
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/resolver.rb
+- lib/engineyard/rest_client_ext.rb
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
-- lib/engineyard-api-client.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
@@ -377,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud

data/lib/engineyard-api-client.rb

@@ -1,135 +0,0 @@
-require 'engineyard/model'
-
-module EngineYard
-  class APIClient
-    attr_reader :token
-
-    USER_AGENT_STRING = "EngineYardAPIClient/#{VERSION}"
-
-    def initialize(token = nil)
-      @token ||= token
-      @token ||= self.class.read_token
-      raise ArgumentError, "EY Cloud API token required" unless @token
-    end
-
-    def ==(other)
-      raise ArgumentError unless other.is_a?(self.class)
-      self.token == other.token
-    end
-
-    def request(url, opts={})
-      opts[:headers] ||= {}
-      opts[:headers]["X-EY-Cloud-Token"] = token
-      EY.ui.debug("Token", token)
-      self.class.request(url, opts)
-    end
-
-    def environments
-      @environments ||= Environment.from_array(request('/environments')["environments"], :api => self)
-    end
-
-    def apps
-      @apps ||= App.from_array(request('/apps')["apps"], :api => self)
-    end
-
-    def resolver
-      @resolver ||= Resolver.new(self)
-    end
-
-    def apps_for_repo(repo)
-      repo.fail_on_no_remotes!
-      apps.find_all {|a| repo.has_remote?(a.repository_uri) }
-    end
-
-    class InvalidCredentials < EY::AppCloudClient::Error; end
-    class RequestFailed < EY::AppCloudClient::Error; end
-
-    def self.request(path, opts={})
-      require 'rest_client'
-      require 'json'
-
-      url = EY.config.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
-        EY.ui.debug("Request", "#{method.to_s.upcase} #{url}")
-        case method
-        when :get, :delete, :head
-          url.query = RestClient::Payload::UrlEncoded.new(params).to_s
-          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 RequestFailed, "The requested resource could not be found"
-      rescue RestClient::BadGateway
-        raise RequestFailed, "AppCloud 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 = JSON.parse(resp.body)
-          EY.ui.debug("Response", data)
-        rescue JSON::ParserError
-          EY.ui.debug("Raw response", resp.body)
-          raise RequestFailed, "Response was not valid JSON."
-        end
-      else
-        data = resp.body
-      end
-
-      data
-    end
-
-    def self.fetch_token(email, password)
-      api_token = request("/authenticate", :method => "post",
-        :params => { :email => email, :password => password })["api_token"]
-      save_token(api_token)
-      api_token
-    end
-
-    def self.read_token(file = nil)
-      file ||= ENV['EYRC'] || File.expand_path("~/.eyrc")
-      return false unless File.exists?(file)
-
-      require 'yaml'
-
-      data = YAML.load_file(file)
-      if EY.config.default_endpoint?
-        data["api_token"]
-      else
-        (data[EY.config.endpoint.to_s] || {})["api_token"]
-      end
-    end
-
-    def self.save_token(token, file = nil)
-      file ||= ENV['EYRC'] || File.expand_path("~/.eyrc")
-      require 'yaml'
-
-      data = File.exists?(file) ? YAML.load_file(file) : {}
-      if EY.config.default_endpoint?
-        data.merge!("api_token" => token)
-      else
-        data.merge!(EY.config.endpoint.to_s => {"api_token" => token})
-      end
-
-      File.open(file, "w"){|f| YAML.dump(data, f) }
-      true
-    end
-
-  end # API
-end # EY