puppet_forge 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3597a6621d4980a95db5690d60d0448c48295d
-  data.tar.gz: 90545df14bb6128d330e2d6c0769b0bbeb84ff10
+  metadata.gz: 9d3ac1386618a86886bcc242c9cf8899241b7480
+  data.tar.gz: 9042c6e51d0fcfeb1ff492fb125dc35a4a19702c
 SHA512:
-  metadata.gz: fd7247cdacde04841fab5a86fa5b11d82307f64d5ad4081be62f2a60cab63ea995736dee808047e487d7b58172dda0035bab3718039b09a3a3d467192302b617
-  data.tar.gz: fa634012325f4b1211e1ea8ca6b25db72a33143607f6af8202c1c554e5624cee1768b16dec28a9ee27e42ae5605120d6b4395023784ba750171652d46e82fad9
+  metadata.gz: 755007e1ac00c2209976755d3891ee18c8c2e63a2e2f0aa4bdbe22f64a18bf9c847f288aab30c418dfb61432df5e03b5bc76a32111df1908f98e38cf45ccde37
+  data.tar.gz: 8557b39ff685e758b9550df9a5c55c01a707079cc7a1e345df6786a099bcc5fd17ed980a3b210b0a42f93d9f14b30205acaa071f21e3037eca548e8fccab42fc

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.3 - 2017-01-17
+
+### Changed
+
+* Fixed an issue that was preventing PuppetForge.host from honoring any given path prefix.
+* Upgraded gettext-setup dependency to 0.11 release.
+
 ## v2.2.2 - 2016-07-06
 
 ### Changed

data/lib/puppet_forge/v3/base.rb

@@ -61,9 +61,9 @@ module PuppetForge
           end
 
           if item.nil?
-            uri_path = "/v3/#{resource}"
+            uri_path = "v3/#{resource}"
           else
-            uri_path = "/v3/#{resource}/#{item}"
+            uri_path = "v3/#{resource}/#{item}"
           end
 
           PuppetForge::V3::Base.conn.get uri_path, params

data/lib/puppet_forge/version.rb

@@ -1,3 +1,3 @@
 module PuppetForge
-  VERSION = '2.2.2' # Library version
+  VERSION = '2.2.3' # Library version
 end

data/puppet_forge.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday_middleware", [">= 0.9.0", "< 0.11.0"]
   spec.add_dependency 'semantic_puppet', '~> 0.1.0'
   spec.add_dependency 'minitar'
-  spec.add_dependency 'gettext-setup', '>= 0.3'
+  spec.add_dependency 'gettext-setup', '~> 0.11'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/spec/fixtures/uri/prefix/v3/bases/puppet.headers

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 06 Jan 2014 22:42:07 GMT
+Content-Type: application/json;charset=utf-8
+Content-Length: 285
+Connection: keep-alive
+Status: 200 OK
+X-Frame-Options: sameorigin
+X-XSS-Protection: 1; mode=block
+Cache-Control: public, must-revalidate
+Last-Modified: Mon, 12 Nov 2012 14:51:00 GMT
+X-Node: forgeapi02
+X-Revision: 49f66e061b0021c081fb58e754898cd928f61494
+

data/spec/fixtures/uri/prefix/v3/bases/puppet.json

@@ -0,0 +1,4 @@
+{
+  "uri": "/uri/prefix/v3/bases/puppet",
+  "username": "bar"
+}

data/spec/fixtures/v3/bases/puppet.headers

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 06 Jan 2014 22:42:07 GMT
+Content-Type: application/json;charset=utf-8
+Content-Length: 285
+Connection: keep-alive
+Status: 200 OK
+X-Frame-Options: sameorigin
+X-XSS-Protection: 1; mode=block
+Cache-Control: public, must-revalidate
+Last-Modified: Mon, 12 Nov 2012 14:51:00 GMT
+X-Node: forgeapi02
+X-Revision: 49f66e061b0021c081fb58e754898cd928f61494
+

data/spec/fixtures/v3/bases/puppet.json

