cfoundry 0.4.21 → 0.5.0

data/lib/cfoundry/upload_helpers.rb

@@ -51,6 +51,8 @@ module CFoundry
       FileUtils.rm_rf(tmpdir) if tmpdir
     end
 
+    private
+
     def prepare_package(path, to)
       if path =~ /\.(jar|war|zip)$/
         CFoundry::Zip.unpack(path, to)

data/lib/cfoundry/v1/app.rb

@@ -10,8 +10,8 @@ module CFoundry::V1
     attribute :name,      :string,   :guid => true
     attribute :instances, :integer
     attribute :state,     :string
-    attribute :created,   :integer,  :at => [:meta, :created]
-    attribute :version,   :integer,  :at => [:meta, :version]
+    attribute :created,   :integer,  :at => [:meta, :created], :read_only => true
+    attribute :version,   :integer,  :at => [:meta, :version], :read_only => true
     attribute :framework, :string,   :at => [:staging, :model]
     attribute :runtime,   :string,   :at => [:staging, :stack]
     attribute :command,   :string,   :at => [:staging, :command]

data/lib/cfoundry/v1/base.rb

@@ -9,36 +9,6 @@ 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)
-      super
-    end
-
-
-    # The UAA used for this client.
-    #
-    # `false` if no UAA (legacy)
-    def uaa
-      return @uaa unless @uaa.nil?
-
-      endpoint = info[:authorization_endpoint]
-      return @uaa = false unless endpoint
-
-      @uaa = CFoundry::UAAClient.new(endpoint)
-      @uaa.trace = @trace
-      @uaa.token = @token
-      @uaa
-    end
-
-
-    # Cloud metadata
-    def info
-      get("info", :accept => :json)
-    end
-
     def system_services
       get("services", "v1", "offerings", :content => :json, :accept => :json)
     end
@@ -50,12 +20,11 @@ module CFoundry::V1
     # Users
     def create_user(payload)
       # no JSON response
-      post(payload, "users", :content => :json)
+      post("users", :content => :json, :payload => payload)
     end
 
     def create_token(payload, email)
-      post(payload, "users", email, "tokens",
-           :content => :json, :accept => :json)
+      post("users", email, "tokens", :content => :json, :accept => :json, :payload => payload)
     end
 
     # Applications
@@ -77,7 +46,7 @@ module CFoundry::V1
     end
 
     def resource_match(fingerprints)
-      post(fingerprints, "resources", :content => :json, :accept => :json)
+      post("resources", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
     def upload_app(name, zipfile, resources = [])
@@ -94,25 +63,9 @@ module CFoundry::V1
             "application/zip")
       }
 
-      post(payload, "apps", name, "application")
+      post("apps", name, "application", :payload => payload)
     rescue EOFError
       retry
     end
-
-    private
-
-    def handle_response(response, accept, request)
-      # this is a copy paste of v2
-      return super if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
-
-      info = parse_json(response.body)
-      return super unless info[:code]
-
-      cls = CFoundry::APIError.error_classes[info[:code]]
-
-      raise (cls || CFoundry::APIError).new(request, response, info[:description],  info[:code])
-    rescue MultiJson::DecodeError
-      super
-    end
   end
 end

data/lib/cfoundry/v1/client.rb

@@ -1,9 +1,11 @@
+require File.expand_path("../../concerns/login_helpers", __FILE__)
+
 module CFoundry::V1
   # 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
+    include ClientMethods, CFoundry::LoginHelpers
 
     attr_reader :base
 
@@ -14,6 +16,10 @@ module CFoundry::V1
       @base = Base.new(target, token)
     end
 
+    def version
+      1
+    end
+
     # The current target URL of the client.
     def target
       @base.target
@@ -162,35 +168,6 @@ module CFoundry::V1
       user(email)
     end
 
-    # Login prompts
-    def login_prompts
-      if @base.uaa
-        @base.uaa.prompts
-      else
-        { :username => ["text", "Email"],
-          :password => ["password", "Password"]
-        }
-      end
-    end
-
-    # Authenticate with the target. Sets the client token.
-    #
-    # Credentials is a hash, typically containing :username and :password
-    # keys.
-    #
-    # The values in the hash should mirror the prompts given by
-    # `login_prompts`.
-    def login(credentials)
-      @base.token =
-        if @base.uaa
-          @base.uaa.authorize(credentials)
-        else
-          @base.create_token(
-            { :password => credentials[:password] },
-            credentials[:username])[:token]
-        end
-    end
-
     # Clear client token. No requests are made for this.
     def logout
       @base.token = nil

