cfoundry 0.5.1.rc2 → 0.5.1.rc3

data/lib/cc_api_stub/services.rb

@@ -0,0 +1,25 @@
+module CcApiStub
+  module Services
+    extend Helper
+
+    class << self
+      def succeed_to_load
+        stub_get(collection_endpoint, {}, response(200, services_fixture))
+      end
+
+      def service_fixture_hash
+        MultiJson.load(services_fixture["resources"].first.to_json, :symbolize_keys => true)
+      end
+
+      private
+
+      def collection_endpoint
+        %r{/v2/services\?inline-relations-depth=1}
+      end
+
+      def services_fixture
+        Helper.load_fixtures("fake_cc_service_types")
+      end
+    end
+  end
+end

data/lib/cc_api_stub/spaces.rb

@@ -0,0 +1,49 @@
+module CcApiStub
+  module Spaces
+    extend Helper
+
+    class << self
+      def succeed_to_load(options={})
+        response_body = Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
+        stub_get(object_endpoint, {}, response(200, response_body))
+      end
+
+      def succeed_to_create
+        response_body = Helper.load_fixtures("fake_cc_created_space")
+        stub_post(collection_endpoint, {}, response(201, response_body))
+      end
+
+      def summary_fixture
+        Helper.load_fixtures("fake_cc_space_summary")
+      end
+
+      def succeed_to_load_summary(options={})
+        response_body = summary_fixture
+        response_body["services"] = [] if options.delete(:no_services)
+        stub_get(%r{/v2/spaces/[^/]+/summary$}, {}, response(200, response_body))
+      end
+
+      def space_fixture_hash
+        {
+          :metadata => {
+            :guid => "space-id-1",
+            :url => "/v2/spaces/space-id-1"
+          },
+          :entity => {
+            :name => "space-name-1"
+          }
+        }
+      end
+
+      private
+
+      def collection_endpoint
+        %r{/v2/spaces$}
+      end
+
+      def object_endpoint
+        %r{/v2/spaces/[^/]+$}
+      end
+    end
+  end
+end

data/lib/cc_api_stub/users.rb

@@ -0,0 +1,84 @@
+module CcApiStub
+  module Users
+    extend Helper
+
+    class << self
+      def succeed_to_load(options={})
+        response_body = Helper.load_fixtures(options[:fixture] || "fake_cc_user")
+        response_body["metadata"]["guid"] = options[:id] || "user-id-1"
+
+        if options[:no_organizations]
+          response_body["entity"]["organizations"] = []
+        else
+          def space(space_id) {"metadata" => { "guid" => space_id }, "entity" => {}} end
+
+          organization = response_body["entity"]["organizations"].first
+          organization["metadata"]["guid"] = options[:organization_id] || "organization-id-1"
+          organization["entity"]["spaces"] = [] if options[:no_spaces]
+
+          permissions = options[:permissions] || [:organization_manager]
+
+          response_body["entity"]["managed_organizations"] << organization if permissions.include?(:organization_manager)
+          response_body["entity"]["billing_managed_organizations"] << organization if permissions.include?(:organization_billing_manager)
+          response_body["entity"]["audited_organizations"] << organization if permissions.include?(:organization_auditor)
+
+          unless options[:no_spaces]
+            space = space("space-id-1")
+            response_body["entity"]["spaces"] << space         if permissions.include?(:space_developer)
+            response_body["entity"]["managed_spaces"] << space if permissions.include?(:space_manager)
+            response_body["entity"]["audited_spaces"] << space if permissions.include?(:space_auditor)
+
+            space2 = space("space-id-2")
+            response_body["entity"]["spaces"] << space2         if permissions.include?(:space2_developer)
+            response_body["entity"]["managed_spaces"] << space2 if permissions.include?(:space2_manager)
+            response_body["entity"]["audited_spaces"] << space2 if permissions.include?(:space2_auditor)
+          end
+        end
+
+        stub_get(%r{/v2/users/[^/]+\?inline-relations-depth=2$}, {}, response(200, response_body))
+      end
+
+      def fail_to_find
+        stub_get(object_endpoint, {}, response(404, {:code => 20003, :description => "The user could not be found"}))
+      end
+
+      def succeed_to_create
+        response_body = Helper.load_fixtures("fake_cc_created_user")
+        stub_post(collection_endpoint, {}, response(201, response_body))
+      end
+
+      def fail_to_create
+        CcApiStub::Helper.fail_request(:post, 500, {}, /users/)
+      end
+
+      def succeed_to_replace_permissions
+        stub_put(object_endpoint, {}, response(200, ""))
+      end
+
+      def fail_to_replace_permissions
+        stub_put(object_endpoint, {}, response(500))
+      end
+
+      def organizations_fixture
+        Helper.load_fixtures("fake_cc_user")["entity"]["organizations"]
+      end
+
+      def organization_fixture_hash(options={})
+        fixture = organizations_fixture.first
+        fixture["entity"].delete("spaces") if options[:no_spaces]
+        fixture["entity"].delete("managers") if options[:no_managers]
+        MultiJson.load(fixture.to_json, :symbolize_keys => true)
+      end
+
+      private
+
+      def collection_endpoint
+        %r{/v2/users$}
+      end
+
+      def object_endpoint
+        %r{/v2/users/[^/]+$}
+      end
+    end
+  end
+end

