heroku-api 0.3.5 → 0.3.6

data/README.md

@@ -14,7 +14,8 @@ Start by creating a connection to Heroku with your credentials:
 
     require 'heroku-api'
 
-    heroku = Heroku::API.new(:api_key => API_KEY)
+    heroku = Heroku::API.new(:api_key => API_KEY)                           # use API Key
+    heroku = Heroku::API.new(:username => USERNAME, :password => PASSWORD)  # use username and password
 
 NOTE: You can leave out the `:api_key` if `ENV['HEROKU_API_KEY']` is set instead.
 
@@ -61,7 +62,7 @@ For additional details about any of the commands, see the [API docs](http://api-
 
     heroku.delete_domain('app', 'example.com') # remove the 'example.com' domain from the 'app' app
     heroku.get_domains('app')                  # list configured domains for the 'app' app
-    heroku.post_domains('app', 'example.com')  # add 'example.com' domain to the 'app' app
+    heroku.post_domain('app', 'example.com')  # add 'example.com' domain to the 'app' app
 
 ### Keys
 

data/changelog.txt

@@ -1,3 +1,10 @@
+0.3.6 10/31/2012
+================
+
+bump excon to latest
+allow username/password params to automagically lookup api_key
+readme cleanup/fixes
+
 0.3.5 09/11/2012
 ================
 

data/heroku-api.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'excon', '~>0.16.1'
+  s.add_runtime_dependency 'excon', '~>0.16.7'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/lib/heroku/api.rb

@@ -36,24 +36,36 @@ srand
 module Heroku
   class API
 
+    HEADERS = {
+      'Accept'                => 'application/json',
+      'Accept-Encoding'       => 'gzip',
+      #'Accept-Language'       => 'en-US, en;q=0.8',
+      'User-Agent'            => "heroku-rb/#{Heroku::API::VERSION}",
+      'X-Ruby-Version'        => RUBY_VERSION,
+      'X-Ruby-Platform'       => RUBY_PLATFORM
+    }
+
+    OPTIONS = {
+      :headers  => {},
+      :host     => 'api.heroku.com',
+      :nonblock => false,
+      :scheme   => 'https'
+    }
+
     def initialize(options={})
+      options = OPTIONS.merge(options)
+
       @api_key = options.delete(:api_key) || ENV['HEROKU_API_KEY']
+      if !@api_key && options.has_key?(:username) && options.has_key?(:password)
+        @connection = Excon.new("#{options[:scheme]}://#{options[:host]}", options.merge(:headers => HEADERS))
+        @api_key = self.post_login(options[:username], options[:password]).body["api_key"]
+      end
+
       user_pass = ":#{@api_key}"
-      options = {
-        :headers  => {},
-        :host     => 'api.heroku.com',
-        :nonblock => false,
-        :scheme   => 'https'
-      }.merge(options)
-      options[:headers] = {
-        'Accept'                => 'application/json',
-        'Accept-Encoding'       => 'gzip',
-        #'Accept-Language'       => 'en-US, en;q=0.8',
-        'Authorization'         => "Basic #{Base64.encode64(user_pass).gsub("\n", '')}",
-        'User-Agent'            => "heroku-rb/#{Heroku::API::VERSION}",
-        'X-Ruby-Version'        => RUBY_VERSION,
-        'X-Ruby-Platform'       => RUBY_PLATFORM
-      }.merge(options[:headers])
+      options[:headers] = HEADERS.merge({
+        'Authorization' => "Basic #{Base64.encode64(user_pass).gsub("\n", '')}",
+      }).merge(options[:headers])
+
       @connection = Excon.new("#{options[:scheme]}://#{options[:host]}", options)
     end
 

data/lib/heroku/api/mock.rb

@@ -137,15 +137,20 @@ module Heroku
       end
 
       def self.parse_stub_params(params)
-        api_key = Base64.decode64(params[:headers]['Authorization']).split(':').last
+        mock_data = nil
 
-        parsed = params.dup
-        begin # try to JSON decode
-          parsed[:body] &&= Heroku::API::OkJson.decode(parsed[:body])
-        rescue # else leave as is
+        if params[:headers].has_key?('Authorization')
+          api_key = Base64.decode64(params[:headers]['Authorization']).split(':').last
+
+          parsed = params.dup
+          begin # try to JSON decode
+            parsed[:body] &&= Heroku::API::OkJson.decode(parsed[:body])
+          rescue # else leave as is
+          end
+          mock_data = @mock_data[api_key]
         end
 
-        [parsed, @mock_data[api_key]]
+        [parsed, mock_data]
       end
 
       def self.remove_mock_app_addon(mock_data, app, addon)

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/test/test_login.rb

@@ -9,4 +9,12 @@ class TestLogin < MiniTest::Unit::TestCase
     assert_equal(200, response.status)
   end
 
+  def test_post_login_implied
+    # FIXME: user/pass will only work in mock for now, maybe use ENV
+    _heroku_ = Heroku::API.new(:mock => true, :username => 'email@example.com', :password => 'fake_password')
+    response = _heroku_.get_apps
+
+    assert_equal(200, response.status)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70278785472920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.16.7
   type: :runtime
   prerelease: false
-  version_requirements: *70278785472920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.7
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70278785471860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278785471860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70278785471240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278785471240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com
@@ -126,21 +141,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3188437513510408421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3188437513510408421
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Client for the Heroku API