Merge pull request #10 from railsmachine/rails-machine-raise-exceptio…

…n-instead-of-exiting-on-error No longer exit on an unknown API error.
chipchilders · Sep 17, 2013 · 13511e5 · 13511e5
2 parents 4f7dc34 + 3e236a1
commit 13511e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/bin/cloudstack_ruby_client b/bin/cloudstack_ruby_client
@@ -55,6 +55,8 @@ begin
       end
     rescue ArgumentError => e
       puts "#{e.to_s}"
+    rescue CloudstackRubyClient::RequestError => e
+      puts "Error #{e.response.code}: #{JSON.pretty_generate(e.json)}"
     rescue RuntimeError => e
       puts "Oops! something bad happened. Please try again"
     rescue

diff --git a/lib/cloudstack_ruby_client/client.rb b/lib/cloudstack_ruby_client/client.rb
@@ -1,3 +1,12 @@
+class CloudstackRubyClient::RequestError < RuntimeError
+  attr_reader :response, :json
+
+  def initialize(response, json)
+    @response = response
+    @json = json
+  end
+end
+
 class CloudstackRubyClient::Client < CloudstackRubyClient::BaseClient
 
   @@API_LIST = []
@@ -51,10 +60,8 @@ def auth_request(params, command)
       end
 
       raise RuntimeError, json['errorresponse']['errortext'] if response.code == "432"
-
-      puts 'Error ' + response.code + ':'
-      puts JSON.pretty_generate(json)
-      exit 1
+
+      raise CloudstackRubyClient::RequestError.new(response, json)
     end
 
     json[resp_title]

diff --git a/lib/cloudstack_ruby_client/client_helper.rb b/lib/cloudstack_ruby_client/client_helper.rb
@@ -90,9 +90,7 @@ def #{arg}(args={});
 
             raise RuntimeError, json['errorresponse']['errortext'] if response.code == "432"
 
-            puts 'Error ' + response.code + ':'
-            puts JSON.pretty_generate(json)
-            exit 1
+            raise CloudstackRubyClient::RequestError.new(response, json)
           end
 
           json[resp_title]