cfoundry-IronFoundry 0.3.34 → 0.3.39

data/lib/cfoundry/baseclient.rb

@@ -1,15 +1,19 @@
 require "restclient"
 require "multi_json"
+require "fileutils"
 
 module CFoundry
   class BaseClient # :nodoc:
-    attr_accessor :trace, :no_backtrace
+    LOG_LENGTH = 10
+
+    attr_accessor :trace, :backtrace, :log
 
     def initialize(target, token = nil)
       @target = target
       @token = token
       @trace = false
-      @no_backtrace = false
+      @backtrace = false
+      @log = false
     end
 
     def request_path(method, path, types = {}, options = {})
@@ -95,8 +99,16 @@ module CFoundry
 
       json = accept == :json
 
+      before = Time.now
+
+      proxy_uri = URI.parse(req[:url]).find_proxy()
+      RestClient.proxy = proxy_uri.to_s if proxy_uri
+
       RestClient::Request.execute(req) do |response, request|
+        time = Time.now - before
+
         print_trace(req, request, response, caller) if @trace
+        log_request(time, req, response)
         handle_response(response, accept)
       end
     rescue SocketError, Errno::ECONNREFUSED => e
@@ -164,6 +176,62 @@ module CFoundry
       }.join("/")
     end
 
+    def log_data(time, request, response)
+      { :time => time,
+        :request => request,
+        :response => {
+          :code => response.code,
+          :headers => response.headers,
+          :body => response
+        }
+      }
+    end
+
+    def log_line(io, data)
+      io.printf(
+        "[%s]  %0.3fs  %6s -> %d  %s\n",
+        Time.now.strftime("%F %T"),
+        data[:time],
+        data[:request][:method].to_s.upcase,
+        data[:response][:code],
+        data[:request][:url])
+    end
+
+    def log_request(time, request, response)
+      return unless @log
+
+      data = log_data(time, request, response)
+
+      case @log
+      when IO
+        log_line(@log, data)
+        return
+      when String
+        if File.exists?(@log)
+          log = File.readlines(@log).last(LOG_LENGTH - 1)
+        elsif !File.exists?(File.dirname(@log))
+          FileUtils.mkdir_p(File.dirname(@log))
+        end
+
+        File.open(@log, "w") do |io|
+          log.each { |l| io.print l } if log
+          log_line(io, data)
+        end
+
+        return
+      end
+
+      if @log.respond_to?(:call)
+        @log.call(data)
+        return
+      end
+
+      if @log.respond_to?(:<<)
+        @log << data
+        return
+      end
+    end
+
     def print_trace(req, request, response, locs)
       $stderr.puts ">>>"
       $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
@@ -186,7 +254,7 @@ module CFoundry
       end
       $stderr.puts "<<<"
 
-      return if @no_backtrace
+      return unless @backtrace
 
       interesting_locs = locs.drop_while { |loc|
         loc =~ /\/(cfoundry\/|restclient\/|net\/http)/

data/lib/cfoundry/v1/app.rb

@@ -120,7 +120,13 @@ module CFoundry::V1
 
     # Retrieve application statistics, e.g. CPU load and memory usage.
     def stats
-      @client.base.stats(@name)
+      stats = {}
+
+      @client.base.stats(@name).each do |idx, info|
+        stats[idx.to_s] = info
+      end
+
+      stats
     end
 
     # Update application attributes. Does not restart the application.

data/lib/cfoundry/v1/base.rb

@@ -7,19 +7,12 @@ require "cfoundry/errors"
 
 module CFoundry::V1
   class Base < CFoundry::BaseClient
-    attr_accessor :target, :token, :proxy, :trace
+    attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
 
     def initialize(
         target = "https://api.cloudfoundry.com",
         token = nil)
-      @target = target
-      @token = token
-    end
-
-
-    # invalidate token data when changing token
-    def token=(t)
-      @token = t
+      super
     end
 
 

data/lib/cfoundry/v1/client.rb

@@ -46,6 +46,21 @@ module CFoundry::V1
       @base.trace = bool
     end
 
+    # The current log. See +log=+.
+    def log
+      @base.log
+    end
+
+    # Set the logging mode. Mode can be one of:
+    #
+    # [+String+] Name of a file to log the last 10 requests to.
+    # [+Array+]  Array to append with log data (a Hash).
+    # [+IO+]     An IO object to write to.
+    # [+false+]  No logging.
+    def log=(mode)
+      @base.log = mode
+    end
+
     # The currently authenticated user.
     def current_user
       if user = info[:user]

data/lib/cfoundry/v2/app.rb

@@ -28,6 +28,8 @@ module CFoundry::V2
     attribute :file_descriptors, :integer, :default => 256
     attribute :disk_quota,       :integer, :default => 256
     attribute :state,            :integer, :default => "STOPPED"
+    attribute :command,          :string,  :default => nil
+    attribute :console,          :boolean, :default => false
     to_many   :service_bindings
     to_many   :routes
 
@@ -43,7 +45,13 @@ module CFoundry::V2
     end
 
     def stats
-      @client.base.stats(@guid)
+      stats = {}
+
+      @client.base.stats(@guid).each do |idx, info|
+        stats[idx.to_s] = info
+      end
+
+      stats
     end
 
     def services
@@ -58,18 +66,10 @@ module CFoundry::V2
 
     alias :env= :environment_json=
 
-    def command # TODO v2
-      nil
-    end
-
     def debug_mode # TODO v2
       nil
     end
 
-    def console # TODO v2
-      nil
-    end
-
     def uris
       routes.collect do |r|
         "#{r.host}.#{r.domain.name}"

data/lib/cfoundry/v2/base.rb

@@ -8,19 +8,12 @@ require "cfoundry/errors"
 
 module CFoundry::V2
   class Base < CFoundry::BaseClient
-    attr_accessor :target, :token, :proxy, :trace
+    attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
 
     def initialize(
         target = "https://api.cloudfoundry.com",
         token = nil)
-      @target = target
-      @token = token
-    end
-
-
-    # invalidate token data when changing token
-    def token=(t)
-      @token = t
+      super
     end
 
 
@@ -75,8 +68,10 @@ module CFoundry::V2
       end
 
       define_method(plural) do |*args|
-        get("v2", plural, nil => :json, :params => params_from(args))
+        all_pages(
+          get("v2", plural, nil => :json, :params => params_from(args)))
       end
+
     end
 
     def resource_match(fingerprints)
@@ -127,6 +122,17 @@ module CFoundry::V2
       params
     end
 
+    def all_pages(paginated)
+      payload = paginated[:resources]
+
+      while next_page = paginated[:next_url]
+        paginated = request_path(:get, next_page, nil => :json)
+        payload += paginated[:resources]
+      end
+
+      payload
+    end
+
     private
 
     def handle_response(response, accept)
@@ -171,5 +177,16 @@ module CFoundry::V2
         raise CFoundry::BadResponse.new(response.code, response)
       end
     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

data/lib/cfoundry/v2/client.rb

@@ -66,6 +66,21 @@ module CFoundry::V2
       @base.trace = bool
     end
 
+    # The current log. See +log=+.
+    def log
+      @base.log
+    end
+
+    # Set the logging mode. Mode can be one of:
+    #
+    # [+String+] Name of a file to log the last 10 requests to.
+    # [+Array+]  Array to append with log data (a Hash).
+    # [+IO+]     An IO object to write to.
+    # [+false+]  No logging.
+    def log=(mode)
+      @base.log = mode
+    end
+
     # The currently authenticated user.
     def current_user
       if guid = @base.token_data[:user_id]
@@ -152,7 +167,7 @@ module CFoundry::V2
           query[:space_guid] ||= current_space.guid
         end
 
-        @base.send(plural, depth, query)[:resources].collect do |json|
+        @base.send(plural, depth, query).collect do |json|
           send(:"make_#{singular}", json)
         end
       end
@@ -178,11 +193,14 @@ module CFoundry::V2
       end
 
       define_method(:"#{plural}_from") do |path, *args|
-        @base.request_path(
+        objs = @base.all_pages(
+          @base.request_path(
             :get,
             path,
             nil => :json,
-            :params => @base.params_from(args))[:resources].collect do |json|
+            :params => @base.params_from(args)))
+
+        objs.collect do |json|
           send(:"make_#{singular}", json)
         end
       end

data/lib/cfoundry/v2/model.rb

@@ -151,7 +151,7 @@ module CFoundry::V2
         }
 
         define_method(:"#{plural}=") { |xs|
-          Model.validate_type(x, [CFoundry::V2.const_get(kls)])
+          Model.validate_type(xs, [CFoundry::V2.const_get(kls)])
 
           @manifest ||= {}
           @manifest[:entity] ||= {}
@@ -227,7 +227,9 @@ module CFoundry::V2
       true
     end
 
-    def update!(diff = @diff)
+    def update!(diff = {})
+      diff = @diff.merge(diff)
+
       @manifest = @client.base.send(:"update_#{object_name}", @guid, diff)
 
       @diff.clear if diff == @diff

data/lib/cfoundry/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry-IronFoundry
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.3.39
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cfoundry-IronFoundry
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.