cfoundry 0.3.61 → 0.4.0

data/lib/cfoundry/client.rb

@@ -1,6 +1,21 @@
 require "cfoundry/baseclient"
 
 require "cfoundry/v1/client"
+
+require "cfoundry/v2/app"
+require "cfoundry/v2/framework"
+require "cfoundry/v2/organization"
+require "cfoundry/v2/runtime"
+require "cfoundry/v2/service"
+require "cfoundry/v2/service_binding"
+require "cfoundry/v2/service_instance"
+require "cfoundry/v2/service_plan"
+require "cfoundry/v2/service_auth_token"
+require "cfoundry/v2/space"
+require "cfoundry/v2/user"
+require "cfoundry/v2/domain"
+require "cfoundry/v2/route"
+require "cfoundry/v2/base"
 require "cfoundry/v2/client"
 
 module CFoundry

data/lib/cfoundry/errors.rb

@@ -34,12 +34,8 @@ module CFoundry
   # Exception representing errors returned by the API.
   class APIError < RuntimeError
     class << self
-      def v2_classes
-        @v2_classes ||= {}
-      end
-
-      def v1_classes
-        @v1_classes ||= {}
+      def error_classes
+        @error_classes ||= {}
       end
     end
 
@@ -70,7 +66,7 @@ module CFoundry
   class BadResponse < APIError; end
 
 
-  def self.define_error(class_name, v2_code, v1_code = nil)
+  def self.define_error(class_name, *codes)
     base =
       case class_name
       when /NotFound$/
@@ -81,8 +77,9 @@ module CFoundry
 
     klass = Class.new(base)
 
-    APIError.v1_classes[v1_code] = klass if v1_code
-    APIError.v2_classes[v2_code] = klass if v2_code
+    codes.each do |code|
+      APIError.error_classes[code] = klass
+    end
 
     const_set(class_name, klass)
   end
@@ -174,45 +171,45 @@ module CFoundry
     ["BillingEventQueryInvalid", 230001],
 
     # V1 Errors
-    ["BadRequest",    nil, 100],
-    ["DatabaseError", nil, 101],
-    ["LockingError",  nil, 102],
-    ["SystemError",   nil, 111],
-
-    ["Forbidden",     nil, 200],
-    ["HttpsRequired", nil, 202],
-
-    ["AppNoResources",      nil, 302],
-    ["AppFileNotFound",     nil, 303],
-    ["AppInstanceNotFound", nil, 304],
-    ["AppStopped",          nil, 305],
-    ["AppFileError",        nil, 306],
-    ["AppInvalidRuntime",   nil, 307],
-    ["AppInvalidFramework", nil, 308],
-    ["AppDebugDisallowed",  nil, 309],
-    ["AppStagingError",     nil, 310],
-
-    ["ResourcesUnknownPackageType", nil, 400],
-    ["ResourcesMissingResource",    nil, 401],
-    ["ResourcesPackagingFailed",    nil, 402],
-
-    ["BindingNotFound",        nil, 501],
-    ["TokenNotFound",          nil, 502],
-    ["AccountTooManyServices", nil, 504],
-    ["ExtensionNotImpl",       nil, 505],
-    ["UnsupportedVersion",     nil, 506],
-    ["SdsError",               nil, 507],
-    ["SdsNotFound",            nil, 508],
-
-    ["AccountNotEnoughMemory", nil, 600],
-    ["AccountAppsTooMany",     nil, 601],
-    ["AccountAppTooManyUris",  nil, 602],
-
-    ["UriInvalid",      nil, 700],
-    ["UriAlreadyTaken", nil, 701],
-    ["UriNotAllowed",   nil, 702],
-    ["StagingTimedOut", nil, 800],
-    ["StagingFailed",   nil, 801]
+    ["BadRequest",    100],
+    ["DatabaseError", 101],
+    ["LockingError",  102],
+    ["SystemError",   111],
+
+    ["Forbidden",     200],
+    ["HttpsRequired", 202],
+
+    ["AppNoResources",      302],
+    ["AppFileNotFound",     303],
+    ["AppInstanceNotFound", 304],
+    ["AppStopped",          305],
+    ["AppFileError",        306],
+    ["AppInvalidRuntime",   307],
+    ["AppInvalidFramework", 308],
+    ["AppDebugDisallowed",  309],
+    ["AppStagingError",     310],
+
+    ["ResourcesUnknownPackageType", 400],
+    ["ResourcesMissingResource",    401],
+    ["ResourcesPackagingFailed",    402],
+
+    ["BindingNotFound",        501],
+    ["TokenNotFound",          502],
+    ["AccountTooManyServices", 504],
+    ["ExtensionNotImpl",       505],
+    ["UnsupportedVersion",     506],
+    ["SdsError",               507],
+    ["SdsNotFound",            508],
+
+    ["AccountNotEnoughMemory", 600],
+    ["AccountAppsTooMany",     601],
+    ["AccountAppTooManyUris",  602],
+
+    ["UriInvalid",      700],
+    ["UriAlreadyTaken", 701],
+    ["UriNotAllowed",   702],
+    ["StagingTimedOut", 800],
+    ["StagingFailed",   801]
   ].each do |args|
     define_error(*args)
   end

data/lib/cfoundry/v1/base.rb

@@ -171,10 +171,12 @@ module CFoundry::V1
 
       when Net::HTTPBadRequest, Net::HTTPForbidden, Net::HTTPNotFound,
             Net::HTTPInternalServerError, Net::HTTPNotImplemented,
-            Net::HTTPBadGateWay
+            Net::HTTPBadGateway
         begin
           info = parse_json(response.body)
-          cls = CFoundry::APIError.v1_classes[info[:code]]
+          return super unless info[:code]
+
+          cls = CFoundry::APIError.error_classes[info[:code]]
 
           raise (cls || CFoundry::APIError).new(info[:code], info[:description])
         rescue MultiJson::DecodeError

data/lib/cfoundry/v1/client.rb

@@ -98,11 +98,15 @@ module CFoundry::V1
 
       @base.system_services.each do |type, vendors|
         vendors.each do |vendor, providers|
-          providers.each do |provider, versions|
-            versions.each do |num, meta|
-              services <<
-                Service.new(vendor.to_s, num.to_s, meta[:description],
-                            type, provider.to_s)
+          providers.each do |provider, properties|
+            properties.each do |_, meta|
+              meta[:supported_versions].each do |ver|
+                state = meta[:version_aliases].find { |k, v| v == ver }
+
+                services <<
+                  Service.new(vendor.to_s, ver.to_s, meta[:description],
+                              type, provider.to_s, state && state.first)
+              end
             end
           end
         end
@@ -117,8 +121,7 @@ module CFoundry::V1
 
       @base.system_runtimes.each do |name, meta|
         runtimes <<
-          Runtime.new(name.to_s, meta[:description], meta[:debug_modes],
-            meta[:version], meta[:status], meta[:series], meta[:category])
+          Runtime.new(name.to_s, meta[:version], meta[:debug_modes])
       end
 
       runtimes
@@ -136,8 +139,7 @@ module CFoundry::V1
       frameworks = []
       fs.each do |name, meta|
         runtimes = meta[:runtimes].collect do |r|
-          Runtime.new(r[:name], r[:description], nil, r[:version],
-            r[:status], r[:series], r[:category])
+          Runtime.new(r[:name], r[:description])
         end
 
         frameworks <<

data/lib/cfoundry/v1/runtime.rb

@@ -1,18 +1,11 @@
 module CFoundry::V1
   class Runtime
-    attr_accessor :name, :description, :debug_modes,
-      :version, :status, :series, :category
+    attr_accessor :name, :description, :debug_modes
 
-    def initialize(name, description = nil, debug_modes = nil,
-                   version = nil, status = nil, series = nil,
-                   category = nil)
+    def initialize(name, description = nil, debug_modes = nil)
       @name = name
       @description = description
       @debug_modes = debug_modes
-      @version = version
-      @status = status
-      @series = series
-      @category = category
     end
 
     def eql?(other)
@@ -24,16 +17,8 @@ module CFoundry::V1
       [] # not supported by v1
     end
 
-    def deprecated?
-      status && status[:name] == "deprecated"
-    end
-
-    def next?
-      status && status[:name] == "next"
-    end
-
-    def current?
-      status.nil? || status[:name] == "current"
+    def debug_modes
+      @debug_modes || []
     end
   end
 end

data/lib/cfoundry/v1/service.rb

@@ -1,14 +1,15 @@
 module CFoundry::V1
   class Service
-    attr_accessor :label, :version, :description, :type, :provider
+    attr_accessor :label, :version, :description, :type, :provider, :state
 
     def initialize(label, version = nil, description = nil,
-                   type = nil, provider = "core")
+                   type = nil, provider = "core", state = nil)
       @label = label
       @description = description
       @version = version
       @type = type
       @provider = provider
+      @state = state
     end
 
     def eql?(other)
@@ -19,5 +20,13 @@ module CFoundry::V1
     def active
       true
     end
+
+    def deprecated?
+      @state == :deprecated
+    end
+
+    def current?
+      @state == :current
+    end
   end
 end

data/lib/cfoundry/v2/app.rb

@@ -35,6 +35,9 @@ module CFoundry::V2
 
     scoped_to_space
 
+    queryable_by :name, :space_guid, :organization_guid, :framework_guid,
+      :runtime_guid
+
     has_summary :urls => proc { |x| self.cache[:uris] = x },
       :running_instances => proc { |x|
         self.cache[:running_instances] = x

data/lib/cfoundry/v2/base.rb

@@ -1,5 +1,4 @@
 require "multi_json"
-require "base64"
 
 require "cfoundry/baseclient"
 require "cfoundry/uaaclient"
@@ -8,6 +7,8 @@ require "cfoundry/errors"
 
 module CFoundry::V2
   class Base < CFoundry::BaseClient
+    include BaseClientMethods
+
     attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
 
     def initialize(
@@ -38,41 +39,6 @@ module CFoundry::V2
       get("info", :accept => :json)
     end
 
-
-    [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :domain, :route, :service_plan, :service_binding, :service_instance,
-      :service_auth_token
-    ].each do |obj|
-      plural = "#{obj}s"
-
-      define_method(obj) do |guid, *args|
-        depth, _ = args
-        depth ||= 1
-
-        params = { :"inline-relations-depth" => depth }
-
-        get("v2", plural, guid, :accept => :json, :params => params)
-      end
-
-      define_method(:"create_#{obj}") do |payload|
-        post(payload, "v2", plural, :content => :json, :accept => :json)
-      end
-
-      define_method(:"delete_#{obj}") do |guid|
-        delete("v2", plural, guid)
-        true
-      end
-
-      define_method(:"update_#{obj}") do |guid, payload|
-        put(payload, "v2", plural, guid, :content => :json, :accept => :json)
-      end
-
-      define_method(plural) do |*args|
-        all_pages(
-          get("v2", plural, :accept => :json, :params => params_from(args)))
-      end
-    end
-
     def resource_match(fingerprints)
       put(fingerprints, "v2", "resource_match",
           :content => :json, :accept => :json)
@@ -139,19 +105,6 @@ module CFoundry::V2
     end
 
 
-    def params_from(args)
-      depth, query = args
-      depth ||= 1
-
-      params = { :"inline-relations-depth" => depth }
-
-      if query
-        params[:q] = "#{query.keys.first}:#{query.values.first}"
-      end
-
-      params
-    end
-
     def all_pages(paginated)
       payload = paginated[:resources]
 
@@ -190,7 +143,7 @@ module CFoundry::V2
           info = parse_json(response.body)
           return super unless info[:code]
 
-          cls = CFoundry::APIError.v2_classes[info[:code]]
+          cls = CFoundry::APIError.error_classes[info[:code]]
 
           raise (cls || CFoundry::APIError).new(info[:code], info[:description])
         rescue MultiJson::DecodeError

data/lib/cfoundry/v2/client.rb

@@ -1,27 +1,10 @@
-require "multi_json"
-require "base64"
-
-require "cfoundry/v2/base"
-
-require "cfoundry/v2/app"
-require "cfoundry/v2/framework"
-require "cfoundry/v2/organization"
-require "cfoundry/v2/runtime"
-require "cfoundry/v2/service"
-require "cfoundry/v2/service_binding"
-require "cfoundry/v2/service_instance"
-require "cfoundry/v2/service_plan"
-require "cfoundry/v2/service_auth_token"
-require "cfoundry/v2/space"
-require "cfoundry/v2/user"
-require "cfoundry/v2/domain"
-require "cfoundry/v2/route"
-
 module CFoundry::V2
   # The primary API entrypoint. Wraps a BaseClient to provide nicer return
   # values. Initialize with the target and, optionally, an auth token. These
   # are the only two internal states.
   class Client
+    include ClientMethods
+
     # Internal BaseClient instance. Normally won't be touching this.
     attr_reader :base
 
@@ -147,105 +130,13 @@ module CFoundry::V2
       !!@base.token
     end
 
-
-    [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :domain, :route, :service_plan, :service_binding, :service_instance,
-      :service_auth_token
-    ].each do |singular|
-      plural = :"#{singular}s"
-
-      classname = singular.to_s.capitalize.gsub(/(.)_(.)/) do
-        $1 + $2.upcase
-      end
-
-      klass = CFoundry::V2.const_get(classname)
-
-      scoped_organization = klass.scoped_organization
-      scoped_space = klass.scoped_space
-
-      has_name = klass.method_defined? :name
-
-      define_method(singular) do |*args|
-        guid, partial, _ = args
-
-        x = klass.new(guid, self, nil, partial)
-
-        # when creating an object, automatically set the org/space
-        unless guid
-          if scoped_organization && current_organization
-            x.send(:"#{scoped_organization}=", current_organization)
-          end
-
-          if scoped_space && current_space
-            x.send(:"#{scoped_space}=", current_space)
-          end
-        end
-
-        x
-      end
-
-      define_method(plural) do |*args|
-        depth, query = args
-        depth ||= 1
-
-        # use current org/space
-        if scoped_space && current_space
-          query ||= {}
-          query[:"#{scoped_space}_guid"] ||= current_space.guid
-        elsif scoped_organization && current_organization
-          query ||= {}
-          query[:"#{scoped_organization}_guid"] ||= current_organization.guid
-        end
-
-        @base.send(plural, depth, query).collect do |json|
-          send(:"make_#{singular}", json)
-        end
-      end
-
-      if has_name
-        define_method(:"#{singular}_by_name") do |name, *args|
-          depth, _ = args
-          depth ||= 1
-
-          # use current org/space
-          if scoped_space && current_space
-            current_space.send(plural, depth, :name => name).first
-          elsif scoped_organization && current_organization
-            current_organization.send(plural, depth, :name => name).first
-          else
-            send(plural, depth, :name => name).first
-          end
-        end
-      end
-
-      define_method(:"#{singular}_from") do |path, *args|
-        send(
-          :"make_#{singular}",
-          @base.request_path(
-            Net::HTTP::Get,
-            path,
-            :accept => :json,
-            :params => @base.params_from(args)))
-      end
-
-      define_method(:"#{plural}_from") do |path, *args|
-        objs = @base.all_pages(
-          @base.request_path(
-            Net::HTTP::Get,
-            path,
-            :accept => :json,
-            :params => @base.params_from(args)))
-
-        objs.collect do |json|
-          send(:"make_#{singular}", json)
-        end
-      end
-
-      define_method(:"make_#{singular}") do |json|
-        klass.new(
-          json[:metadata][:guid],
-          self,
-          json)
+    def query_target(klass)
+      if klass.scoped_space && space = current_space
+        space
+      elsif klass.scoped_organization && org = current_org
+        org
+      else
+        self
       end
     end
   end