berkshelf 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035b73ca9d93250f44face7e14fa87e16f37a721
-  data.tar.gz: c8a993b85d430f63c52ed12c9ac9f822ac09e5cf
+  metadata.gz: 4c1cb4c285df553eb0ef7571a584ab308d35f278
+  data.tar.gz: 66452c03b102b78cdf440841f99a644307677a3f
 SHA512:
-  metadata.gz: 5d5a6e17179a2583624cd8e4bb36a71989a978826df47f392173cf41d59314d5a0a24e49491a1ab3a37731b6badc1f820d3e490f0abffe5b3e0ea375fffa1910
-  data.tar.gz: b3a28330ba65f165f4058af6b2fe4f8eacec5a4bb6519bd2331ef2dcab97d833f4a4e0173392b1bb5aa32476b944cbcd2b217a56d0a52b4d0b1796794479247e
+  metadata.gz: 85bdfe1f3dd22b69af3343868ad5ae07ad17d457daf94cea5c267fa47dd3273f232efcd80ad358490b6bed94f6981f5453d459e7604121b1ef271aa4e12aaf91
+  data.tar.gz: 5525092c4221b4b32452cb214e50cbe7e6f0bc7e8b012a0403dbdf7875635797b707f99ea41f0d12e018f07b08d8b91d60698d71704bfe0565ada1e122e5df08

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.18
+
+* Fix issue with connecting to an HTTPS enabled community site
+
 # 2.0.17
 
 * Fix constraint on Hashie

data/lib/berkshelf/community_rest.rb

@@ -2,6 +2,8 @@ require 'open-uri'
 require 'retryable'
 require 'addressable/uri'
 
+require_relative 'core_ext/openuri'
+
 module Berkshelf
   class CommunityREST < Faraday::Connection
     class << self
@@ -80,6 +82,8 @@ module Berkshelf
 
       builder = Faraday::Builder.new do |b|
         b.response :parse_json
+        b.response :follow_redirects
+
         b.request :retry,
           max: @retries,
           interval: @retry_interval,

data/lib/berkshelf/core_ext/openuri.rb

@@ -0,0 +1,36 @@
+#
+# Patch to allow open-uri to follow safe (http to https) and unsafe
+# redirections (https to http).
+#
+# Original gist URL:
+# https://gist.github.com/1271420
+#
+# Relevant issue:
+# http://redmine.ruby-lang.org/issues/3719
+#
+# Source here:
+# https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb
+#
+module OpenURI
+  class <<self
+    alias_method :open_uri_original, :open_uri
+
+    def redirectable_safe?(uri1, uri2)
+      uri1.scheme.downcase == uri2.scheme.downcase || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
+    end
+
+    def redirectable_all?(uri1, uri2)
+      redirectable_safe?(uri1, uri2) || (uri1.scheme.downcase == "https" && uri2.scheme.downcase == "http")
+    end
+  end
+
+  # Patches the original open_uri method to follow all redirects
+  def self.open_uri(name, *rest, &block)
+    class << self
+      remove_method :redirectable?
+      alias_method  :redirectable?, :redirectable_all?
+    end
+
+    self.open_uri_original(name, *rest, &block)
+  end
+end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -529,6 +529,7 @@ files:
 - lib/berkshelf/core_ext.rb
 - lib/berkshelf/core_ext/file.rb
 - lib/berkshelf/core_ext/file_utils.rb
+- lib/berkshelf/core_ext/openuri.rb
 - lib/berkshelf/core_ext/pathname.rb
 - lib/berkshelf/core_ext/rbzip2.rb
 - lib/berkshelf/core_ext/string.rb