cfoundry 0.3.35 → 0.3.36

data/lib/cfoundry/baseclient.rb

@@ -1,18 +1,19 @@
 require "restclient"
 require "multi_json"
+require "fileutils"
 
 module CFoundry
   class BaseClient # :nodoc:
-    LOG_FILE = File.expand_path("~/.cfoundry.log")
     LOG_LENGTH = 10
 
-    attr_accessor :trace, :no_backtrace
+    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 = {})
@@ -98,9 +99,13 @@ module CFoundry
 
       json = accept == :json
 
+      before = Time.now
+
       RestClient::Request.execute(req) do |response, request|
+        time = Time.now - before
+
         print_trace(req, request, response, caller) if @trace
-        log_request(req, response)
+        log_request(time, req, response)
         handle_response(response, accept)
       end
     rescue SocketError, Errno::ECONNREFUSED => e
@@ -168,21 +173,55 @@ module CFoundry
       }.join("/")
     end
 
-    def log_request(req, response)
-      file = File.expand_path(LOG_FILE)
+    def log_data(time, request, response)
+      { :time => time,
+        :request => request,
+        :response => {
+          :code => response.code,
+          :headers => response.headers,
+          :body => response
+        }
+      }
+    end
 
-      if File.exists?(file)
-        log = File.readlines(file).last(LOG_LENGTH - 1)
-      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
 
-      File.open(file, "w") do |io|
-        log.each { |l| io.print l } if log
-        io.puts log_line(req, response.headers[:x_vcap_request_id])
+      data = log_data(time, request, response)
+
+      if @log.is_a?(Array)
+        @log << data
+        return
       end
-    end
 
-    def log_line(req, id)
-      "#{Time.now.strftime("%F %T")}  #{id}  #{req[:method].to_s.upcase.ljust(6)}  #{req[:url]}"
+      case @log
+      when Array
+        @log << data
+        return
+      when IO
+        log_line(@log, data)
+      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
+      end
     end
 
     def print_trace(req, request, response, locs)
@@ -207,7 +246,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/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/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
 
 
@@ -171,5 +164,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]

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 91
   prerelease: 
   segments: 
   - 0
   - 3
-  - 35
-  version: 0.3.35
+  - 36
+  version: 0.3.36
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 Z
+date: 2012-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client