cfoundry 4.0.4.rc2 → 4.1.0

data/lib/cfoundry/baseclient.rb

@@ -7,6 +7,8 @@ require "forwardable"
 
 module CFoundry
   class BaseClient # :nodoc:
+    include CFoundry::ProxyOptions
+
     extend Forwardable
 
     attr_reader :rest_client
@@ -27,7 +29,7 @@ module CFoundry
         endpoint = info[:authorization_endpoint]
 
         if endpoint
-          uaa = CFoundry::UAAClient.new(endpoint)
+          uaa = CFoundry::UAAClient.new(endpoint, "cf", http_proxy: http_proxy, https_proxy: https_proxy)
           uaa.trace = trace
           uaa.token = token
           uaa
@@ -105,7 +107,7 @@ module CFoundry
         opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE 
       end
 
-      Net::HTTP.start(uri.host, uri.port, opts) do |http|
+      Net::HTTP.start(uri.host, uri.port, *proxy_options_for(uri), opts) do |http|
         http.read_timeout = 5
 
         req = Net::HTTP::Get.new(uri.request_uri)

data/lib/cfoundry/client.rb

@@ -1,3 +1,5 @@
+require "cfoundry/concerns/proxy_options"
+
 require "cfoundry/baseclient"
 require "cfoundry/rest_client"
 require "cfoundry/auth_token"

data/lib/cfoundry/concerns/proxy_options.rb

@@ -0,0 +1,17 @@
+module CFoundry
+  module ProxyOptions
+    def proxy_options_for(uri)
+      ssl = uri.is_a?(URI::HTTPS)
+      proxy_to_use = (ssl ? https_proxy : http_proxy)
+
+      if proxy_to_use.blank?
+        []
+      else
+        proxy_to_use = "proto://#{proxy_to_use}" unless proxy_to_use =~ /:\/\//
+        proxy_uri = URI.parse(proxy_to_use)
+        proxy_user, proxy_password = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
+        [proxy_uri.host, proxy_uri.port, proxy_user, proxy_password]
+      end
+    end
+  end
+end

data/lib/cfoundry/rest_client.rb

@@ -7,20 +7,10 @@ require "fileutils"
 module CFoundry
   class RestClient
     class HTTPFactory
-      def self.create(uri, http_proxy, https_proxy)
-        scheme = uri.scheme
-        proxy_to_use = (scheme == "http" ? http_proxy : https_proxy)
-
-        if proxy_to_use
-          proxy_uri = URI.parse(proxy_to_use)
-          proxy_user, proxy_pass = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
-          http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_user, proxy_pass).
-            new(uri.host, uri.port)
-        else
-          http = Net::HTTP.new(uri.host, uri.port)
-        end
+      def self.create(uri, proxy_options = [])
+        http = Net::HTTP.new(uri.host, uri.port, *proxy_options)
 
-        if scheme == "https"
+        if uri.is_a?(URI::HTTPS)
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
@@ -30,6 +20,7 @@ module CFoundry
     end
 
     include CFoundry::TraceHelpers
+    include CFoundry::ProxyOptions
 
     LOG_LENGTH = 10
 
@@ -148,7 +139,7 @@ module CFoundry
 
       add_headers(request, headers)
 
-      http = HTTPFactory.create(uri, http_proxy, https_proxy)
+      http = HTTPFactory.create(uri, proxy_options_for(uri))
 
       # TODO remove this when staging returns streaming responses
       http.read_timeout = 300

data/lib/cfoundry/uaaclient.rb

@@ -3,17 +3,19 @@ require "uaa"
 
 module CFoundry
   class UAAClient
-    attr_accessor :target, :client_id, :token, :trace
+    attr_accessor :target, :client_id, :token, :trace, :http_proxy, :https_proxy
 
-    def initialize(target, client_id = "cf")
+    def initialize(target, client_id = "cf", options = {})
       @target = target
       @client_id = client_id
-      CF::UAA::Misc.symbolize_keys = true
+      @http_proxy = options[:http_proxy]
+      @https_proxy = options[:https_proxy]
+      @uaa_info_client = uaa_info_client_for(target)
     end
 
     def prompts
       wrap_uaa_errors do
-        CF::UAA::Misc.server(target)[:prompts]
+        @uaa_info_client.server[:prompts]
       end
     end
 
@@ -44,7 +46,7 @@ module CFoundry
 
     def password_score(password)
       wrap_uaa_errors do
-        response = CF::UAA::Misc.password_strength(uaa_url, password)
+        response = uaa_info_client_for(uaa_url).password_strength(password)
 
         required_score = response[:requiredScore] || 0
         case (response[:score] || 0)
@@ -90,8 +92,20 @@ module CFoundry
 
     private
 
+    def uaa_info_client_for(url)
+      CF::UAA::Info.new(url,
+                        :symbolize_keys => true,
+                        :http_proxy => http_proxy,
+                        :https_proxy => https_proxy
+      )
+    end
+
     def token_issuer
-      @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, nil, :symbolize_keys => true)
+      @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, nil,
+        :symbolize_keys => true,
+        :http_proxy => @http_proxy,
+        :https_proxy => @https_proxy
+      )
       @token_issuer.logger.level = @trace ? Logger::Severity::TRACE : 1
       @token_issuer
     end
@@ -104,7 +118,7 @@ module CFoundry
     end
 
     def uaa_url
-      @uaa_url ||= CF::UAA::Misc.discover_uaa(target)
+      @uaa_url ||= @uaa_info_client.discover_uaa
     end
 
     def authenticate_with_password_grant(credentials)

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/baseclient_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe CFoundry::BaseClient do
+  let(:authorization_endpoint) { "http://uaa.example.com" }
   subject(:client) { CFoundry::BaseClient.new("http://api.example.com") }
   describe "#request" do
     before do
@@ -104,7 +105,7 @@ describe CFoundry::BaseClient do
 
   describe "UAAClient" do
     context "with a valid uaa endpoint" do
-      let(:info) { { :authorization_endpoint => "http://uaa.example.com" } }
+      let(:info) { { :authorization_endpoint => authorization_endpoint } }
 
       before do
         subject.stub(:info) { info }
@@ -134,6 +135,22 @@ describe CFoundry::BaseClient do
             expect(subject.uaa.target).to eq "foo"
           end
         end
+
+        context "when proxy is set" do
+          before do
+            subject.http_proxy = 'http-proxy.example.com'
+            subject.https_proxy = 'https-proxy.example.com'
+          end
+
+          it "passes the proxy to the uaa client" do
+            CFoundry::UAAClient.stub(:new).and_call_original
+            subject.uaa
+            expect(CFoundry::UAAClient).to have_received(:new).with(anything, anything, hash_including(
+                http_proxy: 'http-proxy.example.com',
+                https_proxy: 'https-proxy.example.com'
+            ))
+          end
+        end
       end
 
       describe "#token=" do
@@ -219,6 +236,16 @@ describe CFoundry::BaseClient do
       expect(chunks).to eq(["https result"])
     end
 
+    it "sets proxy options if available" do
+      stub_request(:get, "https://example.com/something")
+      subject.https_proxy = "user:password@https-proxy.example.com:1234"
+      Net::HTTP.stub(:start).and_call_original
+
+      subject.stream_url("https://example.com/something")
+
+      expect(Net::HTTP).to have_received(:start).with(anything, anything, 'https-proxy.example.com', 1234, 'user', 'password', anything)
+    end
+
     it "raises NotFound if response is 404" do
       stub_request(:get, "http://example.com/something").to_return(
         :status => 404, :body => "result")

data/spec/cfoundry/rest_client_spec.rb

@@ -289,11 +289,10 @@ describe CFoundry::RestClient do
 
   describe CFoundry::RestClient::HTTPFactory do
     describe ".create" do
-      let(:http_proxy) { '' }
-      let(:https_proxy) { '' }
+      let(:proxy_options) { [] }
       let(:target_uri) { "http://api.example.com" }
 
-      subject { CFoundry::RestClient::HTTPFactory.create(URI.parse(target_uri), http_proxy, https_proxy) }
+      subject { CFoundry::RestClient::HTTPFactory.create(URI.parse(target_uri), proxy_options) }
 
       context "when no proxy URI is set" do
         it "should return an instance of the plain Net:HTTP class" do
@@ -313,7 +312,7 @@ describe CFoundry::RestClient do
       end
 
       context "when a http proxy URI without user/password is set " do
-        let(:http_proxy) { "http://exapmle.com:8080" }
+        let(:proxy_options) { ["exapmle.com", 8080, nil, nil] }
 
         it "should return an instance of the proxy class" do
           expect(subject.proxy?).to be_true
@@ -323,7 +322,7 @@ describe CFoundry::RestClient do
       end
 
       context "when a http proxy URI with user/password is set " do
-        let(:http_proxy) { "http://user:pass@exapmle.com:8080" }
+        let(:proxy_options) { ["exapmle.com", "8080", "user", "pass"] }
 
         it "should return an instance of the proxy class" do
           expect(subject.proxy?).to be_true
@@ -331,41 +330,6 @@ describe CFoundry::RestClient do
           expect(subject.proxy_pass).to eql("pass")
         end
       end
-
-      context "when a https proxy URI is set and the target is an https URI" do
-        let(:target_uri) { "https://example.com" }
-        let(:https_proxy) { "http://exapmle.com:8080" }
-
-        it "should return an instance of the proxy class" do
-          expect(subject.proxy?).to be_true
-        end
-      end
-
-      context "when a https proxy URI is set and the target is an http URI" do
-        let(:target_uri) { "http://example.com" }
-        let(:https_proxy) { "http://exapmle.com:8080" }
-
-        it "should return an instance of the plain Net:HTTP class" do
-          expect(subject.proxy?).to be_nil
-        end
-      end
-
-      context "when a http proxy URI is set and the target is an https URI" do
-        let(:target_uri) { "https://example.com" }
-        let(:http_proxy) { "http://exapmle.com:8080" }
-
-        it "should return an instance of the plain Net:HTTP class" do
-          expect(subject.proxy?).to be_nil
-        end
-      end
-
-      context "when an invalid proxy URI is set" do
-        let(:http_proxy) { "invalid URI" }
-
-        it "should raise an error" do
-          expect { subject }.to raise_error(URI::InvalidURIError)
-        end
-      end
     end
   end
 

data/spec/cfoundry/uaaclient_spec.rb

@@ -25,6 +25,17 @@ EOF
     end
   end
 
+  describe '#initialize' do
+    it "passes proxy info to the UAA info client" do
+      CF::UAA::Info.stub(:new)
+      CFoundry::UAAClient.new(target, 'cf', http_proxy: 'http-proxy.example.com', https_proxy: 'https-proxy.example.com')
+      expect(CF::UAA::Info).to have_received(:new).with(anything, hash_including(
+          http_proxy: 'http-proxy.example.com',
+          https_proxy: 'https-proxy.example.com'
+      ))
+    end
+  end
+
   describe '#prompts' do
     subject { uaa.prompts }
 
@@ -338,6 +349,19 @@ EOF
       uaa.trace = false
       expect(uaa.send(:token_issuer).logger.level).to eq 1
     end
+
+    it "passes proxy info to the token issuer" do
+      CF::UAA::TokenIssuer.stub(:new).and_call_original
+      uaa.http_proxy = 'http-proxy.example.com'
+      uaa.https_proxy = 'https-proxy.example.com'
+
+      uaa.send(:token_issuer)
+
+      expect(CF::UAA::TokenIssuer).to have_received(:new).with(anything, anything, anything, hash_including(
+          http_proxy: 'http-proxy.example.com',
+          https_proxy: 'https-proxy.example.com'
+      ))
+    end
   end
 
   describe "#scim" do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 SPEC_ROOT = File.dirname(__FILE__).freeze
 
 require "rspec"
+require "putsinator"
 require "cfoundry"
 require "webmock/rspec"
 require "ostruct"

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.0.4.rc2
+  version: 4.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,20 +31,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,6 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,6 +159,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -147,6 +167,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -154,20 +175,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,6 +199,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,6 +207,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -189,6 +215,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -196,6 +223,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -203,10 +231,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: putsinator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -236,6 +281,7 @@ files:
 - lib/cfoundry/chatty_hash.rb
 - lib/cfoundry/client.rb
 - lib/cfoundry/concerns/login_helpers.rb
+- lib/cfoundry/concerns/proxy_options.rb
 - lib/cfoundry/errors.rb
 - lib/cfoundry/rest_client.rb
 - lib/cfoundry/test_support.rb
@@ -384,26 +430,33 @@ files:
 - spec/support/test_model_builder.rb
 homepage: http://github.com/cloudfoundry/cfoundry
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3532839030076498984
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3532839030076498984
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files:
 - spec/cc_api_stub/applications_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzcyYjhmZjYxNzg5Yzg5NDFhZDJiZThlZmQzMjdiOGE4ZTg3ODEzMQ==
-  data.tar.gz: !binary |-
-    MTFlMTk5ODQ5YTQxMTM2NmJkYjQ2YmFkZDRkOTM5ZDhmNmE1N2JjYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTUwNTA2ZmRiN2JhM2MzNjIxZWQ5MzJlMzAwMTRmNGFmN2I4OWQ0MmU0MWFl
-    Y2YwOWMxMTk1NGUzOWQ3NjJhODgwOTA5ZjY2Y2E5YjRlODJmMjY2ODQ4MDI5
-    YWYzYjM0MzUwZTkwY2U2NTVjZDNmYjdlNjI1NGY2YTEyZGMxMDQ=
-  data.tar.gz: !binary |-
-    ZmMyYTBjMDM0MmNmY2ZjMzVlMzQwY2JmMWY4NDlmMzRjMjlhMzllMzI4N2Uy
-    MWRjNGEyOGM3ZjM4NjZkOGE0NGRkOTFlODkxZWIwMGExYzcyZTU0NTZhMjU4
-    MTRmNWE0NjBlMmZkNDQ1ZWIyMzM2NTlkZmIxMzYxNzIxMmY3M2Q=