heroku-api 0.1.6 → 0.1.7

data/changelog.txt

@@ -1,3 +1,10 @@
+0.1.7 05/15/2012
+================
+
+# consolidate NotFound error handling to work more like other errors
+# fixes for ps:scale mock accuracy
+# fix default command for cedar web process mocks
+
 0.1.6 05/09/2012
 ================
 

data/lib/heroku/api.rb

@@ -58,10 +58,6 @@ module Heroku
     def request(params, &block)
       begin
         response = @connection.request(params, &block)
-      rescue Excon::Errors::NotFound => error
-        reerror = Heroku::API::Errors::NotFound.new(error.message, error.response)
-        reerror.set_backtrace(error.backtrace)
-        raise reerror
       rescue Excon::Errors::SocketError => error
         raise error
       rescue Excon::Errors::Error => error
@@ -69,6 +65,7 @@ module Heroku
           when 401 then Heroku::API::Errors::Unauthorized
           when 402 then Heroku::API::Errors::VerificationRequired
           when 403 then Heroku::API::Errors::Forbidden
+          when 404 then Heroku::API::Errors::NotFound
           when 408 then Heroku::API::Errors::Timeout
           when 422 then Heroku::API::Errors::RequestFailed
           when 423 then Heroku::API::Errors::Locked
@@ -78,7 +75,7 @@ module Heroku
 
         reerror = klass.new(error.message, error.response)
         reerror.set_backtrace(error.backtrace)
-        raise reerror
+        raise(reerror)
       end
 
       if response.body && !response.body.empty?

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

@@ -99,6 +99,7 @@ module Heroku
           add_mock_app_addon(mock_data, app, 'logging:basic')
           if stack == 'cedar'
             add_mock_app_addon(mock_data, app, 'releases:basic')
+            mock_data[:ps][app].first['command'] = 'bundle exec thin start -p $PORT'
             mock_data[:ps][app].first['type'] = 'Ps'
           else
             add_mock_app_addon(mock_data, app, 'shared-database:5mb')

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

@@ -79,15 +79,21 @@ module Heroku
       request_params, mock_data = parse_stub_params(params)
       app, _ = request_params[:captures][:path]
       with_mock_app(mock_data, app) do |app_data|
-        request_params[:query]
         type = request_params[:query].has_key?('type') && request_params[:query]['type']
         qty = request_params[:query].has_key?('qty') && request_params[:query]['qty']
         if app_data['stack'] == 'cedar'
           if type == 'web'
             current_qty = mock_data[:ps][app].count {|process| process['process'] =~ %r{^web\.\d+}}
 
-            if qty >= current_qty
-              (qty - current_qty).times do
+            new_qty = case qty
+            when /[+-]\d+/
+              current_qty + qty.to_i
+            else
+              qty.to_i
+            end
+
+            if new_qty >= current_qty
+              (new_qty - current_qty).times do
                 max_web_id = mock_data[:ps][app].map {|process| process['process'].split('web.').last.to_i}.max
                 data = mock_data[:ps][app].first.dup # copy of web.1
                 data.merge({
@@ -97,15 +103,15 @@ module Heroku
                 })
                 mock_data[:ps][app] << data
               end
-            elsif qty < current_qty
-              (current_qty - qty).times do
+            elsif new_qty < current_qty
+              (current_qty - new_qty).times do
                 max_web_id = mock_data[:ps][app].map {|process| process['process'].split('web.').last.to_i}.max
                 process = mock_data[:ps][app].detect {|process| process['process'] == "web.#{max_web_id}"}
                 mock_data[:ps][app].delete(process)
               end
             end
             {
-              :body   => qty.to_s,
+              :body   => new_qty.to_s,
               :status => 200
             }
           else

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70187660259100 !ruby/object:Gem::Requirement
+  requirement: &70282807340220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *70187660259100
+  version_requirements: *70282807340220
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70187660258680 !ruby/object:Gem::Requirement
+  requirement: &70282807339460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187660258680
+  version_requirements: *70282807339460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70187660258220 !ruby/object:Gem::Requirement
+  requirement: &70282807338560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187660258220
+  version_requirements: *70282807338560
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com