new_cfoundry 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bfc22466bdb9775e0158b58a4ecf048f40eaaaa
-  data.tar.gz: 644a3ce2d136afde2d0d4a9bbb560f512e840166
+  metadata.gz: 4ef42baba30ec4f7dcd67b58882c138c33be49bf
+  data.tar.gz: ca8599b0ee42c40c4ae0ec232a713b7331542aa6
 SHA512:
-  metadata.gz: 4c92002ef239613b182ba525b90225389e32383af92ffa3847018e4cf68c1548af41c8f26ccc8fcfc2a966c64d6698c853c97a7f48b5d963e793bf240f3b52f8
-  data.tar.gz: 992dc26336b5e38f3e362719dcdb065c38ef85875baeb12204b5db7ec0d451f0e1a603925dac99fcd73388f24f1854808945bf3b5593eecdbcd426f2b6cdaaa8
+  metadata.gz: 155f92eecd6308f7caa4bc436a8203781f74d7f55fd2b6842dc90b312aa81e1440bc9b9899cfe0bb819700ddae88de18ef8b3daa951f92fa734d47e4bcdd2d0a
+  data.tar.gz: bfbe03e0b417453219c0d3fd2dd098131cdadfe276c14eedf248d1a31a86716dc13bd77676189d6713f820f3ce185264c5e33a464692165310dc6f53702cbf9a

data/VERSION

@@ -1 +1 @@
-4.9.0
+4.9.1

data/cfoundry.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency "activemodel", "<5.0.0", ">= 3.2.13"
-  s.add_dependency "cf-uaa-lib", "~> 2.0.0"
+  s.add_dependency "cf-uaa-lib", "~> 3.8.0"
   s.add_dependency "jwt", "~> 1.5"
   s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "multipart-post", "~> 1.1"

data/lib/cfoundry/baseclient.rb

@@ -15,13 +15,10 @@ module CFoundry
     attr_accessor :client_id, :client_secret
 
     def_delegators :rest_client, :target, :target=, :token,
-      :trace, :backtrace, :backtrace=, :log, :log=,
-      :http_proxy, :http_proxy=, :https_proxy, :https_proxy=
+      :trace, :backtrace, :backtrace=, :log, :log=
 
     def initialize(target, token = nil, options = {})
       @rest_client = CFoundry::RestClient.new(target, token)
-      @rest_client.http_proxy = options[:http_proxy]
-      @rest_client.https_proxy = options[:https_proxy]
       self.client_id = options[:client_id]
       self.client_secret = options[:client_secret]
       self.trace = false
@@ -36,8 +33,7 @@ module CFoundry
         if endpoint
           uaa = CFoundry::UAAClient.new(endpoint,
                                         client_id || "cf",
-                                        client_secret: client_secret,
-                                        http_proxy: http_proxy, https_proxy: https_proxy)
+                                        client_secret: client_secret)
           uaa.trace = trace
           uaa.token = token
           uaa

data/lib/cfoundry/rest_client.rb

@@ -38,8 +38,7 @@ module CFoundry
 
     attr_reader :target
 
-    attr_accessor :trace, :backtrace, :log,
-      :request_id, :token, :http_proxy, :https_proxy
+    attr_accessor :trace, :backtrace, :log, :request_id, :token
 
     def initialize(target, token = nil)
       @target = target

data/lib/cfoundry/uaaclient.rb

@@ -3,14 +3,12 @@ require "uaa"
 
 module CFoundry
   class UAAClient
-    attr_accessor :target, :client_id, :client_secret, :token, :trace, :http_proxy, :https_proxy
+    attr_accessor :target, :client_id, :client_secret, :token, :trace
 
     def initialize(target, client_id = "cf", options = {})
       @target = target
       @client_id = client_id
       @client_secret = options[:client_secret]
-      @http_proxy = options[:http_proxy]
-      @https_proxy = options[:https_proxy]
       @uaa_info_client = uaa_info_client_for(target)
     end
 
@@ -95,26 +93,18 @@ 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
-      )
+      CF::UAA::Info.new(url, :symbolize_keys => true)
     end
 
     def token_issuer
-      @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, client_secret,
-        :symbolize_keys => true,
-        :http_proxy => @http_proxy,
-        :https_proxy => @https_proxy
-      )
+      @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, client_secret, :symbolize_keys => true)
       @token_issuer.logger.level = @trace ? Logger::Severity::TRACE : 1
       @token_issuer
     end
 
     def scim
       auth_header = token && token.auth_header
-      scim = CF::UAA::Scim.new(uaa_url, auth_header, :symbolize_keys => true, :http_proxy => @http_proxy, :https_proxy => @https_proxy)
+      scim = CF::UAA::Scim.new(uaa_url, auth_header, :symbolize_keys => true)
       scim.logger.level = @trace ? Logger::Severity::TRACE : 1
       scim
     end

data/lib/cfoundry/v2/client.rb

@@ -18,8 +18,8 @@ module CFoundry::V2
     # [Space] Currently targeted space.
     attr_accessor :current_space
 
-    def_delegators :@base, :target, :target=, :token, :token=, :http_proxy, :http_proxy=,
-      :https_proxy, :https_proxy=, :trace, :trace=, :log, :log=, :info
+    def_delegators :@base, :target, :target=, :token, :token=,
+      :trace, :trace=, :log, :log=, :info
 
     # Create a new Client for interfacing with the given target.
     #

data/spec/cfoundry/baseclient_spec.rb

@@ -135,22 +135,6 @@ 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
-            allow(CFoundry::UAAClient).to receive(: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

data/spec/cfoundry/uaaclient_spec.rb

@@ -25,17 +25,6 @@ EOF
     end
   end
 
-  describe '#initialize' do
-    it "passes proxy info to the UAA info client" do
-      allow(CF::UAA::Info).to receive(: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 }
 
@@ -382,14 +371,11 @@ EOF
 
     it "passes proxy info to the token issuer" do
       allow(CF::UAA::TokenIssuer).to receive(: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'
+        symbolize_keys: true
       ))
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: new_cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - CI-Platform-Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement