berkshelf 5.6.3 → 5.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1504161410f0f7f535a2d3c1227e66596d0e85
-  data.tar.gz: b0ee0d0640c9f5c3025b8cb26c694e9e3941bf91
+  metadata.gz: 409c41e8dc72a361b7aad7e5afe718e6bc69ccf3
+  data.tar.gz: a824d62bdc2f419db0fd693232275b4348686c8e
 SHA512:
-  metadata.gz: 11617a70da55c976441d47ce96baf8e89a4ed2f3edb88c9e102dafda4be9338953518d7b5e6fadb50e1e91094f28cc65ed4b52c702557c4c9300b15e4bc698a1
-  data.tar.gz: 92662654355e09f0537a46a00a96f8de7a39d9f127ee97b94ce86f734811513ce8db0dbc76681a00ef9ca79a5a0cf0cac8a3f39cbcf627826a01ac79211cab06
+  metadata.gz: ab396ce9d36abc61cc327d6ae13873b361c3c4e48aedbca92eab219b052d1d36aed49cdc3a0cde6e3e69ecb95cb7f8f341a8380b7a6c2ebc000cbaf03f9e819c
+  data.tar.gz: ad8227ce4c7117b15d051b4c24b8155cf903260026dd9595a341133149f9444be2f6b903f5d10fe807278cd061df0d8fcf9dad10159ce06e54f903dfdb188835

data/.travis.yml

@@ -50,7 +50,8 @@ matrix:
         - gem install bundler --version=1.10.6
         # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
         - sudo apt-get update
-        - sudo apt-get -y install squid3
+        - sudo apt-get -y install squid3 apache2-utils
+        - sudo htpasswd -b -c /etc/squid3/passwords proxy proxy
       sudo: required
       env:
         - PROXY_TESTS_DIR=/tmp/proxy_tests

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Change Log
 
-## [5.6.3](https://github.com/berkshelf/berkshelf/tree/5.6.3) (2017-02-23)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.2...5.6.3)
+## [5.6.4](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-03-14)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...5.6.4)
 
 **Merged pull requests:**
 
+- Add Support for Auth Proxy [\#1684](https://github.com/berkshelf/berkshelf/pull/1684) ([tduffield](https://github.com/tduffield))
+
+## [v5.6.3](https://github.com/berkshelf/berkshelf/tree/v5.6.3) (2017-02-23)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.2...v5.6.3)
+
+**Merged pull requests:**
+
+- Release 5.6.3 [\#1681](https://github.com/berkshelf/berkshelf/pull/1681) ([tduffield](https://github.com/tduffield))
 - Specify appropriate proxies based on URI [\#1679](https://github.com/berkshelf/berkshelf/pull/1679) ([tduffield](https://github.com/tduffield))
 - Remove spork [\#1672](https://github.com/berkshelf/berkshelf/pull/1672) ([biinari](https://github.com/biinari))
 

data/Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.6.3)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -217,7 +217,7 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.6)
+    molinillo (0.5.7)
     msgpack (1.0.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
@@ -376,4 +376,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

data/lib/berkshelf/community_rest.rb

@@ -195,16 +195,19 @@ module Berkshelf
     def open_uri_options(target)
       options = {}
       options.merge!(headers)
-      options.merge!(open_uri_proxy_options)
+      options.merge!(open_uri_proxy_options(target))
       options.merge!(ssl_verify_mode: ssl_verify_mode)
-      options.merge!(proxy: URI.parse(target).find_proxy())
     end
 
-    def open_uri_proxy_options
+    def open_uri_proxy_options(target)
+      proxy_uri = URI.parse(target).find_proxy()
+      return {} if proxy_uri.nil?
+
+      proxy = Faraday::ProxyOptions.from(proxy_uri)
       if proxy && proxy[:user] && proxy[:password]
         { proxy_http_basic_authentication: [ proxy[:uri], proxy[:user], proxy[:password] ] }
       else
-        {}
+        { proxy: proxy[:uri] }
       end
     end
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.6.3"
+  VERSION = "5.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.6.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable