deis_client 1.5.1.dev6 → 1.5.1.dev7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e38bb17af945d3e2eafad363063ec5c2dcc8b4
-  data.tar.gz: 628afe55fa4b4f66d6ca0e2669ac563fbb461b1b
+  metadata.gz: 294b35c08130abe5681462bae18dc4cb6ec50f75
+  data.tar.gz: e4fd3eb53719b74fc8108b2ae005a85859c07342
 SHA512:
-  metadata.gz: 9c3469f5e167a31c65532ca64c5b2795362c65e823ecf81b643fd820f93503eb5418327c20941e626c5201f202ce9a7103ee036abe6f16577efd2a30f6eb7169
-  data.tar.gz: 01e135fb77fef9e06b4c8b26bbe9364f8fd2d265cb65932885a95ec9520d07188a24e3a01d74f9f772c742e38cac2c7a7ddcd966bf332d8a24a7ed92a31455fc
+  metadata.gz: 77d1663bbeee22927188a812536265f0672ff85fd77a0a9dc51af1bdad4d192ee02b7e71226a01c886268ed2d1ed74a36a4b2a4ddf3c838b5dc5c8f1f9707388
+  data.tar.gz: 1ee7e7c7283876966cfce733c5fefbaee2e6b5c682c14c7ab1a35a7640d6a0758bad4e3416db85774469fe06e1f86be0b496daa160ea16236bd040a42b561c67

data/lib/deis_client.rb

@@ -77,12 +77,13 @@ module Deis
 
     def initialize(deis_url, username, password)
       @http = Deis::ApiWrapper.new deis_url
-      @headers = {}
-      @auth = {username: username, password: password}
+      @headers = {'Content-Type' => 'application/json'}
+      @auth = { username: username, password: password }
     end
 
     def login
-      response = @http.post('/auth/login/', {body: @auth})
+      verb, path = @@methods[:login]
+      response = @http.public_send(verb, path, body: @auth)
 
       raise AuthorizationError.new unless response.code == 200
 
@@ -95,91 +96,96 @@ module Deis
       perform :apps
     end
 
-    def create_app(id=nil)
+    def create_app(id = nil)
       if id
-        perform :create_app, {id: id}
+        perform :create_app, {}, id: id
       else
         perform :create_app
       end
     end
 
     def delete_app(id)
-      perform :delete_app, {app: id}
+      perform :delete_app, app: id
     end
 
     def app(id)
-      perform :app, {app: id}
+      perform :app, app: id
     end
 
     def app_logs(id)
-      perform :app_logs, {app: id}
+      perform :app_logs, app: id
     end
 
     def app_run(id, command)
-      perform :app_run, {app: id, command: command}
+      perform :app_run, { app: id }, command: command
     end
 
     def containers(app_id)
-      perform :containers, {app: app_id}
+      perform :containers, app: app_id
     end
 
     def scale(app_id, type_number_hash)
-      perform :scale, type_number_hash.merge({app: app_id})
+      perform :scale, { app: app_id }, type_number_hash
     end
 
     def config(app_id)
-      perform :config, {app: app_id}
+      perform :config, app: app_id
     end
 
     def domains(app_id)
-      perform :domains, {app: app_id}
+      perform :domains, app: app_id
     end
 
     def builds(app_id)
-      perform :builds, {app: app_id}
+      perform :builds, app: app_id
     end
 
     def create_build(app_id, image)
-      perform :create_build, {app: app_id, image: image}
+      perform :create_build, { app: app_id }, image: image
     end
 
     def releases(app_id)
-      perform :releases, {app: app_id}
+      perform :releases, app: app_id
     end
 
     def release(app_id, release)
-      perform :releases, {app: app_id, release: release}
+      perform :releases, app: app_id, release: release
     end
 
     def rollback_release(app_id, release)
-      perform :rollback_release, {app: app_id, release: release}
+      perform :rollback_release, { app: app_id }, release: release
     end
 
     protected
 
-    def perform(method_sym, body={}, try_twice=true)
+    def perform(method_sym, interpolations = {}, body = {}, try_twice = true)
       login unless @token
 
       verb, path = @@methods[method_sym]
-      path = interpolate_path(path, body)
+      path = interpolate_path(path, interpolations)
 
       options = {
         headers: @headers,
-        body: body
+        body: body.to_json
       }
-      handle @http.public_send(verb, path, options), try_twice
+
+      begin
+        handle @http.public_send(verb, path, options)
+      rescue AuthorizationError => e
+        raise e unless try_twice
+        login
+        handle @http.public_send(verb, path, options)
+      end
     end
 
-    def handle(response, try_twice)
+    def handle(response)
       case response.code
       when 200...300
         response.parsed_response
-      when 401    # authentification required
-        raise AuthorizationError.new unless try_twice
-        login
-        perform method_sym, options, false
+      when 401
+        raise AuthorizationError.new
       when 404
-        raise NotFound
+        raise NotFound.new
       when 400...500
         raise ClientError.new response.code, response.message, response: response
       when 500...600
@@ -189,15 +195,15 @@ module Deis
       end
     end
 
-    def interpolate_path(path, body)
+    def interpolate_path(path, interpolations)
       %r{/:(?<key>\w+)/?} =~ path
       return path unless key
 
-      value = body[key.to_sym]
+      value = interpolations[key.to_sym]
       path[':' + key] = value
 
       # this catched only one occurance of an key, so call recursively until nothing is found anymore
-      interpolate_path path, body
+      interpolate_path path, interpolations
     end
   end
 end

metadata

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