puppet_forge 2.1.3 → 2.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f48d6266af226aa37df713b0e1e3f72d44dc574e
+  data.tar.gz: 70d063373704bfed1c60455cc305a67daa61bb23
+SHA512:
+  metadata.gz: a23339d6b315cd7415c5b7421a16df9aaee54c4dc3940f5b803cc8a6896356bf984a8c01ce4cda19bd25ad94d08683569f50420837cb052478cbd0afd22b20ae
+  data.tar.gz: f13dc0acd460860e8d9f94d99206c93305abce3a87bebaaf60845a423d4a173018da8a813e39aa0f40bbfbf728fbe4d08ab7c0a04f77dcb4e9378afe62b7fb30

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.1.4 - 2016-04-01
+
+### Changed
+
+* Bug in usage of minitar filenames led to ignored tar files with tar file length of >100 chars.
+
 ## v2.1.3 - 2016-01-25
 
 ### Changed

data/lib/puppet_forge/connection.rb

@@ -34,13 +34,20 @@ module PuppetForge
       @authorization
     end
 
+    # @param reset_connection [Boolean] flag to create a new connection every time this is called
+    # @param opts [Hash] Hash of connection options for Faraday
     # @return [Faraday::Connection] An existing Faraday connection if one was
     #   already set, otherwise a new Faraday connection.
-    def conn
-      @conn ||= default_connection
+    def conn(reset_connection = nil, opts = {})
+      if reset_connection
+        default_connection(opts)
+      else
+        @conn ||= default_connection(opts)
+      end
     end
 
-    def default_connection
+    # @param opts [Hash] Hash of connection options for Faraday
+    def default_connection(opts = {})
 
       begin
         # Use Typhoeus if available.
@@ -51,13 +58,14 @@ module PuppetForge
         adapter = Faraday.default_adapter
       end
 
-      make_connection(PuppetForge.host, [adapter])
+      make_connection(PuppetForge.host, [adapter], opts)
     end
     module_function :default_connection
 
     # Generate a new Faraday connection for the given URL.
     #
     # @param url [String] the base URL for this connection
+    # @param opts [Hash] Hash of connection options for Faraday
     # @return [Faraday::Connection]
     def make_connection(url, adapter_args = nil, opts = {})
       adapter_args ||= [Faraday.default_adapter]

data/lib/puppet_forge/tar/mini.rb

@@ -53,11 +53,11 @@ module PuppetForge
         Archive::Tar::Minitar.open(tarfile).each do |entry|
           flag = entry.typeflag
           if flag.nil? || flag =~ /[[:digit:]]/ && SYMLINK_FLAGS.include?(flag.to_i)
-            file_lists[:symlinks] << entry.name
+            file_lists[:symlinks] << entry.full_name
           elsif flag.nil? || flag =~ /[[:digit:]]/ && VALID_TAR_FLAGS.include?(flag.to_i)
-            file_lists[:valid] << entry.name
+            file_lists[:valid] << entry.full_name
           else
-            file_lists[:invalid] << entry.name 
+            file_lists[:invalid] << entry.full_name
           end
         end
         file_lists

data/lib/puppet_forge/v3/base.rb

@@ -54,12 +54,12 @@ module PuppetForge
         end
 
         # @private
-        def request(resource, item = nil, params = {})
+        def request(resource, item = nil, params = {}, reset_connection = false, conn_opts = {})
+          conn(reset_connection, conn_opts) if reset_connection
           unless conn.url_prefix =~ /^#{PuppetForge.host}/
             conn.url_prefix = "#{PuppetForge.host}"
           end
 
-
           if item.nil?
             uri_path = "/v3/#{resource}"
           else
@@ -69,32 +69,64 @@ module PuppetForge
           PuppetForge::V3::Base.conn.get uri_path, params
         end
 
-        def find(slug)
+        # @private
+        def find_request(slug, reset_connection = false, conn_opts = {})
           return nil if slug.nil?
 