@@ -0,0 +1,4 @@
+{
+  "uri": "/v3/bases/puppet",
+  "username": "foo"
+}

data/spec/integration/forge/v3/module_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe PuppetForge::V3::Module do
   before do
-
     PuppetForge.host = "https://forge-aio01-petest.puppetlabs.com/"
     PuppetForge::V3::Base.conn = PuppetForge::Connection.make_connection(PuppetForge.host, nil, {:ssl => {:verify => false} })
   end

data/spec/spec_helper.rb

@@ -12,9 +12,9 @@ require 'puppet_forge'
 
 module StubbingFaraday
 
-  def stub_api_for(klass)
+  def stub_api_for(klass, base_url = "http://api.example.com")
     allow(klass).to receive(:conn) do
-      Faraday.new :url => "http://api.example.com" do |builder|
+      Faraday.new :url => base_url do |builder|
         builder.use PuppetForge::Middleware::SymbolifyJson
         builder.response(:json, :content_type => /\bjson$/)
         builder.response(:raise_error)
@@ -65,4 +65,12 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.before(:example) do
+    @old_host = PuppetForge.host
+  end
+
+  config.after(:example) do
+    PuppetForge.host = @old_host
+  end
 end

data/spec/unit/forge/connection_spec.rb

@@ -13,6 +13,10 @@ describe PuppetForge::Connection do
     subject { described_class }
 
     describe '#proxy=' do
+      after(:each) do
+        subject.proxy = nil
+      end
+
       it "sets @proxy to value when passed non-empty string" do
         proxy = "http://proxy.example.com:3128"
 

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

@@ -57,4 +57,35 @@ describe PuppetForge::V3::Base do
       expect(collection.total).to eq(0)
     end
   end
+
+  describe 'the host url setting' do
+    before do
+    end
+
+    it 'should handle a host url with no path prefix' do
+      stub_api_for(PuppetForge::V3::Base) do |stubs|
+        stub_fixture(stubs, :get, '/v3/bases/puppet')
+      end
+
+      # Trigger connection reset
+      PuppetForge::V3::Base.conn = PuppetForge::Connection.default_connection
+
+      base = PuppetForge::V3::Base.find 'puppet'
+      expect(base.username).to eq('foo')
+    end
+
+    it 'should handle a path prefix in the host' do
+      PuppetForge.host = 'https://api.example.com/uri/prefix'
+
+      stub_api_for(PuppetForge::V3::Base, PuppetForge.host) do |stubs|
+        stub_fixture(stubs, :get, '/uri/prefix/v3/bases/puppet')
+      end
+
+      # Trigger connection reset
+      PuppetForge::V3::Base.conn = PuppetForge::Connection.default_connection
+
+      base = PuppetForge::V3::Base.find 'puppet'
+      expect(base.username).to eq('bar')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_forge
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -76,16 +76,16 @@ dependencies:
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +233,10 @@ files:
 - lib/puppet_forge/version.rb
 - locales/config.yaml
 - puppet_forge.gemspec
+- spec/fixtures/uri/prefix/v3/bases/puppet.headers
+- spec/fixtures/uri/prefix/v3/bases/puppet.json
+- spec/fixtures/v3/bases/puppet.headers
+- spec/fixtures/v3/bases/puppet.json
 - spec/fixtures/v3/files/puppetlabs-apache-0.0.1.tar.gz.headers
 - spec/fixtures/v3/files/puppetlabs-apache-0.0.1.tar.gz.json
 - spec/fixtures/v3/modules.headers
@@ -298,12 +302,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Access the Puppet Forge API from Ruby for resource information and to download
   releases.
 test_files:
+- spec/fixtures/uri/prefix/v3/bases/puppet.headers
+- spec/fixtures/uri/prefix/v3/bases/puppet.json
+- spec/fixtures/v3/bases/puppet.headers
+- spec/fixtures/v3/bases/puppet.json
 - spec/fixtures/v3/files/puppetlabs-apache-0.0.1.tar.gz.headers
 - spec/fixtures/v3/files/puppetlabs-apache-0.0.1.tar.gz.json
 - spec/fixtures/v3/modules.headers