cfoundry 0.3.25 → 0.3.26

data/lib/cfoundry/baseclient.rb

@@ -3,9 +3,13 @@ require "multi_json"
 
 module CFoundry
   class BaseClient # :nodoc:
+    attr_accessor :trace, :no_backtrace
+
     def initialize(target, token = nil)
       @target = target
       @token = token
+      @trace = false
+      @no_backtrace = false
     end
 
     def request_path(method, path, types = {}, options = {})
@@ -78,29 +82,7 @@ module CFoundry
       json = accept == :json
 
       RestClient::Request.execute(req) do |response, request|
-        if @trace
-          $stderr.puts '>>>'
-          $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
-          $stderr.puts "REQUEST: #{req[:method]} #{req[:url]}"
-          $stderr.puts "RESPONSE_HEADERS:"
-          response.headers.each do |key, value|
-            $stderr.puts "    #{key} : #{value}"
-          end
-          $stderr.puts "REQUEST_HEADERS:"
-          request.headers.each do |key, value|
-            $stderr.puts "    #{key} : #{value}"
-          end
-          $stderr.puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
-          $stderr.puts "RESPONSE: [#{response.code}]"
-          begin
-            parsed_body = MultiJson.load(response.body)
-            $stderr.puts MultiJson.dump(parsed_body, :pretty => true)
-          rescue
-            $stderr.puts "#{response.body}"
-          end
-          $stderr.puts '<<<'
-        end
-
+        print_trace(req, request, response, caller) if @trace
         handle_response(response, accept)
       end
     rescue SocketError, Errno::ECONNREFUSED => e
@@ -168,7 +150,46 @@ module CFoundry
       }.join("/")
     end
 
-    private
+    def print_trace(req, request, response, locs)
+      $stderr.puts ">>>"
+      $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
+      $stderr.puts "REQUEST: #{req[:method]} #{req[:url]}"
+      $stderr.puts "RESPONSE_HEADERS:"
+      response.headers.each do |key, value|
+        $stderr.puts "    #{key} : #{value}"
+      end
+      $stderr.puts "REQUEST_HEADERS:"
+      request.headers.each do |key, value|
+        $stderr.puts "    #{key} : #{value}"
+      end
+      $stderr.puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
+      $stderr.puts "RESPONSE: [#{response.code}]"
+      begin
+        parsed_body = MultiJson.load(response.body)
+        $stderr.puts MultiJson.dump(parsed_body, :pretty => true)
+      rescue
+        $stderr.puts "#{response.body}"
+      end
+      $stderr.puts "<<<"
+
+      return if @no_backtrace
+
+      interesting_locs = locs.drop_while { |loc|
+        loc =~ /\/(cfoundry\/|restclient\/|net\/http)/
+      }
+
+      $stderr.puts "--- backtrace:"
+
+      $stderr.puts "... (boring)" unless locs == interesting_locs
+
+      trimmed_locs = interesting_locs[0..5]
+
+      trimmed_locs.each do |loc|
+        $stderr.puts "=== #{loc}"
+      end
+
+      $stderr.puts "... (trimmed)" unless trimmed_locs == interesting_locs
+    end
 
     def handle_response(response, accept)
       json = accept == :json

data/lib/cfoundry/v2/base.rb

@@ -47,7 +47,8 @@ module CFoundry::V2
 
 
     [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :service_plan, :service_binding, :service_instance, :service_auth_token
+      :domain, :service_plan, :service_binding, :service_instance,
+      :service_auth_token
     ].each do |obj|
       plural = "#{obj}s"
 

data/lib/cfoundry/v2/client.rb

@@ -14,6 +14,7 @@ require "cfoundry/v2/service_plan"
 require "cfoundry/v2/service_auth_token"
 require "cfoundry/v2/space"
 require "cfoundry/v2/user"
+require "cfoundry/v2/domain"
 
 module CFoundry::V2
   # The primary API entrypoint. Wraps a BaseClient to provide nicer return
@@ -62,7 +63,6 @@ module CFoundry::V2
     # printed out.
     def trace=(bool)
       @base.trace = bool
-      @base.uaa.trace = bool if @base.uaa
     end
 
     # The currently authenticated user.
@@ -123,7 +123,8 @@ module CFoundry::V2
 
 
     [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :service_plan, :service_binding, :service_instance, :service_auth_token
+      :domain, :service_plan, :service_binding, :service_instance,
+      :service_auth_token
     ].each do |singular|
       plural = :"#{singular}s"
 

data/lib/cfoundry/v2/framework.rb

@@ -6,13 +6,7 @@ module CFoundry::V2
     attribute :description, :string
     to_many   :apps
 
-    def detection
-      nil # TODO for v2?
-    end
-
-    def runtimes
-      [] # TODO for v2?
-    end
+    attr_accessor :detection, :runtimes
   end
 end
 

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 3
-  - 25
-  version: 0.3.25
+  - 26
+  version: 0.3.26
 platform: ruby
 authors: 
 - Alex Suraci