cfoundry 0.3.60 → 0.3.61

data/lib/cfoundry/errors.rb

@@ -55,8 +55,10 @@ module CFoundry
     def to_s
       if error_code
         "#{error_code}: #{description}"
-      else
+      elsif description
         description
+      else
+        super
       end
     end
   end

data/lib/cfoundry/v1/client.rb

@@ -93,7 +93,7 @@ module CFoundry::V1
     end
 
     # Retrieve available services.
-    def services
+    def services(depth = 0, query = {})
       services = []
 
       @base.system_services.each do |type, vendors|
@@ -112,7 +112,7 @@ module CFoundry::V1
     end
 
     # Retrieve available runtimes.
-    def runtimes
+    def runtimes(depth = 1, query = {})
       runtimes = []
 
       @base.system_runtimes.each do |name, meta|
@@ -129,7 +129,7 @@ module CFoundry::V1
     end
 
     # Retrieve available frameworks.
-    def frameworks
+    def frameworks(depth = 1, query = {})
       fs = info[:frameworks]
       return unless fs
 
@@ -152,7 +152,7 @@ module CFoundry::V1
     end
 
     # Retrieve user list. Admin-only.
-    def users
+    def users(depth = 1, query = {})
       @base.users.collect do |json|
         User.new(
           json[:email],

data/lib/cfoundry/v2/app.rb

@@ -330,6 +330,10 @@ module CFoundry::V2
       Instance.new(self, "0", @client).file(*path)
     end
 
+    def stream_file(*path, &blk)
+      Instance.new(self, "0", @client).stream_file(*path, &blk)
+    end
+
     class Instance
       attr_reader :app, :id
 
@@ -389,6 +393,10 @@ module CFoundry::V2
       def file(*path)
         @client.base.files(@app.guid, @id, *path)
       end
+
+      def stream_file(*path, &blk)
+        @client.base.stream_file(@app.guid, @id, *path, &blk)
+      end
     end
 
     private

data/lib/cfoundry/v2/base.rb

@@ -101,6 +101,31 @@ module CFoundry::V2
     end
     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)
+
+      if loc = redirect["location"]
+        uri = URI.parse(loc + "&tail")
+
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          req = Net::HTTP::Get.new(uri.request_uri)
+          req["Authorization"] = @token
+
+          http.request(req) do |response|
+            response.read_body do |chunk|
+              yield chunk
+            end
+          end
+        end
+      else
+        yield redirect.body
+      end
+    end
+
     def instances(guid)
       get("v2", "apps", guid, "instances", :accept => :json)
     end
@@ -163,6 +188,8 @@ module CFoundry::V2
             Net::HTTPNotImplemented, Net::HTTPServiceUnavailable
         begin
           info = parse_json(response.body)
+          return super unless info[:code]
+
           cls = CFoundry::APIError.v2_classes[info[:code]]
 
           raise (cls || CFoundry::APIError).new(info[:code], info[:description])

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: 
   segments: 
   - 0
   - 3
-  - 60
-  version: 0.3.60
+  - 61
+  version: 0.3.61
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-13 00:00:00 -08:00
+date: 2012-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency