puppet_forge 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97687f6157b82d3048b866e0a0922c2eb4888daf
-  data.tar.gz: 01c8af2de5a93f1cd35fd8554ad2c87f24f3c3b9
+  metadata.gz: 274c0fbddb8599de6d21476810d91eb298e88720
+  data.tar.gz: 147c3aadd5fe7c3fc6cc1d2ebca74916049d2925
 SHA512:
-  metadata.gz: e14480b678895fad971e15fc5f4a93f3f33840f4a7ebc3b94452aed05e5dfa631a78c793a707892bb38ac857fd6da4894850475eeaff16485146539459e8265b
-  data.tar.gz: 33d37f9f5073242c3bffa522dd360c3116352025411d08709fbd14ef2d05a544c858a144e56f1d8301034e5d33100c6ab5ebd076e4847624f30dda0f0394d3f9
+  metadata.gz: ca092a41b2952ab4a8564e136a3b9562eeba61830863be6c8871baa2fa6a3c6bbae1d4aee56add286f9ff55c0bbe3bb16c4ed7634dbf4e790429edc57cc655ef
+  data.tar.gz: 564152499bcfd5b418a3842da2ff8d202194ab3f66997aacb4e0ddef7ab5c787858f7463b60e70ff84363654245e30bfb13924b5edb073e743137cc21da6bdf1

data/CHANGELOG.md

@@ -3,11 +3,21 @@
 Starting with v2.0.0, all notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v2.2.1 - 2016-05-24
+
+### Changed
+
+* Fixed an issue where certain types of connection failures raised a spurious "method missing" error instead of the underlying
+  exception.
+* When setting PuppetForge::Connection.proxy, an empty string will now be treated as nil. If no proxy has yet been configured,
+  setting to an empty string will have no effect. If a proxy has already been configured, setting to nil will unset the existing
+  value.
+
 ## v2.2.0 - 2016-05-10
 
 ### Changed
 
-* puppet\_forge's optional dependency on Typhoeus now searches for a gem matching '~> 1.0.1' so it will pick up more recent versions. 
+* puppet\_forge's optional dependency on Typhoeus now searches for a gem matching '~> 1.0.1' so it will pick up more recent versions.
   NOTE: This means if you have a version of Typhoeus installed that is less than 1.0.1, puppet\_forge will no longer use the Typhoeus
   adapter and will fall back to Ruby's Net::HTTP library.
 

data/lib/puppet_forge/connection.rb

@@ -43,6 +43,7 @@ module PuppetForge
     end
 
     def self.proxy=(url)
+      url = nil if url.respond_to?(:empty?) && url.empty?
       @proxy = url
     end
 

data/lib/puppet_forge/v3/release.rb

@@ -29,7 +29,7 @@ module PuppetForge
       rescue Faraday::ResourceNotFound => e
         raise PuppetForge::ReleaseNotFound, "The module release #{slug} does not exist on #{self.class.conn.url_prefix}.", e.backtrace
       rescue Faraday::ClientError => e
-        if e.response[:status] == 403
+        if e.response && e.response[:status] == 403
           raise PuppetForge::ReleaseForbidden.from_response(e.response)
         else
           raise e

data/lib/puppet_forge/version.rb

@@ -1,3 +1,3 @@
 module PuppetForge
-  VERSION = '2.2.0' # Library version
+  VERSION = '2.2.1' # Library version
 end

data/spec/unit/forge/connection_spec.rb

@@ -9,6 +9,33 @@ describe PuppetForge::Connection do
     PuppetForge::Connection
   end
 
+  describe 'class methods' do
+    subject { described_class }
+
+    describe '#proxy=' do
+      it "sets @proxy to value when passed non-empty string" do
+        proxy = "http://proxy.example.com:3128"
+
+        subject.proxy = proxy
+
+        expect(subject.instance_variable_get(:@proxy)).to eq proxy
+      end
+
+      it "sets @proxy to nil when passed an empty string" do
+        subject.proxy = ''
+
+        expect(subject.instance_variable_get(:@proxy)).to be_nil
+      end
+
+      it "replaces existing @proxy value with nil when set to empty string" do
+        subject.instance_variable_set(:@proxy, 'value')
+        subject.proxy = ''
+
+        expect(subject.instance_variable_get(:@proxy)).to be_nil
+      end
+    end
+  end
+
   describe 'creating a new connection' do
 
     let(:faraday_stubs) { Faraday::Adapter::Test::Stubs.new }

data/spec/unit/forge/v3/release_spec.rb

@@ -110,6 +110,28 @@ describe PuppetForge::V3::Release do
         release.download(Pathname.new(tarball))
         expect(File.exist?(tarball)).to be true
       end
+
+      context 'when response is 403' do
+        it "raises PuppetForge::ReleaseForbidden" do
+          mock_conn = instance_double("PuppetForge::V3::Connection", :url_prefix => PuppetForge.host)
+          allow(described_class).to receive(:conn).and_return(mock_conn)
+
+          expect(mock_conn).to receive(:get).and_raise(Faraday::ClientError.new("403", {:status => 403, :body => ({:message => "Forbidden"}.to_json)}))
+
+          expect { release.download(Pathname.new(tarball)) }.to raise_error(PuppetForge::ReleaseForbidden)
+        end
+      end
+
+      context 'when connection fails' do
+        it "re-raises original error" do
+          mock_conn = instance_double("PuppetForge::V3::Connection", :url_prefix => PuppetForge.host)
+          allow(described_class).to receive(:conn).and_return(mock_conn)
+
+          expect(mock_conn).to receive(:get).and_raise(Faraday::ConnectionFailed.new("connection failed"))
+
+          expect { release.download(Pathname.new(tarball)) }.to raise_error(Faraday::ConnectionFailed, /connection failed/)
+        end
+      end
     end
 
     describe '#metadata' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_forge
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday