heroku-api 0.1.7 → 0.1.8

data/test/test_addons.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestAddons < MiniTest::Unit::TestCase
 
@@ -26,8 +26,8 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_delete_addon
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'custom_domains:basic')
-      response = heroku.delete_addon(app_data['name'], 'custom_domains:basic')
+      heroku.post_addon(app_data['name'], 'deployhooks:http')
+      response = heroku.delete_addon(app_data['name'], 'deployhooks:http')
 
       assert_equal(200, response.status)
       assert_equal({
@@ -53,20 +53,19 @@ class TestAddons < MiniTest::Unit::TestCase
 
       assert_equal(200, response.status)
       assert_equal([{
-        'beta'        => false,
-        'configured'  => true,
-        'description' => 'Logging Basic',
-        'name'        => 'logging:basic',
-        'url'         => 'https://addons.heroku.com/addons/logging:basic',
-        'state'       => 'disabled'
-      },
-      {
-        'beta'        => false,
-        'configured'  => true,
-        'description' => 'Shared Database 5MB',
-        'name'        => 'shared-database:5mb',
-        'state'       => 'public',
-        'url'         => nil
+        'attachable'          => false,
+        'beta'                => false,
+        'configured'          => true,
+        'consumes_dyno_hours' => false,
+        'description'         => 'Shared Database 5MB',
+        'group_description'   => 'Shared Database',
+        'name'                => 'shared-database:5mb',
+        'plan_description'    => '5mb',
+        'price'               => { 'cents' => 0, 'unit' => 'month' },
+        'slug'                => '5mb',
+        'state'               => 'public',
+        'terms_of_service'    => false,
+        'url'                 => nil
       }], response.body)
     end
   end
@@ -79,7 +78,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon
     with_app do |app_data|
-      response = heroku.post_addon(app_data['name'], 'custom_domains:basic')
+      response = heroku.post_addon(app_data['name'], 'deployhooks:http')
 
       assert_equal(200, response.status)
       assert_equal({
@@ -92,12 +91,12 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon_with_config
     with_app do |app_data|
-      response = heroku.post_addon(app_data['name'], 'heroku-postgresql:ronin', {"superuser"=>"SUPERSECRET"})
+      response = heroku.post_addon(app_data['name'], 'deployhooks:http', {"url"=>"http://example.com"})
 
       assert_equal(200, response.status)
       assert_equal({
         'message' => nil,
-        'price'   => '$200/mo',
+        'price'   => 'free',
         'status'  => 'Installed'
       }, response.body)
     end
@@ -123,7 +122,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon_addon_not_found
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
+      assert_raises(Heroku::API::Errors::NotFound) do
         heroku.post_addon(app_data['name'], random_name)
       end
     end
@@ -137,11 +136,12 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_put_addon
     with_app do |app_data|
-      response = heroku.put_addon(app_data['name'], 'logging:expanded')
+      response = heroku.post_addon(app_data['name'], 'pgbackups:basic')
+      response = heroku.put_addon(app_data['name'], 'pgbackups:plus')
 
       assert_equal(200, response.status)
       assert_equal({
-        'message' => nil,
+        'message' => 'Plan upgraded',
         'price'   => 'free',
         'status'  => 'Updated'
       }, response.body)
@@ -159,7 +159,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_put_addon_addon_not_found
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
+      assert_raises(Heroku::API::Errors::NotFound) do
         heroku.put_addon(app_data['name'], random_name)
       end
     end

data/test/test_apps.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
 
@@ -98,14 +98,14 @@ class TestApps < MiniTest::Unit::TestCase
   def test_put_app_with_transfer_owner_non_collaborator
     with_app do |app_data|
       assert_raises(Heroku::API::Errors::RequestFailed) do
-        heroku.put_app(app_data['name'], 'transfer_owner' => random_email_address)
+        heroku.put_app(app_data['name'], 'transfer_owner' => 'wesley@heroku.com')
       end
     end
   end
 
   def test_put_app_with_transfer_owner
     with_app do |app_data|
-      email_address = 'wesley+heroku.rb@heroku.com'
+      email_address = 'wesley@heroku.com'
       heroku.post_collaborator(app_data['name'], email_address)
       response = heroku.put_app(app_data['name'], 'transfer_owner' => email_address)
 

data/test/test_collaborators.rb

@@ -1,10 +1,10 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestCollaborators < MiniTest::Unit::TestCase
 
   def test_delete_collaborator
     with_app do |app_data|
-      email_address = 'wesley+heroku.rb@heroku.com'
+      email_address = 'wesley@heroku.com'
       heroku.post_collaborator(app_data['name'], email_address)
 
       response = heroku.delete_collaborator(app_data['name'], email_address)
@@ -37,7 +37,7 @@ class TestCollaborators < MiniTest::Unit::TestCase
 
       assert_equal(200, response.status)
       assert_equal(
-        [{'access' => 'edit', 'email' => app_data['owner_email']}],
+        [{'access' => 'edit', 'email' => app_data['owner_email'], 'name' => nil}],
         response.body
       )
     end
@@ -51,7 +51,7 @@ class TestCollaborators < MiniTest::Unit::TestCase
 
   def test_post_collaborator
     with_app do |app_data|
-      email_address = 'wesley+heroku.rb@heroku.com'
+      email_address = 'wesley@heroku.com'
       response = heroku.post_collaborator(app_data['name'], email_address)
 
       assert_equal(200, response.status)

data/test/test_config_vars.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestConfigVars < MiniTest::Unit::TestCase
 

data/test/test_domains.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestDomains < MiniTest::Unit::TestCase
 
@@ -10,9 +10,9 @@ class TestDomains < MiniTest::Unit::TestCase
 
   def test_delete_domain
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'custom_domains:basic')
-      heroku.post_domain(app_data['name'], 'example.com')
-      response = heroku.delete_domain(app_data['name'], 'example.com')
+      domain = random_domain
+      heroku.post_domain(app_data['name'], domain)
+      response = heroku.delete_domain(app_data['name'], domain)
 
       assert_equal(200, response.status)
       assert_equal({}, response.body)
@@ -21,8 +21,7 @@ class TestDomains < MiniTest::Unit::TestCase
 
   def test_delete_domains
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'custom_domains:basic')
-      heroku.post_domain(app_data['name'], 'example.com')
+      heroku.post_domain(app_data['name'], random_domain)
       response = heroku.delete_domains(app_data['name'])
 
       assert_equal(200, response.status)
@@ -47,21 +46,13 @@ class TestDomains < MiniTest::Unit::TestCase
 
   def test_post_domain
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'custom_domains:basic')
-      response = heroku.post_domain(app_data['name'], 'example.com')
+      domain = random_domain
+      response = heroku.post_domain(app_data['name'], domain)
 
       assert_equal(201, response.status)
-      assert_equal({'domain' => 'example.com'}, response.body)
+      assert_equal({'domain' => domain}, response.body)
 
-      heroku.delete_domain(app_data['name'], 'example.com')
-    end
-  end
-
-  def test_post_domain_addon_not_installed
-    with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
-        heroku.post_domain(app_data['name'], 'example.com')
-      end
+      heroku.delete_domain(app_data['name'], domain)
     end
   end
 

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../lib/heroku/api"
+require File.expand_path("#{File.dirname(__FILE__)}/../lib/heroku/api")
 
 require 'rubygems'
 gem 'minitest' # ensure we are using the gem version
@@ -12,6 +12,10 @@ def heroku
   Heroku::API.new(:mock => MOCK)
 end
 
+def random_domain
+  "#{random_name}.com"
+end
+
 def random_name
   "heroku-rb-#{SecureRandom.hex(10)}"
 end

data/test/test_keys.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestKeys < MiniTest::Unit::TestCase
   KEY_DATA = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCz29znMi/UJX/nvkRSO5FFugKhU9DkkI53E0vXUnP8zeLFxMgyUqmXryPVjWtGzz2LRWqjm14SbqHAmM44pGHVfBIp6wCKBWSUYGv/FxOulwYgtWzz4moxWLZrFyWWgJAnehcVUifHNgzKwT2ovWm2ns52681Z8yFK3K8/uLStDjLIaPePEOaxaTvgIxZNsfyEoXoHcyTPwdR1GtQuDTuDYqYmjmPCoKybYnXrTQ1QFuQxDneBkswQYSl0H2aLf3uBK4F01hr+azXQuSe39eSV4I/TqzmNJlanpILT9Jz3/J1i4r6brpF3AxLnFnb9ufIbzQAIa/VZIulfrZkcBsUl david@carbon.local"

data/test/test_login.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestLogin < MiniTest::Unit::TestCase
 

data/test/test_logs.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestLogs < MiniTest::Unit::TestCase
 

data/test/test_processes.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestProcesses < MiniTest::Unit::TestCase
 
@@ -71,7 +71,7 @@ class TestProcesses < MiniTest::Unit::TestCase
       # depending on timing it will be one of these two states
       assert_includes(['created', 'starting'], ps['state'])
       # transitioned_at
-      assert_equal('Ps', ps['type'])
+      assert_equal(nil, ps['type'])
       # upid
     end
   end

data/test/test_releases.rb

@@ -1,10 +1,9 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestReleases < MiniTest::Unit::TestCase
 
   def test_get_releases
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'releases:basic')
       response = heroku.get_releases(app_data['name'])
 
       assert_equal(200, response.status)
@@ -18,17 +17,8 @@ class TestReleases < MiniTest::Unit::TestCase
     end
   end
 
-  def test_get_releases_addon_not_installed
-    with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
-        heroku.get_releases(app_data['name'])
-      end
-    end
-  end
-
   def test_get_release
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'releases:basic')
       current = heroku.get_releases(app_data['name']).body.last['name']
       response = heroku.get_release(app_data['name'], current)
 
@@ -39,7 +29,6 @@ class TestReleases < MiniTest::Unit::TestCase
 
   def test_get_release_current
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'releases:basic')
       response = heroku.get_release(app_data['name'], 'current')
 
       assert_equal(200, response.status)
@@ -53,14 +42,6 @@ class TestReleases < MiniTest::Unit::TestCase
     end
   end
 
-  def test_get_release_addon_not_installed
-    with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
-        heroku.get_release(app_data['name'], 'v2')
-      end
-    end
-  end
-
   def test_get_release_release_not_found
     assert_raises(Heroku::API::Errors::NotFound) do
       heroku.get_release(random_name, 'v0')
@@ -69,7 +50,6 @@ class TestReleases < MiniTest::Unit::TestCase
 
   def test_post_release
     with_app do |app_data|
-      heroku.post_addon(app_data['name'], 'releases:basic')
       current = heroku.get_releases(app_data['name']).body.last['name']
       response = heroku.post_release(app_data['name'], current)
 
@@ -84,14 +64,6 @@ class TestReleases < MiniTest::Unit::TestCase
     end
   end
 
-  def test_post_release_addon_not_installed
-    with_app do |app_data|
-      assert_raises(Heroku::API::Errors::RequestFailed) do
-        heroku.post_release(app_data['name'], 'v3')
-      end
-    end
-  end
-
   def test_post_release_release_not_found
     assert_raises(Heroku::API::Errors::NotFound) do
       heroku.post_release(random_name, 'v0')

data/test/test_stacks.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestStacks < MiniTest::Unit::TestCase
 

data/test/test_user.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestUser < MiniTest::Unit::TestCase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70282807340220 !ruby/object:Gem::Requirement
+  requirement: &70208858474840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *70282807340220
+  version_requirements: *70208858474840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70282807339460 !ruby/object:Gem::Requirement
+  requirement: &70208858474420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282807339460
+  version_requirements: *70208858474420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70282807338560 !ruby/object:Gem::Requirement
+  requirement: &70208858473940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282807338560
+  version_requirements: *70208858473940
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com
@@ -115,12 +115,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1066627080143481196
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1066627080143481196
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15