data/lib/cfoundry/baseclient.rb

@@ -93,6 +93,30 @@ module CFoundry
       self.token = uaa.try_to_refresh_token!
     end
 
+    def stream_url(url, &blk)
+      uri = URI.parse(url)
+
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        http.read_timeout = 5
+
+        req = Net::HTTP::Get.new(uri.request_uri)
+        req["Authorization"] = token.auth_header if token
+
+        http.request(req) do |response|
+          case response
+          when Net::HTTPOK
+            response.read_body(&blk)
+          when Net::HTTPNotFound
+            raise CFoundry::NotFound.new(response.body, 404)
+          when Net::HTTPForbidden
+            raise CFoundry::Denied.new(response.body, 403)
+          else
+            raise CFoundry::BadResponse.new(response.body, response.code)
+          end
+        end
+      end
+    end
+
     private
 
     def needs_token_refresh?

data/lib/cfoundry/errors.rb

@@ -126,7 +126,7 @@ module CFoundry
   class UAAError < APIError
   end
 
-  def self.define_error(class_name, *codes)
+  def self.define_error(class_name, code)
     base =
       case class_name
       when /NotFound$/
@@ -135,142 +135,25 @@ module CFoundry
         APIError
       end
 
-    klass = Class.new(base)
+    klass =
+      if const_defined?(class_name)
+        const_get(class_name)
+      else
+        Class.new(base)
+      end
 
-    codes.each do |code|
-      APIError.error_classes[code] = klass
-    end
+    APIError.error_classes[code] = klass
 
-    const_set(class_name, klass)
+    unless const_defined?(class_name)
+      const_set(class_name, klass)
+    end
   end
 
+  VENDOR_DIR = File.expand_path("../../../vendor", __FILE__)
 
-  [
-    ["InvalidAuthToken",     100],
-
-    ["QuotaDeclined",        1000],
-    ["MessageParseError",    1001],
-    ["InvalidRelation",      1002],
-
-    ["UserInvalid",          20001],
-    ["UaaIdTaken",           20002],
-    ["UserNotFound",         20003, 201],
-
-    ["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",    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)
+  %w{errors/v1.yml errors/v2.yml}.each do |errors|
+    YAML.load_file("#{VENDOR_DIR}/#{errors}").each do |code, meta|
+      define_error(meta["name"], code)
+    end
   end
 end

data/lib/cfoundry/v1/app.rb

@@ -116,17 +116,21 @@ module CFoundry::V1
     end
 
     # Start the application.
-    def start!
+    def start!(async = false)
       self.state = "STARTED"
       update!
     end
 
     # Restart the application.
-    def restart!
+    def restart!(async = false)
       stop!
       start!
     end
 
+    def update!(async = false)
+      super()
+    end
+
     # Determine application health.
     #
     # If all instances are running, returns "RUNNING". If only some are

data/lib/cfoundry/v2/app.rb

@@ -189,15 +189,27 @@ module CFoundry::V2
     end
 
     # Start the application.
-    def start!
+    def start!(async = false, &blk)
       self.state = "STARTED"
-      update!
+      update!(async, &blk)
     end
 
     # Restart the application.
-    def restart!
+    def restart!(async = false, &blk)
       stop!
-      start!
+      start!(async, &blk)
+    end
+
+    def update!(async = false)
+      response = @client.base.update_app(@guid, @diff, async)
+
+      yield response[:headers]["x-app-staging-log"] if block_given?
+
+      @manifest = @client.base.send(:parse_json, response[:body])
+
+      @diff.clear
+
+      true
     end
 
     # Determine application health.

data/lib/cfoundry/v2/base.rb

@@ -38,21 +38,12 @@ module CFoundry::V2
     end
     alias :file :files
 
-    def stream_file(guid, instance, *path)
+    def stream_file(guid, instance, *path, &blk)
       path_and_options = path + [{:return_response => true, :follow_redirects => false}]
       redirect = get("v2", "apps", guid, "instances", instance, "files", *path_and_options)
 
       if location = redirect[:headers]["location"]
-        uri = URI.parse(location + "&tail")
-
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          req = Net::HTTP::Get.new(uri.request_uri)
-          req["Authorization"] = token.auth_header if token
-
-          http.request(req) do |response|
-            response.read_body { |chunk| yield chunk }
-          end
-        end
+        stream_url(location + "&tail", &blk)
       else
         yield redirect[:body]
       end
@@ -70,6 +61,14 @@ module CFoundry::V2
       get("v2", "apps", guid, "stats", :accept => :json)
     end
 
+    def update_app(guid, diff, async = false)
+      put("v2", "apps", guid,
+          :content => :json,
+          :payload => diff,
+          :return_response => true,
+          :params => { :stage_async => !!async })
+    end
+
     def all_pages(paginated)
       payload = paginated[:resources]