data/lib/cfoundry/v1/model.rb

@@ -5,6 +5,8 @@ require "cfoundry/v1/model_magic"
 
 module CFoundry::V1
   class Model
+    @@objects = {}
+
     extend ModelMagic
 
     class << self
@@ -28,6 +30,15 @@ module CFoundry::V1
       def plural_base_object_name
         "#{base_object_name}s"
       end
+
+      def objects
+        @@objects
+      end
+
+      def inherited(klass)
+        @@objects[klass.object_name] = klass
+        super
+      end
     end
 
     attr_accessor :guid, :changes
@@ -79,8 +90,6 @@ module CFoundry::V1
     def update!
       @client.base.send(:"update_#{base_object_name}", @guid, write_manifest)
 
-      invalidate!
-
       true
     end
 
@@ -108,6 +117,13 @@ module CFoundry::V1
         read[name] = val if found
       end
 
+      self.class.write_locations.each do |name, where|
+        next if self.class.read_only_attributes.include? name
+
+        found, val = find_path(manifest, where)
+        read[name] = val if found
+      end
+
       read[guid_name] = @guid
 
       read
@@ -129,10 +145,11 @@ module CFoundry::V1
     end
 
     def write_manifest(body = read_manifest, onto = {})
-      onto[guid_name] = @guid
+      onto[guid_name] = @guid if guid_name
 
-      self.class.write_locations.each do |what, where|
-        put(body[what], onto, where) if body.key?(what)
+      self.class.write_locations.each do |name, where|
+        next if self.class.read_only_attributes.include? name
+        put(body[name], onto, where) if body.key?(name)
       end
 
       onto

data/lib/cfoundry/v1/model_magic.rb

@@ -18,6 +18,18 @@ module CFoundry::V1
       @write_locations ||= {}
     end
 
+    def read_only_attributes
+      @read_only_attributes ||= []
+    end
+
+    def on_client(&blk)
+      ClientMethods.module_eval(&blk)
+    end
+
+    def on_base_client(&blk)
+      BaseClientMethods.module_eval(&blk)
+    end
+
     def define_client_methods(klass = self)
       singular = klass.object_name
       plural = klass.plural_object_name
@@ -25,13 +37,13 @@ module CFoundry::V1
       base_singular = klass.base_object_name
       base_plural = klass.plural_base_object_name
 
-      BaseClientMethods.module_eval do
+      on_base_client do
         define_method(base_singular) do |guid|
           get(base_plural, guid, :accept => :json)
         end
 
         define_method(:"create_#{base_singular}") do |payload|
-          post(payload, base_plural, :content => :json, :accept => :json)
+          post(base_plural, :content => :json, :accept => :json, :payload => payload)
         end
 
         define_method(:"delete_#{base_singular}") do |guid|
@@ -40,7 +52,7 @@ module CFoundry::V1
         end
 
         define_method(:"update_#{base_singular}") do |guid, payload|
-          put(payload, base_plural, guid, :content => :json)
+          put(base_plural, guid, :content => :json, :payload => payload)
         end
 
         define_method(base_plural) do |*args|
@@ -48,7 +60,7 @@ module CFoundry::V1
         end
       end
 
-      ClientMethods.module_eval do
+      on_client do
         if klass.guid_name
           define_method(:"#{singular}_by_#{klass.guid_name}") do |guid|
             obj = send(singular, guid)
@@ -79,22 +91,20 @@ module CFoundry::V1
       write_only = opts[:write_only]
       has_default = opts.key?(:default)
 
-      read_locations[name] = Array(opts[:read] || opts[:at] || name)
-      write_locations[name] = Array(opts[:write] || opts[:at] || name)
+      read_locations[name] = Array(opts[:read] || opts[:at] || name) unless write_only
+      write_locations[name] = Array(opts[:write] || opts[:at] || name) unless read_only
+
+      read_only_attributes << name if read_only
 
       self.guid_name = name if is_guid
 
-      unless write_only
-        define_method(name) do
-          return @guid if @guid && is_guid
+      define_method(name) do
+        return @guid if @guid && is_guid
 
-          read = read_manifest
-          read.key?(name) ? read[name] : default
-        end
+        read = read_manifest
+        read.key?(name) ? read[name] : default
       end
 
-      return if read_only
-
       define_method(:"#{name}=") do |val|
         unless has_default && val == default
           CFoundry::Validator.validate_type(val, type)
@@ -107,8 +117,13 @@ module CFoundry::V1
         old = read_manifest[name]
         @changes[name] = [old, val] if old != val
 
-        put(val, @manifest, self.class.write_locations[name])
+        write_to = read_only ? self.class.read_locations : self.class.write_locations
+
+        put(val, @manifest, write_to[name])
       end
+
+      private name if write_only
+      private :"#{name}=" if read_only
     end
   end
 end

data/lib/cfoundry/v2/app.rb

@@ -24,12 +24,12 @@ module CFoundry::V2
     to_one    :framework
     attribute :environment_json, :hash,    :default => {}
     attribute :memory,           :integer, :default => 256
-    attribute :instances,        :integer, :default => 1
-    attribute :file_descriptors, :integer, :default => 256
+    attribute :total_instances,  :integer, :default => 1, :at => :instances
     attribute :disk_quota,       :integer, :default => 256
     attribute :state,            :string,  :default => "STOPPED"
     attribute :command,          :string,  :default => nil
     attribute :console,          :boolean, :default => false
+    attribute :buildpack,        :string,  :default => nil
     to_many   :service_bindings
     to_many   :routes
 
@@ -75,9 +75,6 @@ module CFoundry::V2
         end
       }
 
-    alias :total_instances :instances
-    alias :total_instances= :instances=
-
     private :environment_json
 
     def instances

data/lib/cfoundry/v2/base.rb

@@ -9,39 +9,8 @@ module CFoundry::V2
   class Base < CFoundry::BaseClient
     include BaseClientMethods
 
-    attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
-
-    def initialize(
-        target = "https://api.cloudfoundry.com",
-        token = nil)
-      super
-    end
-
-
-    # The UAA used for this client.
-    #
-    # `false` if no UAA (legacy)
-    def uaa
-      return @uaa unless @uaa.nil?
-
-      endpoint = info[:authorization_endpoint]
-      return @uaa = false unless endpoint
-
-      @uaa = CFoundry::UAAClient.new(endpoint)
-      @uaa.trace = @trace
-      @uaa.token = @token
-      @uaa
-    end
-
-
-    # Cloud metadata
-    def info
-      get("info", :accept => :json)
-    end
-
     def resource_match(fingerprints)
-      put(fingerprints, "v2", "resource_match",
-          :content => :json, :accept => :json)
+      put("v2", "resource_match", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
     def upload_app(guid, zipfile, resources = [])
@@ -57,7 +26,7 @@ module CFoundry::V2
             "application/zip")
       }
 
-      put(payload, "v2", "apps", guid, "bits")
+      put("v2", "apps", guid, "bits", :payload => payload)
     rescue EOFError
       retry
     end
@@ -68,27 +37,22 @@ module CFoundry::V2
     alias :file :files
 
     def stream_file(guid, instance, *path)
-      redirect =
-        request_with_options(
-          Net::HTTP::Get,
-          ["v2", "apps", guid, "instances", instance, "files", *path],
-          :return_response => true)
+      path_and_options = path + [{:return_response => true, :follow_redirects => false}]
+      redirect = get("v2", "apps", guid, "instances", instance, "files", *path_and_options)
 
-      if loc = redirect["location"]
-        uri = URI.parse(loc + "&tail")
+      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
+          req["Authorization"] = token.auth_header if token
 
           http.request(req) do |response|
-            response.read_body do |chunk|
-              yield chunk
-            end
+            response.read_body { |chunk| yield chunk }
           end
         end
       else
-        yield redirect.body
+        yield redirect[:body]
       end
     end
 
@@ -104,43 +68,15 @@ module CFoundry::V2
       get("v2", "apps", guid, "stats", :accept => :json)
     end
 
-
     def all_pages(paginated)
       payload = paginated[:resources]
 
       while next_page = paginated[:next_url]
-        paginated = request_path(Net::HTTP::Get, next_page, :accept => :json)
+        paginated = get(next_page, :accept => :json)
         payload += paginated[:resources]
       end
 
       payload
     end
-
-    private
-
-    def handle_response(response, accept, request)
-      # this is a copy paste of v1
-      return super if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
-
-      info = parse_json(response.body)
-      return super unless info[:code]
-
-      cls = CFoundry::APIError.error_classes[info[:code]]
-
-      raise (cls || CFoundry::APIError).new(request, response, info[:description],  info[:code])
-    rescue MultiJson::DecodeError
-      super
-    end
-
-    def log_line(io, data)
-      io.printf(
-        "[%s]  %0.3fs  %s  %6s -> %d  %s\n",
-        Time.now.strftime("%F %T"),
-        data[:time],
-        data[:response][:headers]["x-vcap-request-id"],
-        data[:request][:method].to_s.upcase,
-        data[:response][:code],
-        data[:request][:url])
-    end
   end
 end