puppet_forge 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 052203624976cb87f491f5f75bdc25b1c0d2b4e3
-  data.tar.gz: 9c0fcd86efb6afd798b47391738af47f99837f8e
+  metadata.gz: bb6c13dde0b75c97be8726b4b9e754fba7a3c37e
+  data.tar.gz: 0d0e3a9112d81e3a459c7e37f245a6a0afe5d50e
 SHA512:
-  metadata.gz: af53aa35169471736552e69d98c4d84dbb17d5710f46af80301e2f062c181b509343f0d73ca15ee41002882edb35b415e5ab923cd6930fe581c88ce70f7d9472
-  data.tar.gz: 5ec3843bfa58d02ce337c20d1510e0f198cf4e0062166f56eb45eaf2460368894b40e1963f7ad74a58f260e2b61268a78314c92b080993ace956dfe24468c652
+  metadata.gz: b9d21c14690d2ae563bc1c166ffba9b7507d33cd9fbb5ef81d4ce2ba1351d4fc58fa486e0fec8470694cb746e3d32b31b4ae4e9d44eda6d72eb8c73e1934869f
+  data.tar.gz: f96f9901f85f25e04d3d800c54945212342c49b36391d999e670752c1eec0648a055559f23fe86c787324fea6e5165d899068190198ba6d8a5458b77b28ff4e4

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.5 - 2017-06-26
+
+### Fixed
+
+* (FORGE-338) Fixed an issue where `V3::Release.download_url` returned an incorrect value when `PuppetForge.host` included 
+  a path prefix. (Thanks to [Jainish Shah](https://github.com/jainishshah17) for the report and initial fix proposal.)
+
 ## v2.2.4 - 2017-04-17
 
 ### Added

data/lib/puppet_forge.rb

@@ -4,12 +4,21 @@ require 'gettext-setup'
 module PuppetForge
   class << self
     attr_accessor :user_agent
-    attr_accessor :host
+    attr_reader :host
+
+    def host=(new_host)
+      new_host << '/' unless new_host[-1] == '/'
+
+      # TODO: maybe freeze this
+      @host = new_host
+    end
   end
 
   GettextSetup.initialize(File.absolute_path('../locales', File.dirname(__FILE__)))
 
-  self.host = 'https://forgeapi.puppetlabs.com'
+  DEFAULT_FORGE_HOST = 'https://forgeapi.puppetlabs.com/'
+
+  self.host = DEFAULT_FORGE_HOST
 
   require 'puppet_forge/tar'
   require 'puppet_forge/unpacker'

data/lib/puppet_forge/v3/release.rb

@@ -13,7 +13,7 @@ module PuppetForge
       # @return [String] fully qualified download URL for release
       def download_url
         if URI.parse(file_uri).host.nil?
-          URI.join(PuppetForge.host, file_uri).to_s
+          URI.join(PuppetForge.host, file_uri[1..-1]).to_s
         else
           file_uri
         end

data/lib/puppet_forge/version.rb

@@ -1,3 +1,3 @@
 module PuppetForge
-  VERSION = '2.2.4' # Library version
+  VERSION = '2.2.5' # Library version
 end

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

@@ -96,6 +96,21 @@ describe PuppetForge::V3::Release do
         release.file_uri = 'https://example.com/v3/files/puppetlabs-apache-0.0.1.tar.gz'
         expect(release.download_url).to eql('https://example.com/v3/files/puppetlabs-apache-0.0.1.tar.gz')
       end
+
+      context 'when PuppetForge.host has a path prefix' do
+        around(:each) do |spec|
+          old_host = PuppetForge.host
+          PuppetForge.host = 'http://example.com/forge/api/'
+
+          spec.run
+
+          PuppetForge.host = old_host
+        end
+
+        it 'includes path prefix in download url' do
+          expect(release.download_url).to eql('http://example.com/forge/api/v3/files/puppetlabs-apache-0.0.1.tar.gz')
+        end
+      end
     end
 
     describe '#download' do

data/spec/unit/puppet_forge_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+RSpec.describe PuppetForge do
+  describe 'host attribute' do
+    after(:each) do
+      PuppetForge.host = PuppetForge::DEFAULT_FORGE_HOST
+    end
+
+    it 'should add a trailing slash if not present' do
+      PuppetForge.host = 'http://example.com'
+
+      expect(PuppetForge.host[-1,1]).to eq '/'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_forge
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -282,6 +282,7 @@ files:
 - spec/unit/forge/v3/module_spec.rb
 - spec/unit/forge/v3/release_spec.rb
 - spec/unit/forge/v3/user_spec.rb
+- spec/unit/puppet_forge_spec.rb
 homepage: https://github.com/puppetlabs/forge-ruby
 licenses:
 - Apache-2.0
@@ -357,4 +358,5 @@ test_files:
 - spec/unit/forge/v3/module_spec.rb
 - spec/unit/forge/v3/release_spec.rb
 - spec/unit/forge/v3/user_spec.rb
+- spec/unit/puppet_forge_spec.rb
 has_rdoc: