manageheroku 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8af28afd8a378ba3db9360b88f200f128d98ccb
-  data.tar.gz: b5fac04fda4bd793698bca29c908421d136a6d2c
+  metadata.gz: 8b8aa0c4756084dbb1374e23ec4063f00b0a65ef
+  data.tar.gz: 7d3ab4230196e8043445cf19f45b450047bc8b1c
 SHA512:
-  metadata.gz: b1e334fb457f22fb4dd89b93c977b090361a1be2ec0cd5ec04367760d28c26df112d1c3c48b553f2dc5cd887a518e87488159386c7bfca4866bb66d67750adbf
-  data.tar.gz: 6f35974bc33580d35ae78b67620fbc43ab2f25fd1a9d4d655d424cd187896fab32ddea1f668c0b11c7362b3f1fffd2add26bdc75e703cffee39a2f27123f4d2b
+  metadata.gz: 87198db67ae89278903ee28c35bb6401ed340ab8c67b8c47b28568c46967ec384656243375d7fb34496a5b3896872fcc2a2ee3fe6d60b884093f00dc65a32eb9
+  data.tar.gz: 02557908e8f65e50a73433ad64f654efb6a8b3441c5d7a63ae254cef2e159d6c6b4b1d90396e059a90f706a309390b932f7eccb3809ad2e291fd4273858fe1d8

data/lib/manageheroku/heroku.rb

@@ -1,14 +1,41 @@
 module Manageheroku
   class Heroku
-    def initialize(conf_file)
+
+    attr_reader :errors
+    def initialize(conf_file, api_object=nil)
       @conf = Manageheroku::Conf.new(conf_file)
       @formations = @conf.formations
-      @heroku = PlatformAPI.connect_oauth(@conf.oauth_token)
+      @heroku = api_object || PlatformAPI.connect_oauth(@conf.oauth_token)
+      @errors = []
     end
 
     def update!
       @formations.each do |formation|
-        @heroku.formation.batch_update(*formation.update_params)
+        begin
+          @heroku.formation.batch_update(*formation.update_params)
+        rescue StandardError => e
+          if e.respond_to?(:response)
+            # errors with a response have good information that you miss in stacktrace form
+            status = e.response.status
+            status_line = e.response.status_line
+            response_body_id = nil
+            response_body_message = nil
+            begin
+              body_hash = JSON.parse(e.response.body)
+              response_body_id = body_hash["id"]
+              response_body_message = body_hash["message"]
+            rescue
+              response_body_message = e.response.body
+            end
+            error_string = <<-OUTPUT
+              Status: #{[status, status_line].join(";")}
+              Body: #{[response_body_id, response_body_message].join(";")}
+            OUTPUT
+            @errors << error_string
+            puts error_string #Heroku logs stdout
+          end
+          raise e
+        end
       end
     end
 

data/lib/manageheroku/version.rb

@@ -1,3 +1,3 @@
 module Manageheroku
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/conf_test.rb

@@ -17,6 +17,7 @@ class ConfTest < MiniTest::Test
       ENV["TEST_VAL"] = "erb_is_great"
       conf = Manageheroku::Conf.new(File.join(File.dirname(__FILE__), 'sample_conf.yml'))
       conf.oauth_token.must_equal "erb_is_great"
+      ENV["TEST_VAL"] = nil
     end
   end
 end

data/test/heroku_test.rb

@@ -7,6 +7,55 @@ class HerokuTest < MiniTest::Test
     #   heroku = Manageheroku::Heroku.new(conf_file_path)
     #   heroku.update!
     # end
+    #
+    it "gives rich debug output if exception contains a response" do
+      api_stub = ApiStub422.new
+      conf_file_path = File.join(File.dirname(__FILE__), 'sample_conf.yml')
+      heroku = Manageheroku::Heroku.new(conf_file_path, api_stub)
+      assert_raises(Excon::Errors::UnprocessableEntity) do |exp|
+        heroku.update!
+        heroku.errors.first.must_match /Cannot update the same process twice/
+      end
+    end
+
+    it "doesn't fail horribly if exception contains a response with no body" do
+      api_stub = ApiStubDegenerateCase.new
+      conf_file_path = File.join(File.dirname(__FILE__), 'sample_conf.yml')
+      heroku = Manageheroku::Heroku.new(conf_file_path, api_stub)
+      assert_raises(Excon::Errors::ServiceUnavailable) do |exp|
+        heroku.update!
+        heroku.errors.first.must_match /500/
+      end
+    end
+  end
+
+  class ApiStub422
+    def formation
+      FormationStub.new
+    end
+
+    class FormationStub
+      def batch_update(*params)
+        response_params = {body: {"id"=>"Invalid params", "message"=>"Cannot update the same process twice"}.to_json,
+                           status: "422"
+        }
+        raise Excon::Errors::UnprocessableEntity.new("Oh ye gods!", nil, Excon::Response.new(response_params))
+      end
+    end
   end
+
+  class ApiStubDegenerateCase
+    def formation
+      FormationStub.new
+    end
+
+    class FormationStub
+      def batch_update(*params)
+        response_params = { status: "503" }
+        raise Excon::Errors::ServiceUnavailable.new("Et tu Heroku?", nil, Excon::Response.new(response_params))
+      end
+    end
+  end
+
 end
 

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'minitest/autorun'
 require 'manageheroku'
+require 'ostruct'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageheroku
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josh Cronemeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api