cfoundry 0.4.14 → 0.4.15

data/lib/cfoundry/baseclient.rb

@@ -8,6 +8,8 @@ module CFoundry
   class BaseClient # :nodoc:
     LOG_LENGTH = 10
 
+    attr_reader :target
+
     attr_accessor :trace, :backtrace, :log
 
     def initialize(target, token = nil)
@@ -141,6 +143,8 @@ module CFoundry
           handle_response(response, accept)
         end
       end
+    rescue ::Timeout::Error => e
+      raise Timeout.new(method, uri, e)
     rescue SocketError, Errno::ECONNREFUSED => e
       raise TargetRefused, e.message
     end

data/lib/cfoundry/errors.rb

@@ -30,6 +30,20 @@ module CFoundry
     end
   end
 
+  class Timeout < Timeout::Error
+    attr_reader :method, :uri, :parent
+
+    def initialize(method, uri, parent = nil)
+      @method = method
+      @uri = uri
+      @parent = parent
+      super(to_s)
+    end
+
+    def to_s
+      "#{method::METHOD} #{uri} timed out"
+    end
+  end
 
   # Exception representing errors returned by the API.
   class APIError < RuntimeError

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.4.14".freeze
+  VERSION = "0.4.15".freeze
 end

data/spec/cfoundry/baseclient_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe CFoundry::BaseClient do
+  let(:base) { CFoundry::BaseClient.new("https://api.cloudfoundry.com") }
+
+  describe '#request_uri' do
+    subject { base.request_uri URI.parse(base.target + "/foo"), Net::HTTP::Get }
+
+    context 'when a timeout exception occurs' do
+      before { stub_request(:get, 'https://api.cloudfoundry.com/foo').to_raise(::Timeout::Error) }
+
+      it 'raises the correct error' do
+        expect { subject }.to raise_error CFoundry::Timeout, "GET https://api.cloudfoundry.com/foo timed out"
+      end
+    end
+  end
+end

data/spec/cfoundry/errors_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'Errors' do
+  describe CFoundry::Timeout do
+    let(:parent) { Timeout::Error.new }
+
+    subject { CFoundry::Timeout.new(Net::HTTP::Post, '/blah', parent) }
+
+    its(:to_s) { should eq "POST /blah timed out" }
+    its(:method) { should eq Net::HTTP::Post }
+    its(:uri) { should eq '/blah' }
+    its(:parent) { should eq parent }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-15 00:00:00 -08:00
-default_executable: 
+date: 2012-12-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -150,60 +149,61 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/cfoundry.rb
+- lib/cfoundry/baseclient.rb
+- lib/cfoundry/chatty_hash.rb
 - lib/cfoundry/client.rb
-- lib/cfoundry/version.rb
 - lib/cfoundry/errors.rb
-- lib/cfoundry/validator.rb
-- lib/cfoundry/uaaclient.rb
 - lib/cfoundry/spec_helper.rb
-- lib/cfoundry/v2/service_binding.rb
-- lib/cfoundry/v2/service.rb
+- lib/cfoundry/uaaclient.rb
+- lib/cfoundry/upload_helpers.rb
+- lib/cfoundry/v1/app.rb
+- lib/cfoundry/v1/base.rb
+- lib/cfoundry/v1/client.rb
+- lib/cfoundry/v1/framework.rb
+- lib/cfoundry/v1/model.rb
+- lib/cfoundry/v1/model_magic.rb
+- lib/cfoundry/v1/runtime.rb
+- lib/cfoundry/v1/service.rb
+- lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v1/user.rb
+- lib/cfoundry/v2/app.rb
+- lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
-- lib/cfoundry/v2/model.rb
-- lib/cfoundry/v2/user.rb
+- lib/cfoundry/v2/domain.rb
 - lib/cfoundry/v2/framework.rb
+- lib/cfoundry/v2/model.rb
 - lib/cfoundry/v2/model_magic.rb
-- lib/cfoundry/v2/service_auth_token.rb
-- lib/cfoundry/v2/space.rb
-- lib/cfoundry/v2/app.rb
-- lib/cfoundry/v2/service_plan.rb
-- lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/organization.rb
 - lib/cfoundry/v2/route.rb
-- lib/cfoundry/v2/domain.rb
 - lib/cfoundry/v2/runtime.rb
+- lib/cfoundry/v2/service.rb
+- lib/cfoundry/v2/service_auth_token.rb
+- lib/cfoundry/v2/service_binding.rb
 - lib/cfoundry/v2/service_instance.rb
-- lib/cfoundry/baseclient.rb
-- lib/cfoundry/upload_helpers.rb
-- lib/cfoundry/v1/service.rb
-- lib/cfoundry/v1/client.rb
-- lib/cfoundry/v1/model.rb
-- lib/cfoundry/v1/user.rb
-- lib/cfoundry/v1/framework.rb
-- lib/cfoundry/v1/model_magic.rb
-- lib/cfoundry/v1/app.rb
-- lib/cfoundry/v1/base.rb
-- lib/cfoundry/v1/runtime.rb
-- lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v2/service_plan.rb
+- lib/cfoundry/v2/space.rb
+- lib/cfoundry/v2/user.rb
+- lib/cfoundry/validator.rb
+- lib/cfoundry/version.rb
 - lib/cfoundry/zip.rb
-- lib/cfoundry/chatty_hash.rb
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/route_factory.rb
+- lib/cfoundry.rb
+- spec/cfoundry/baseclient_spec.rb
+- spec/cfoundry/errors_spec.rb
+- spec/cfoundry/uaaclient_spec.rb
+- spec/factories/app_factory.rb
+- spec/factories/client_factory.rb
+- spec/factories/domain_factory.rb
 - spec/factories/factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/space_factory.rb
-- spec/factories/organization_factory.rb
 - spec/factories/framework_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/app_factory.rb
+- spec/factories/organization_factory.rb
+- spec/factories/route_factory.rb
+- spec/factories/runtime_factory.rb
+- spec/factories/service_binding_factory.rb
+- spec/factories/service_factory.rb
+- spec/factories/service_instance_factory.rb
 - spec/factories/service_plan_factory.rb
+- spec/factories/space_factory.rb
 - spec/spec_helper.rb
-- spec/cfoundry/uaaclient_spec.rb
-has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -233,23 +233,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cfoundry
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files: 
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/route_factory.rb
+- spec/cfoundry/baseclient_spec.rb
+- spec/cfoundry/errors_spec.rb
+- spec/cfoundry/uaaclient_spec.rb
+- spec/factories/app_factory.rb
+- spec/factories/client_factory.rb
+- spec/factories/domain_factory.rb
 - spec/factories/factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/space_factory.rb
-- spec/factories/organization_factory.rb
 - spec/factories/framework_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/app_factory.rb
+- spec/factories/organization_factory.rb
+- spec/factories/route_factory.rb
+- spec/factories/runtime_factory.rb
+- spec/factories/service_binding_factory.rb
+- spec/factories/service_factory.rb
+- spec/factories/service_instance_factory.rb
 - spec/factories/service_plan_factory.rb
+- spec/factories/space_factory.rb
 - spec/spec_helper.rb
-- spec/cfoundry/uaaclient_spec.rb