cfoundry 0.3.57 → 0.3.58

data/Rakefile

@@ -14,6 +14,7 @@ end
 
 task :install => :build do
   sh "gem install --local cfoundry-#{CFoundry::VERSION}"
+  sh "rm cfoundry-#{CFoundry::VERSION}.gem"
 end
 
 task :uninstall do

data/lib/cfoundry/baseclient.rb

@@ -328,7 +328,10 @@ module CFoundry
         end
 
       when Net::HTTPNotFound
-        raise CFoundry::NotFound
+        raise CFoundry::NotFound(response.code, response.body)
+
+      when Net::HTTPForbidden
+        raise CFoundry::Denied.new(response.code, response.body)
 
       else
         raise CFoundry::BadResponse.new(response.code, response.body)

data/lib/cfoundry/errors.rb

@@ -15,39 +15,42 @@ module CFoundry
     end
   end
 
+  class TargetRefused < Error
+    # Error message.
+    attr_reader :message
+
+    # Message varies as this represents various network errors.
+    def initialize(message)
+      @message = message
+    end
+
+    # Exception message.
+    def to_s
+      "target refused connection (#@message)"
+    end
+  end
+
+
   # Exception representing errors returned by the API.
   class APIError < RuntimeError
     class << self
-      # Generic error code for the exception.
-      attr_reader :error_code
-
-      # Generic description for the exception.
-      attr_reader :description
-
-      private
+      def v2_classes
+        @v2_classes ||= {}
+      end
 
-      def setup(code, description = nil)
-        @error_code = code
-        @description = description
+      def v1_classes
+        @v1_classes ||= {}
       end
     end
 
+    attr_reader :error_code, :description
+
     # Create an APIError with a given error code and description.
     def initialize(error_code = nil, description = nil)
       @error_code = error_code
       @description = description
     end
 
-    # A number representing the error.
-    def error_code
-      @error_code || self.class.error_code
-    end
-
-    # A description of the error.
-    def description
-      @description || self.class.description
-    end
-
     # Exception message.
     def to_s
       if error_code
@@ -58,65 +61,161 @@ module CFoundry
     end
   end
 
-  # Generic exception thrown when accessing something that doesn't exist (e.g.
-  # getting info of unknown application).
-  class NotFound < APIError
-    setup(404, "entity not found or inaccessible")
-  end
+  class NotFound < APIError; end
 
-  # Lower-level exception for when we cannot connect to the target.
-  class TargetRefused < APIError
-    @description = "target refused connection"
+  class Denied < APIError; end
 
-    # Error message.
-    attr_reader :message
+  class BadResponse < APIError; end
 
-    # Message varies as this represents various network errors.
-    def initialize(message)
-      @message = message
-    end
 
-    # Exception message.
-    def to_s
-      "#{description} (#{@message})"
+  def self.define_error(class_name, v2_code, v1_code = nil)
+    base =
+      case class_name
+      when /NotFound$/
+        NotFound
+      else
+        APIError
+      end
+
+    klass = Class.new(base) do
+      define_method(:initialize) do |*args|
+        super
+      end
     end
-  end
 
-  # Exception raised when an application payload fails to upload.
-  class UploadFailed < APIError
-    setup(402)
+    APIError.v1_classes[v1_code] = klass if v1_code
+    APIError.v2_classes[v2_code] = klass if v2_code
+
+    const_set(class_name, klass)
   end
 
-  # Exception raised when access is denied to something, either because the
-  # user is not logged in or is not an administrator.
-  class Denied < APIError
-    # Specific error code.
-    attr_reader :error_code
 