-          resp = request("#{self.name.split("::").last.downcase}s", slug)
+          resp = request("#{self.name.split("::").last.downcase}s", slug, {}, reset_connection, conn_opts)
 
           self.new(resp.body)
         end
 
-        def where(params)
-          resp = request("#{self.name.split("::").last.downcase}s", nil, params)
+        def find(slug)
+          find_request(slug)
+        end
+
+        def find_stateless(slug, conn_opts = {})
+          find_request(slug, true, conn_opts)
+        end
+
+        # @private
+        def where_request(params, reset_connection = false, conn_opts = {})
+          resp = request("#{self.name.split("::").last.downcase}s", nil, params, reset_connection, conn_opts)
 
           new_collection(resp)
         end
 
+        def where(params)
+          where_request(params)
+        end
+
+        def where_stateless(params, conn_opts = {})
+          where_request(params, true, conn_opts)
+        end
+
         # Return a paginated collection of all modules
         def all(params = {})
           where(params)
         end
 
-        def get_collection(uri_path)
+        # Return a paginated collection of all modules
+        def all_stateless(params = {}, conn_opts = {})
+          where_stateless(params, conn_opts)
+        end
+
+        # @private
+        def get_collection_request(uri_path, reset_connection = false, conn_opts = {})
           resource, params = split_uri_path uri_path
-          resp = request(resource, nil, params)
+          resp = request(resource, nil, params, reset_connection, conn_opts)
 
           new_collection(resp)
         end
 
+        def get_collection(uri_path)
+          get_collection_request(uri_path)
+        end
+
+        def get_collection_stateless(uri_path, conn_opts)
+          get_collection_request(uri_path, true, conn_opts)
+        end
+
         # Faraday's Util#escape method will replace a '+' with '%2B' to prevent it being
         # interpreted as a space. For compatibility with the Forge API, we would like a '+'
         # to be interpreted as a space so they are changed to spaces here.

data/lib/puppet_forge/version.rb

@@ -1,3 +1,3 @@
 module PuppetForge
-  VERSION = '2.1.3' # Library version
+  VERSION = '2.1.4' # Library version
 end

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

@@ -10,11 +10,16 @@ describe PuppetForge::V3::Module do
   context "::find" do
     context "gets information on an existing module and" do
       let (:mod) { PuppetForge::V3::Module.find('puppetforgegemtesting-thorin') }
+      let (:mod_stateless) { PuppetForge::V3::Module.find_stateless('puppetforgegemtesting-thorin') }
 
       it "returns a PuppetForge::V3::Module." do
         expect(mod).to be_a(PuppetForge::V3::Module)
       end
 
+      it "returns a PuppetForge::V3::Module from a stateless call." do
+        expect(mod_stateless).to be_a(PuppetForge::V3::Module)
+      end
+
       it "exposes the API information." do
         expect(mod).to respond_to(:uri)
         expect(mod).to respond_to(:owner)
@@ -75,5 +80,41 @@ describe PuppetForge::V3::Module do
       end
     end
   end
+
+  context "::where_stateless" do
+    context "finds matching resources" do
+
+      it "only returns modules that match the query" do
+        modules = PuppetForge::V3::Module.where_stateless(:owner => 'puppetforgegemtesting')
+
+        expect(modules).to be_a(PuppetForge::V3::Base::PaginatedCollection)
+        modules.each do |mod|
+          expect(mod.owner.username).to eq('puppetforgegemtesting')
+        end
+
+      end
+
+      it "returns a paginated response" do
+        modules = PuppetForge::V3::Module.where_stateless(:owner => 'puppetforgegemtesting', :limit => 1)
+
+        expect(modules.limit).to eq(1)
+        expect(modules.total).to eq(2)
+
+        expect(modules.next).not_to be_nil
+      end
+
+    end
+
+    context "does not find matching resources" do
+      it "returns an empty PaginatedCollection" do
+        modules = PuppetForge::V3::Module.where_stateless(:owner => 'absentuser')
+
+        expect(modules).to be_a(PuppetForge::V3::Base::PaginatedCollection)
+
+        expect(modules.size).to eq(0)
+        expect(modules.empty?).to be(true)
+      end
+    end
+  end
 end
 

