lib/cfoundry/v1/base.rb in cfoundry-0.4.8 vs lib/cfoundry/v1/base.rb in cfoundry-0.4.9

@@ -5,10 +5,12 @@
 
 require "cfoundry/errors"
 
 module CFoundry::V1
   class Base < CFoundry::BaseClient
+    include BaseClientMethods
+
     attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
 
     def initialize(
         target = "https://api.cloudfoundry.com",
         token = nil)
@@ -44,49 +46,16 @@
     def system_runtimes
       get("info", "runtimes", :accept => :json)
     end
 
     # Users
-    def users
-      get("users", :accept => :json)
-    end
-
-    def create_user(payload)
-      post(payload, "users", :content => :json)
-    end
-
-    def user(email)
-      get("users", email, :accept => :json)
-    end
-
-    def delete_user(email)
-      delete("users", email, :accept => :json)
-      true
-    end
-
-    def update_user(email, payload)
-      put(payload, "users", email, :content => :json)
-    end
-
     def create_token(payload, email)
       post(payload, "users", email, "tokens",
            :content => :json, :accept => :json)
     end
 
     # Applications
-    def apps
-      get("apps", :accept => :json)
-    end
-
-    def create_app(payload)
-      post(payload, "apps", :content => :json, :accept => :json)
-    end
-
-    def app(name)
-      get("apps", name, :accept => :json)
-    end
-
     def instances(name)
       get("apps", name, "instances", :accept => :json)[:instances]
     end
 
     def crashes(name)
@@ -96,24 +65,15 @@
     def files(name, instance, *path)
       get("apps", name, "instances", instance, "files", *path)
     end
     alias :file :files
 
-    def update_app(name, payload)
-      put(payload, "apps", name, :content => :json)
-    end
-
-    def delete_app(name)
-      delete("apps", name)
-      true
-    end
-
     def stats(name)
       get("apps", name, "stats", :accept => :json)
     end
 
-    def check_resources(fingerprints)
+    def resource_match(fingerprints)
       post(fingerprints, "resources", :content => :json, :accept => :json)
     end
 
     def upload_app(name, zipfile, resources = [])
       payload = {
@@ -130,27 +90,9 @@
       }
 
       post(payload, "apps", name, "application")
     rescue EOFError
       retry
-    end
-
-    # Services
-    def services
-      get("services", :accept => :json)
-    end
-
-    def create_service(manifest)
-      post(manifest, "services", :content => :json, :accept => :json)
-    end
-
-    def service(name)
-      get("services", name, :accept => :json)
-    end
-
-    def delete_service(name)
-      delete("services", name, :accept => :json)
-      true
     end
 
     private
 
     def handle_response(response, accept)