-    # Specific description.
-    attr_reader :description
+  [
+    ["InvalidAuthToken",     100],
 
-    # Initialize, with a default error code and message.
-    def initialize(
-        error_code = 200,
-        description = "Operation not permitted")
-      @error_code = error_code
-      @description = description
-    end
-  end
+    ["QuotaDeclined",        1000],
+    ["MessageParseError",    1001],
+    ["InvalidRelation",      1002],
 
-  # Exception raised when the response is unexpected; usually from a server
-  # error.
-  class BadResponse < StandardError
-    # Initialize, with the HTTP response code and body.
-    def initialize(code, body = nil)
-      @code = code
-      @body = body
-    end
+    ["UserInvalid",          20001],
+    ["UaaIdTaken",           20002],
+    ["UserNotFound",         20003, 201],
 
-    # Exception message.
-    def to_s
-      "target failed to handle our request due to an internal error (#{@code})"
-    end
+    ["OrganizationInvalid",   30001],
+    ["OrganizationNameTaken", 30002],
+    ["OrganizationNotFound",  30003],
+
+    ["SpaceInvalid",       40001],
+    ["SpaceNameTaken",     40002],
+    ["SpaceUserNotInOrg",  40003],
+    ["SpaceNotFound",      40004],
+
+    ["ServiceAuthTokenInvalid",    50001],
+    ["ServiceAuthTokenLabelTaken", 50002],
+    ["ServiceAuthTokenNotFound",   50003],
+
+    ["ServiceInstanceNameInvalid", 60001],
+    ["ServiceInstanceNameTaken",   60002],
+    ["ServiceInstanceServiceBindingWrongSpace", 60003],
+    ["ServiceInstanceInvalid",     60003],
+    ["ServiceInstanceNotFound",    60004],
+
+    ["RuntimeInvalid",   70001],
+    ["RuntimeNameTaken", 70002],
+    ["RuntimeNotFound",  70003],
+
+    ["FrameworkInvalid",   80001],
+    ["FrameworkNameTaken", 80002],
+    ["FrameworkNotFound",  80003],
+
+    ["ServiceBindingInvalid",            90001],
+    ["ServiceBindingDifferentSpaces",    90002],
+    ["ServiceBindingAppServiceTaken",    90003],
+    ["ServiceBindingNotFound",           90004],
+
+    ["AppInvalid",   100001, 300],
+    ["AppNameTaken", 100002],
+    ["AppNotFound",  100004, 301],
+
+    ["ServicePlanInvalid",   110001],
+    ["ServicePlanNameTaken", 110002],
+    ["ServicePlanNotFound",  110003],
+
+    ["ServiceInvalid",    120001],
+    ["ServiceLabelTaken", 120002],
+    ["ServiceNotFound",   120003, 500],
+
+    ["DomainInvalid",   130001],
+    ["DomainNotFound",  130002],
+    ["DomainNameTaken", 130003],
+
+    ["LegacyApiWithoutDefaultSpace", 140001],
+
+    ["AppPackageInvalid",  150001],
+    ["AppPackageNotFound", 150002],
+
+    ["AppBitsUploadInvalid", 160001],
+
+    ["StagingError", 170001],
+
+    ["SnapshotNotFound",      180001],
+    ["ServiceGatewayError",   180002, 503],
+    ["ServiceNotImplemented", 180003],
+    ["SDSNotAvailable",       180004],
+
+    ["FileError",  190001],
+
+    ["StatsError", 200001],
+
+    ["RouteInvalid",   210001],
+    ["RouteNotFound",  210002],
+    ["RouteHostTaken", 210003],
+
+    ["InstancesError", 220001],
+
+    ["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]
+  ].each do |args|
+    define_error(*args)
   end
 end

data/lib/cfoundry/uaaclient.rb

@@ -85,13 +85,6 @@ module CFoundry
         info = parse_json(response.body)
         raise CFoundry::Denied.new(response.code, info[:message])
 
-      when Net::HTTPServerError
-        begin
-          raise_error(parse_json(response.body))
-        rescue MultiJson::DecodeError
-          raise BadResponse.new(response.code, response.body)
-        end
-
       else
         raise BadResponse.new(response.code, response.body)
       end

data/lib/cfoundry/v1/app.rb

@@ -96,11 +96,15 @@ module CFoundry::V1
       @diff = {}
     end
 
+    def invalidate!
+      @manifest = nil
+    end
+
     # Check if the application exists on the target.
     def exists?
       @client.base.app(@name)
       true
-    rescue CFoundry::NotFound
+    rescue CFoundry::AppNotFound
       false
     end
 

data/lib/cfoundry/v1/base.rb

@@ -169,31 +169,20 @@ module CFoundry::V1
           response.body
         end
 
-      when Net::HTTPBadRequest, Net::HTTPForbidden
-        info = parse_json(response.body)
-        raise CFoundry::Denied.new(403, info[:description])
-
-      when Net::HTTPNotFound
-        raise CFoundry::NotFound
-
-      when Net::HTTPServerError
+      when Net::HTTPBadRequest, Net::HTTPForbidden, Net::HTTPNotFound,
+            Net::HTTPInternalServerError, Net::HTTPNotImplemented,
+            Net::HTTPBadGateWay
         begin
-          raise_error(parse_json(response.body))
+          info = parse_json(response.body)
+          cls = CFoundry::APIError.v1_classes[info[:code]]
+
+          raise (cls || CFoundry::APIError).new(info[:code], info[:description])
         rescue MultiJson::DecodeError
-          raise CFoundry::BadResponse.new(response.code, response.body)
+          super
         end
 
       else
-        raise CFoundry::BadResponse.new(response.code, response.body)
-      end
-    end
-
-    def raise_error(info)
-      case info[:code]
-      when 402
-        raise CFoundry::UploadFailed.new(info[:description])
-      else
-        raise CFoundry::APIError.new(info[:code], info[:description])
+        super
       end
     end
   end

data/lib/cfoundry/v1/client.rb

@@ -136,8 +136,8 @@ module CFoundry::V1
       frameworks = []
       fs.each do |name, meta|
         runtimes = meta[:runtimes].collect do |r|
-          Runtime.new(r[:name], r[:description], nil, meta[:version],
-            meta[:status], meta[:series], meta[:category])
+          Runtime.new(r[:name], r[:description], nil, r[:version],
+            r[:status], r[:series], r[:category])
         end
 
         frameworks <<

data/lib/cfoundry/v1/service_instance.rb

@@ -63,7 +63,7 @@ module CFoundry::V1
     def exists?
       @client.base.service(@name)
       true
-    rescue CFoundry::NotFound
+    rescue CFoundry::AppNotFound
       false
     end
 

data/lib/cfoundry/v1/user.rb

@@ -55,6 +55,10 @@ module CFoundry::V1
       false
     end
 
+    def invalidate!
+      @manifest = nil
+    end
+
     # Check if the user is an administrator.
     def admin?
       manifest[:admin]

data/lib/cfoundry/v2/app.rb

@@ -180,12 +180,14 @@ module CFoundry::V2
 
     # Stop the application.
     def stop!
-      update! :state => "STOPPED"
+      self.state = "STOPPED"
+      update!
     end
 
     # Start the application.
     def start!
-      update! :state => "STARTED"
+      self.state = "STARTED"
+      update!
     end
 
     # Restart the application.
@@ -235,7 +237,7 @@ module CFoundry::V2
     # Check that all application instances are running.
     def healthy?
       # invalidate cache so the check is fresh
-      @manifest = nil
+      invalidate!
       health == "RUNNING"
     end
     alias_method :running?, :healthy?

data/lib/cfoundry/v2/base.rb

@@ -59,7 +59,7 @@ module CFoundry::V2
       end
 
       define_method(:"delete_#{obj}") do |guid|
-        delete("v2", plural, guid, nil => nil)
+        delete("v2", plural, guid)
         true
       end
 
@@ -131,7 +131,7 @@ module CFoundry::V2
       payload = paginated[:resources]
 
       while next_page = paginated[:next_url]
-        paginated = request_path(:get, next_page, nil => :json)
+        paginated = request_path(Net::HTTP::Get, next_page, :accept => :json)
         payload += paginated[:resources]
       end
 
@@ -159,27 +159,19 @@ module CFoundry::V2
           response.body
         end
 
-      when Net::HTTPBadRequest
-        info = parse_json(response.body)
-        raise CFoundry::APIError.new(info[:code], info[:description])
-
-      when Net::HTTPUnauthorized, Net::HTTPForbidden
-        info = parse_json(response.body)
-        raise CFoundry::Denied.new(info[:code], info[:description])
-
-      when Net::HTTPNotFound
-        raise CFoundry::NotFound
-
-      when Net::HTTPServerError
+      when Net::HTTPBadRequest, Net::HTTPUnauthorized, Net::HTTPNotFound,
+            Net::HTTPNotImplemented, Net::HTTPServiceUnavailable
         begin
           info = parse_json(response.body)
-          raise CFoundry::APIError.new(info[:code], info[:description])
+          cls = CFoundry::APIError.v2_classes[info[:code]]
+
+          raise (cls || CFoundry::APIError).new(info[:code], info[:description])
         rescue MultiJson::DecodeError
-          raise CFoundry::BadResponse.new(response.code, response.body)
+          super
         end
 
       else
-        raise CFoundry::BadResponse.new(response.code, response.body)
+        super
       end
     end
 

data/lib/cfoundry/v2/model.rb

@@ -343,12 +343,10 @@ module CFoundry::V2
       true
     end
 
-    def update!(diff = {})
-      diff = @diff.merge(diff)
+    def update!
+      @manifest = @client.base.send(:"update_#{object_name}", @guid, @diff)
 
-      @manifest = @client.base.send(:"update_#{object_name}", @guid, diff)
-
-      @diff.clear if diff == @diff
+      @diff.clear
 
       true
     end
@@ -370,7 +368,7 @@ module CFoundry::V2
     def exists?
       @client.base.send(object_name, @guid)
       true
-    rescue CFoundry::APIError # TODO: NotFound would be better
+    rescue CFoundry::NotFound
       false
     end
 

data/lib/cfoundry/v2/organization.rb

@@ -9,5 +9,7 @@ module CFoundry::V2
     to_many   :managers, :as => :user
     to_many   :billing_managers, :as => :user
     to_many   :auditors, :as => :user
+
+    has_summary
   end
 end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.57"
+  VERSION = "0.3.58"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 97
+  hash: 103
   prerelease: 
   segments: 
   - 0
   - 3
-  - 57
-  version: 0.3.57
+  - 58
+  version: 0.3.58
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-11 00:00:00 -08:00
+date: 2012-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency