deis_client 1.5.1.dev2 → 1.5.1.dev3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff02438c612cb9dff23d2132b125ec5e97d371b1
-  data.tar.gz: be2b37594a47afb8b24d40ceb586ab1f2fe742dc
+  metadata.gz: 91244b20bfcb418319c9b9fcbb5d7bd799bd3017
+  data.tar.gz: 1f86918cc17e74dcc8b29c6554bacc0b15235445
 SHA512:
-  metadata.gz: d2808dbb04f07e16733a45db358ba9d5f81d0fb16cfe65d292acf9813426bbb5defd3aab2c49fd38e635a70f7a0b28598dd5ad4838798253ffc9b2e217159da3
-  data.tar.gz: b3291b512b7a1e148ab06bc3e7a8728da6a7d69675c275cce90d98fb200fde775e52a28eeed26227d074807d004a424137a300cfe0d21fcdedebaa7fa618b249
+  metadata.gz: 3813b2230e0dc6a09048da2f6153a4fbf429f1bc7f5d4a0f48ba462c0c0a6e76752fa4793793df355b11efe4c5fcc57c80dfd13d9b460bbfd4f61bccfe8fa60d
+  data.tar.gz: d6cc27ac19b18d8954ebdd31cebba766a328d24bf5573707a26f161e42e55ec05e0131cb2076f25ec4e10914fe5c6a8072a4d0378970cb1139009b9cba23e06b

data/lib/deis_client.rb

@@ -1,6 +1,32 @@
 require 'httparty'
 
 module Deis
+  class Error < StandardError
+    def initialize(http_status = nil, message = nil, data = nil)
+      @status = http_status
+      @message = message
+      @data = data
+    end
+  end
+
+  class ClientError < Error; end
+
+  class ServerError < Error; end
+
+  # the following two errors are just convenience for better rescuing
+  class AuthorizationError < ClientError
+    def initialize(message = nil, data = nil)
+      super(401, message, data)
+    end
+  end
+
+  class NotFound < ClientError
+    def initialize(message = nil, data = nil)
+      super(404, message, data)
+    end
+  end
+
+
   class ApiWrapper
     include HTTParty
     format :json
@@ -30,20 +56,20 @@ module Deis
     @@methods = {
       # method => HTTP-verb, path
       login: [:post, '/auth/login/'],
-      apps: [:get, '/apps/'],
+      apps: [:get, '/apps'],
       create_app: [:post, '/apps/'],
       delete_app: [:delete, '/apps/:app/'],
       app: [:get, '/apps/:app/'],
       app_logs: [:get, '/apps/:app/logs/'],
       app_run: [:post, '/apps/:app/run/'],
       containers: [:get, '/apps/:app/containers/'],
-      config: [:get, '/apps/:app/config'],
-      domains: [:get, '/apps/:app/domains'],
-      builds: [:get, '/apps/:app/builds'],
-      create_build: [:post, '/apps/:app/builds'],
-      releases: [:get, '/apps/:app/releases'],
-      release: [:get, '/apps/:app/releases/:release'],
-      rollback_release: [:post, '/apps/:app/releases/rollback']
+      config: [:get, '/apps/:app/config/'],
+      domains: [:get, '/apps/:app/domains/'],
+      builds: [:get, '/apps/:app/builds/'],
+      create_build: [:post, '/apps/:app/builds/'],
+      releases: [:get, '/apps/:app/releases/'],
+      release: [:get, '/apps/:app/releases/:release/'],
+      rollback_release: [:post, '/apps/:app/releases/rollback/']
     }
 
     def initialize(deis_url, username, password)
@@ -55,7 +81,7 @@ module Deis
     def login
       response = @http.post('/auth/login/', {body: @auth})
 
-      throw Exception unless response.code == 200
+      raise AuthorizationError.new unless response.code == 200
 
       @token = response['token']
       @headers['Authorization'] = "token #{@token}"
@@ -124,7 +150,6 @@ module Deis
 
     protected
 
-    # TODO: use own, meaningful exceptions expecially in this method
     def perform(method_sym, body={}, try_twice=true)
       login unless @token
 
@@ -143,13 +168,17 @@ module Deis
       when 200...300
         response.parsed_response
       when 401    # authentification required
-        raise Exception unless try_twice
+        raise AuthorizationError.new unless try_twice
         login
         perform method_sym, options, false
       when 404
-        nil   # or better an exception?
+        raise NotFound
+      when 400...500
+        raise ClientError.new response.code, response.message, response: response
+      when 500...600
+        raise ServerError.new response.code, response.message, response: response
       else
-        raise Exception
+        raise Error.new response.code, response.message, response: response
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deis_client
 version: !ruby/object:Gem::Version
-  version: 1.5.1.dev2
+  version: 1.5.1.dev3
 platform: ruby
 authors:
 - Franz Liedke