data/spec/unit/forge/tar/mini_spec.rb

@@ -3,9 +3,10 @@ require 'spec_helper'
 describe PuppetForge::Tar::Mini do
   let(:entry_class) do
     Class.new do
-      attr_accessor :typeflag, :name
-      def initialize(name, typeflag)
+      attr_accessor :typeflag, :name, :full_name
+      def initialize(name, full_name, typeflag)
         @name = name
+        @full_name = full_name
         @typeflag = typeflag
       end
     end
@@ -15,9 +16,9 @@ describe PuppetForge::Tar::Mini do
   let(:sourcedir)  { '/the/src/dir' }
   let(:destfile)   { '/the/dest/file.tar.gz' }
   let(:minitar)    { described_class.new }
-  let(:tarfile_contents) { [entry_class.new('file', '0'), \
-                            entry_class.new('symlink', '2'), \
-                            entry_class.new('invalid', 'F')] }
+  let(:tarfile_contents) { [entry_class.new('file', 'full_file', '0'), \
+                            entry_class.new('symlink', 'full_symlink', '2'), \
+                            entry_class.new('invalid', 'full_invalid', 'F')] }
 
   it "unpacks a tar file" do
     unpacks_the_entry(:file_start, 'thefile')
@@ -66,13 +67,13 @@ describe PuppetForge::Tar::Mini do
 
     expect(Zlib::GzipReader).to receive(:open).with(sourcefile).and_yield(reader)
     expect(Archive::Tar::Minitar).to receive(:open).with(reader).and_return(tarfile_contents)
-    expect(Archive::Tar::Minitar).to receive(:unpack).with(reader, destdir, ['file']).and_yield(:file_start, 'thefile', nil)
-    
+    expect(Archive::Tar::Minitar).to receive(:unpack).with(reader, destdir, ['full_file']).and_yield(:file_start, 'thefile', nil)
+
     file_lists = minitar.unpack(sourcefile, destdir)
 
-    expect(file_lists[:valid]).to eq(['file'])
-    expect(file_lists[:invalid]).to eq(['invalid'])
-    expect(file_lists[:symlinks]).to eq(['symlink'])
+    expect(file_lists[:valid]).to eq(['full_file'])
+    expect(file_lists[:invalid]).to eq(['full_invalid'])
+    expect(file_lists[:symlinks]).to eq(['full_symlink'])
   end
 
   def unpacks_the_entry(type, name)

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

@@ -17,12 +17,17 @@ describe PuppetForge::V3::Module do
 
   describe '::find' do
     let(:mod) { PuppetForge::V3::Module.find('puppetlabs-apache') }
+    let(:mod_stateless) { PuppetForge::V3::Module.find_stateless('puppetlabs-apache') }
     let(:missing_mod) { PuppetForge::V3::Module.find('absent-apache') }
 
     it 'can find modules that exist' do
       expect(mod.name).to eq('apache')
     end
 
+    it 'can find modules that exist from a stateless call' do
+      expect(mod_stateless.name).to eq('apache')
+    end
+
     it 'returns nil for non-existent modules' do
       expect { missing_mod }.to raise_error(Faraday::ResourceNotFound)
     end

metadata

@@ -1,196 +1,173 @@
 --- !ruby/object:Gem::Specification
 name: puppet_forge
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.1.4
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: semantic_puppet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Tools that can be used to access Forge API information on Modules, Users,
@@ -201,7 +178,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -275,30 +252,26 @@ files:
 homepage: https://github.com/puppetlabs/forge-ruby
 licenses:
 - Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3937561798561843992
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Access the Puppet Forge API from Ruby for resource information and to download
   releases.
 test_files:
@@ -347,4 +320,3 @@ test_files:
 - spec/unit/forge/v3/module_spec.rb
 - spec/unit/forge/v3/release_spec.rb
 - spec/unit/forge/v3/user_spec.rb
-has_rdoc: