heroku-api 0.1.2 → 0.1.3

data/README.md

@@ -43,6 +43,7 @@ For additional details about any of the commands, see the [API docs](http://api-
     heroku.post_app                         # create an app with a generated name and the default stack
     heroku.post_app('name' => 'app')        # create an app with a specified name
     heroku.post_app_maintenance('app', '1') # toggle maintenance mode
+    heroku.put_app('name' => 'myapp')       # update an app to have a different name
 
 ### Collaborators
 

data/changelog.txt

@@ -1,3 +1,10 @@
+0.1.3 05/03/2012
+================
+
+update README examples to include put_app
+correct mocks to change git/web urls during app rename
+split out known heroku errors into their own error classes
+
 0.1.2 04/10/2012
 ================
 

data/lib/heroku/api.rb

@@ -58,11 +58,22 @@ module Heroku
       begin
         response = @connection.request(params, &block)
       rescue Excon::Errors::NotFound => error
-        reerror = Heroku::API::Errors::NotFound.new(error.message)
+        reerror = Heroku::API::Errors::NotFound.new(error.message, error.response)
         reerror.set_backtrace(error.backtrace)
         raise reerror
       rescue Excon::Errors::Error => error
-        reerror = Heroku::API::Errors::Error.new(error.message)
+        klass = case error.response.status
+          when 401 then Heroku::API::Errors::Unauthorized
+          when 402 then Heroku::API::Errors::VerificationRequired
+          when 403 then Heroku::API::Errors::Forbidden
+          when 408 then Heroku::API::Errors::Timeout
+          when 422 then Heroku::API::Errors::RequestFailed
+          when 423 then Heroku::API::Errors::Locked
+          when /50./ then Heroku::API::Errors::RequestFailed
+          else Heroku::API::Errors::ErrorWithResponse
+        end
+
+        reerror = klass.new(error.message, error.response)
         reerror.set_backtrace(error.backtrace)
         raise reerror
       end

data/lib/heroku/api/errors.rb

@@ -3,7 +3,22 @@ module Heroku
     module Errors
       class Error < StandardError; end
 
-      class NotFound < Error; end
+      class ErrorWithResponse < Error
+        attr_reader :response
+
+        def initialize(message, response)
+          super message
+          @response = response
+        end
+      end
+
+      class Unauthorized < ErrorWithResponse; end
+      class VerificationRequired < ErrorWithResponse; end
+      class Forbidden < ErrorWithResponse; end
+      class NotFound < ErrorWithResponse; end
+      class Timeout < ErrorWithResponse; end
+      class Locked < ErrorWithResponse; end
+      class RequestFailed < ErrorWithResponse; end
     end
   end
 end

data/lib/heroku/api/mock/apps.rb

@@ -144,7 +144,10 @@ module Heroku
 
         with_mock_app(mock_data, app) do |app_data|
           if request_params[:query].has_key?('app[name]')
-            app_data['name'] = request_params[:query]['app[name]']
+            name = request_params[:query]['app[name]']
+            app_data['git_url'] = "git@heroku.com:#{name}.git"
+            app_data['name'] = name
+            app_data['web_url'] = "http://#{name}.herokuapp.com/"
           end
           if request_params[:query].has_key?('app[transfer_owner]')
             email = request_params[:query]['app[transfer_owner]']

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/test/test_addons.rb

@@ -4,7 +4,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_delete_addon_addon_not_found
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.delete_addon(app_data['name'], random_name)
       end
     end
@@ -12,7 +12,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_delete_addon_addon_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.delete_addon(app_data['name'], 'custom_domains:basic')
       end
     end
@@ -105,7 +105,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon_addon_already_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_addon(app_data['name'], 'logging:basic')
         heroku.post_addon(app_data['name'], 'logging:basic')
       end
@@ -114,7 +114,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon_addon_type_already_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_addon(app_data['name'], 'logging:basic')
         heroku.post_addon(app_data['name'], 'logging:expanded')
       end
@@ -123,7 +123,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_post_addon_addon_not_found
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_addon(app_data['name'], random_name)
       end
     end
@@ -150,7 +150,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_put_addon_addon_already_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_addon(app_data['name'], 'logging:basic')
         heroku.put_addon(app_data['name'], 'logging:basic')
       end
@@ -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::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.put_addon(app_data['name'], random_name)
       end
     end
@@ -167,7 +167,7 @@ class TestAddons < MiniTest::Unit::TestCase
 
   def test_put_addon_addon_type_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.put_addon(app_data['name'], 'releases:basic')
       end
     end

data/test/test_apps.rb

@@ -60,7 +60,7 @@ class TestApps < MiniTest::Unit::TestCase
     name = random_name
     response = heroku.post_app('name' => name)
 
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       heroku.post_app('name' => name)
     end
 
@@ -97,7 +97,7 @@ class TestApps < MiniTest::Unit::TestCase
 
   def test_put_app_with_transfer_owner_non_collaborator
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.put_app(app_data['name'], 'transfer_owner' => random_email_address)
       end
     end

data/test/test_domains.rb

@@ -48,7 +48,7 @@ class TestDomains < MiniTest::Unit::TestCase
 
   def test_post_domain_addon_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_domain(app_data['name'], 'example.com')
       end
     end

data/test/test_processes.rb

@@ -132,7 +132,7 @@ class TestProcesses < MiniTest::Unit::TestCase
   end
 
   def test_post_ps_scale_type_not_found
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       with_app('stack' => 'cedar') do |app_data|
         heroku.post_ps_scale(app_data['name'], 'run', 2)
       end
@@ -149,7 +149,7 @@ class TestProcesses < MiniTest::Unit::TestCase
   end
 
   def test_post_ps_scale_without_cedar
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       with_app do |app_data|
         heroku.post_ps_scale(app_data['name'], 'web', 2)
       end
@@ -157,7 +157,7 @@ class TestProcesses < MiniTest::Unit::TestCase
   end
 
   def test_post_ps_stop
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       with_app do |app_data|
         heroku.post_ps_stop(app_data['name'], {})
       end
@@ -208,7 +208,7 @@ class TestProcesses < MiniTest::Unit::TestCase
   end
 
   def test_put_dynos_with_cedar
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       with_app('stack' => 'cedar') do |app_data|
         heroku.put_dynos(app_data['name'], 2)
       end
@@ -235,7 +235,7 @@ class TestProcesses < MiniTest::Unit::TestCase
   end
 
   def test_put_workers_with_cedar
-    assert_raises(Heroku::API::Errors::Error) do
+    assert_raises(Heroku::API::Errors::RequestFailed) do
       with_app('stack' => 'cedar') do |app_data|
         heroku.put_workers(app_data['name'], 2)
       end

data/test/test_releases.rb

@@ -20,7 +20,7 @@ class TestReleases < MiniTest::Unit::TestCase
 
   def test_get_releases_addon_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.get_releases(app_data['name'])
       end
     end
@@ -45,7 +45,7 @@ class TestReleases < MiniTest::Unit::TestCase
 
   def test_get_release_addon_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.get_release(app_data['name'], 'v2')
       end
     end
@@ -76,7 +76,7 @@ class TestReleases < MiniTest::Unit::TestCase
 
   def test_post_release_addon_not_installed
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.post_release(app_data['name'], 'v3')
       end
     end

data/test/test_stacks.rb

@@ -40,7 +40,7 @@ class TestStacks < MiniTest::Unit::TestCase
 
   def test_put_stack_cedar
     with_app do |app_data|
-      assert_raises(Heroku::API::Errors::Error) do
+      assert_raises(Heroku::API::Errors::RequestFailed) do
         heroku.put_stack(app_data['name'], 'cedar')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70252964835500 !ruby/object:Gem::Requirement
+  requirement: &70122010935080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *70252964835500
+  version_requirements: *70122010935080
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70252964834300 !ruby/object:Gem::Requirement
+  requirement: &70122010934400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252964834300
+  version_requirements: *70122010934400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70252964833580 !ruby/object:Gem::Requirement
+  requirement: &70122010933620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252964833580
+  version_requirements: *70122010933620
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com