r10k 3.12.1 → 3.14.2

data/spec/unit/util/downloader_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+require 'r10k/util/downloader'
+
+describe R10K::Util::Downloader do
+
+  subject(:downloader) do
+    subj = Object.new
+    subj.extend(R10K::Util::Downloader)
+    subj.singleton_class.class_eval { public :download }
+    subj.singleton_class.class_eval { public :http_get }
+    subj.singleton_class.class_eval { public :file_digest }
+    subj
+  end
+
+  let(:tmpdir) { Dir.mktmpdir }
+  after(:each) { FileUtils.remove_entry_secure(tmpdir) }
+
+  describe 'http_get' do
+    let(:src_url) { 'https://example.com' }
+    let(:dst_file) { File.join(tmpdir, 'test.out') }
+    let(:tarball_uri) { URI('http://tarball.example.com/tarball.tar.gz') }
+    let(:redirect_uri) { URI('http://redirect.example.com/redirect') }
+    let(:proxy_uri) { URI('http://user:password@proxy.example.com') }
+
+    it 'downloads a simple file' do
+      mock_session = instance_double('Net::HTTP', active?: true)
+      tarball_response = instance_double('Net::HTTPSuccess')
+
+      expect(Net::HTTP).to receive(:new).with(tarball_uri.host, any_args).and_return(mock_session)
+      expect(Net::HTTPSuccess).to receive(:===).with(tarball_response).and_return(true)
+
+      expect(mock_session).to receive(:request_get).and_yield(tarball_response)
+      expect(mock_session).to receive(:start).once
+      expect(mock_session).to receive(:finish).once
+
+      expect { |b| downloader.http_get(tarball_uri, &b) }.to yield_with_args(tarball_response)
+    end
+
+    it 'follows redirects' do
+      mock_session_1 = instance_double('Net::HTTP', active?: false)
+      mock_session_2 = instance_double('Net::HTTP', active?: true)
+      redirect_response = instance_double('Net::HTTPRedirection')
+      tarball_response = instance_double('Net::HTTPSuccess')
+
+      expect(Net::HTTP).to receive(:new).with(redirect_uri.host, any_args).and_return(mock_session_1).once
+      expect(Net::HTTP).to receive(:new).with(tarball_uri.host, any_args).and_return(mock_session_2).once
+      expect(Net::HTTPRedirection).to receive(:===).with(redirect_response).and_return(true)
+      expect(Net::HTTPSuccess).to receive(:===).with(tarball_response).and_return(true)
+      allow(Net::HTTPRedirection).to receive(:===).and_call_original
+
+      expect(mock_session_1).to receive(:request_get).and_yield(redirect_response)
+      expect(mock_session_2).to receive(:request_get).and_yield(tarball_response)
+
+      # The redirect response should be queried for the redirect location
+      expect(redirect_response).to receive(:[]).with('location').and_return(tarball_uri.to_s)
+
+      # Both sessions should start and finish cleanly
+      expect(mock_session_1).to receive(:start).once
+      expect(mock_session_1).to receive(:finish).once
+      expect(mock_session_2).to receive(:start).once
+      expect(mock_session_2).to receive(:finish).once
+
+      expect { |b| downloader.http_get(redirect_uri, &b) }.to yield_with_args(tarball_response)
+    end
+
+    it 'can use a proxy' do
+      mock_session = instance_double('Net::HTTP', active?: true)
+
+      expect(Net::HTTP).to receive(:new)
+                       .with(tarball_uri.host,
+                             tarball_uri.port,
+                             proxy_uri.host,
+                             proxy_uri.port,
+                             proxy_uri.user,
+                             proxy_uri.password,
+                             any_args)
+                       .and_return(mock_session)
+
+      expect(mock_session).to receive(:request_get).and_return(:not_yielded)
+      expect(mock_session).to receive(:start).once
+      expect(mock_session).to receive(:finish).once
+
+      downloader.http_get(tarball_uri, proxy: proxy_uri)
+    end
+  end
+
+  describe 'checksums' do
+    let(:fixture_checksum) { '0bcea17aa0c5e868c18f0fa042feda770e47c1a4223229f82116ccb3ca33c6e3' }
+    let(:fixture_tarball) do
+      File.expand_path('spec/fixtures/integration/git/puppet-boolean-bare.tar', PROJECT_ROOT)
+    end
+
+    it 'checksums files' do
+      expect(downloader.file_digest(fixture_tarball)).to eql(fixture_checksum)
+    end
+  end
+end
+

data/spec/unit/util/purgeable_spec.rb

@@ -15,8 +15,10 @@ RSpec.describe R10K::Util::Purgeable do
       'spec/fixtures/unit/util/purgeable/managed_one/expected_1',
       'spec/fixtures/unit/util/purgeable/managed_one/new_1',
       'spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1',
+      'spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir',
       'spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1',
       'spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_new_1',
+      'spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file',
       'spec/fixtures/unit/util/purgeable/managed_two/expected_2',
       'spec/fixtures/unit/util/purgeable/managed_two/new_2',
       'spec/fixtures/unit/util/purgeable/managed_two/.hidden',
@@ -30,7 +32,8 @@ RSpec.describe R10K::Util::Purgeable do
 
     describe '#current_contents' do
       it 'collects direct contents of all managed directories' do
-        expect(subject.current_contents(recurse)).to contain_exactly(/\/expected_1/, /\/expected_2/, /\/unmanaged_1/, /\/unmanaged_2/, /\/managed_subdir_1/)
+        expect(subject.current_contents(recurse)).to contain_exactly(/\/expected_1/, /\/expected_2/, /\/unmanaged_1/, /\/unmanaged_2/,
+                                                                     /\/managed_subdir_1/, /\/managed_symlink_dir/, /\/unmanaged_symlink_file/)
       end
     end
 
@@ -46,7 +49,7 @@ RSpec.describe R10K::Util::Purgeable do
         let(:whitelist) { [] }
 
         it 'collects current_contents that should not exist' do
-          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_1/, /\/unmanaged_2/)
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_1/, /\/unmanaged_2/, /\/unmanaged_symlink_file/)
         end
       end
 
@@ -56,7 +59,7 @@ RSpec.describe R10K::Util::Purgeable do
 
         it 'collects current_contents that should not exist except whitelisted items' do
           expect(subject.logger).to receive(:debug).with(/unmanaged_1.*whitelist match/i)
-          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_2/)
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_2/, /\/unmanaged_symlink_file/)
         end
       end
 
@@ -66,7 +69,7 @@ RSpec.describe R10K::Util::Purgeable do
 
         it 'collects current_contents that should not exist except excluded items' do
           expect(subject.logger).to receive(:debug2).with(/unmanaged_2.*internal exclusion match/i)
-          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_1/)
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).to contain_exactly(/\/unmanaged_1/, /\/unmanaged_symlink_file/)
         end
       end
     end
@@ -102,9 +105,13 @@ RSpec.describe R10K::Util::Purgeable do
         expect(subject.current_contents(recurse)).
           to contain_exactly(/\/expected_1/, /\/expected_2/,
                              /\/unmanaged_1/, /\/unmanaged_2/,
+                             /\/managed_symlink_dir/,
+                             /\/unmanaged_symlink_file/,
                              /\/managed_subdir_1/,
                              /\/subdir_expected_1/, /\/subdir_unmanaged_1/,
-                             /\/managed_subdir_2/, /\/ignored_1/,
+                             /\/managed_symlink_file/,
+                             /\/unmanaged_symlink_dir/,
+                             /\/subdir_allowlisted_2/, /\/ignored_1/,
                              /\/\.hidden/)
       end
     end
@@ -122,7 +129,8 @@ RSpec.describe R10K::Util::Purgeable do
 
         it 'collects current_contents that should not exist recursively' do
           expect(subject.stale_contents(recurse, exclusions, whitelist)).
-            to contain_exactly(/\/unmanaged_1/, /\/unmanaged_2/, /\/subdir_unmanaged_1/, /\/ignored_1/)
+            to contain_exactly(/\/unmanaged_1/, /\/unmanaged_2/, /\/unmanaged_symlink_file/, /\/subdir_unmanaged_1/,
+                               /\/ignored_1/, /\/subdir_allowlisted_2/, /\/unmanaged_symlink_dir/)
         end
       end
 
@@ -134,7 +142,8 @@ RSpec.describe R10K::Util::Purgeable do
           expect(subject.logger).to receive(:debug).with(/unmanaged_1.*whitelist match/i)
 
           expect(subject.stale_contents(recurse, exclusions, whitelist)).
-            to contain_exactly(/\/unmanaged_2/, /\/subdir_unmanaged_1/, /\/ignored_1/)
+            to contain_exactly(/\/unmanaged_2/, /\/subdir_unmanaged_1/, /\/unmanaged_symlink_file/, /\/ignored_1/,
+                               /\/subdir_allowlisted_2/, /\/unmanaged_symlink_dir/)
         end
 
         it 'does not collect contents that match recursive globbed whitelist items as intermediate values' do
@@ -142,7 +151,7 @@ RSpec.describe R10K::Util::Purgeable do
           expect(subject.logger).not_to receive(:debug).with(/ignored_1/)
 
           expect(subject.stale_contents(recurse, exclusions, recursive_whitelist)).
-            to contain_exactly(/\/unmanaged_2/, /\/managed_one\/unmanaged_1/)
+            to contain_exactly(/\/unmanaged_2/, /\/managed_one\/unmanaged_1/, /\/managed_one\/unmanaged_symlink_file/)
         end
       end
 
@@ -154,7 +163,8 @@ RSpec.describe R10K::Util::Purgeable do
           expect(subject.logger).to receive(:debug2).with(/unmanaged_2.*internal exclusion match/i)
 
           expect(subject.stale_contents(recurse, exclusions, whitelist)).
-            to contain_exactly(/\/unmanaged_1/, /\/subdir_unmanaged_1/, /\/ignored_1/)
+            to contain_exactly(/\/unmanaged_1/, /\/unmanaged_symlink_file/, /\/subdir_unmanaged_1/, /\/ignored_1/,
+                               /\/subdir_allowlisted_2/, /\/unmanaged_symlink_dir/)
         end
 
         it 'does not collect contents that match recursive globbed exclusion items as intermediate values' do
@@ -162,7 +172,7 @@ RSpec.describe R10K::Util::Purgeable do
           expect(subject.logger).not_to receive(:debug).with(/ignored_1/)
 
           expect(subject.stale_contents(recurse, recursive_exclusions, whitelist)).
-            to contain_exactly(/\/unmanaged_2/, /\/managed_one\/unmanaged_1/)
+            to contain_exactly(/\/unmanaged_2/, /\/unmanaged_symlink_file/, /\/managed_one\/unmanaged_1/)
         end
       end
     end
@@ -199,6 +209,7 @@ RSpec.describe R10K::Util::Purgeable do
         it 'does not purge items matching glob at root level' do
           allow(FileUtils).to receive(:rm_r)
           expect(FileUtils).to_not receive(:rm_r).with(/\/unmanaged_[12]/, anything)
+          expect(FileUtils).to_not receive(:rm_r).with(/\/unmanaged_symlink_file/, anything)
           expect(subject.logger).to receive(:debug).with(/whitelist match/i).at_least(:once)
 
           subject.purge!(purge_opts)
@@ -209,7 +220,7 @@ RSpec.describe R10K::Util::Purgeable do
     context "recursive whitelist glob" do
       let(:whitelist) do
         managed_directories.flat_map do |dir|
-          [File.join(dir, "**", "*unmanaged*"), File.join(dir, "**", "managed_subdir_2")]
+          [File.join(dir, "**", "*unmanaged*"), File.join(dir, "**", "subdir_allowlisted_2")]
         end
       end
       let(:purge_opts) { { recurse: true, whitelist: whitelist } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.14.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +198,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 description: |2
       R10K provides a general purpose toolset for deploying Puppet environments and modules.
       It implements the Puppetfile format and provides a native implementation of Puppet
@@ -370,7 +370,9 @@ files:
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/name.rb
+- lib/r10k/environment/plain.rb
 - lib/r10k/environment/svn.rb
+- lib/r10k/environment/tarball.rb
 - lib/r10k/environment/with_modules.rb
 - lib/r10k/errors.rb
 - lib/r10k/errors/formatting.rb
@@ -409,6 +411,7 @@ files:
 - lib/r10k/module/local.rb
 - lib/r10k/module/metadata_file.rb
 - lib/r10k/module/svn.rb
+- lib/r10k/module/tarball.rb
 - lib/r10k/module_loader/puppetfile.rb
 - lib/r10k/module_loader/puppetfile/dsl.rb
 - lib/r10k/puppetfile.rb
@@ -433,10 +436,13 @@ files:
 - lib/r10k/svn.rb
 - lib/r10k/svn/remote.rb
 - lib/r10k/svn/working_dir.rb
+- lib/r10k/tarball.rb
 - lib/r10k/util/attempt.rb
 - lib/r10k/util/basedir.rb
+- lib/r10k/util/cacheable.rb
 - lib/r10k/util/cleaner.rb
 - lib/r10k/util/commands.rb
+- lib/r10k/util/downloader.rb
 - lib/r10k/util/exec_env.rb
 - lib/r10k/util/license.rb
 - lib/r10k/util/platform.rb
@@ -461,12 +467,14 @@ files:
 - spec/fixtures/module/forge/bad_module/metadata.json
 - spec/fixtures/module/forge/eight_hundred/Modulefile
 - spec/fixtures/module/forge/eight_hundred/metadata.json
+- spec/fixtures/tarball/tarball.tar.gz
 - spec/fixtures/unit/action/r10k.yaml
 - spec/fixtures/unit/action/r10k_cachedir.yaml
 - spec/fixtures/unit/action/r10k_creds.yaml
 - spec/fixtures/unit/action/r10k_forge_auth.yaml
 - spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml
 - spec/fixtures/unit/action/r10k_generate_types.yaml
+- spec/fixtures/unit/action/r10k_logging.yaml
 - spec/fixtures/unit/action/r10k_puppet_path.yaml
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
 - spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
@@ -479,22 +487,34 @@ files:
 - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
+- spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep
 - spec/fixtures/unit/util/purgeable/managed_one/expected_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_subdir_2/ignored_1
+- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
+- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
+- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir
+- spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
 - spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
+- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
 - spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3
 - spec/fixtures/unit/util/purgeable/managed_two/expected_2
 - spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2
 - spec/fixtures/unit/util/subprocess/runner/no-execute.sh
 - spec/integration/git/rugged/bare_repository_spec.rb
+- spec/integration/git/rugged/cache_spec.rb
 - spec/integration/git/rugged/thin_repository_spec.rb
 - spec/integration/git/rugged/working_repository_spec.rb
 - spec/integration/git/shellgit/bare_repository_spec.rb
 - spec/integration/git/shellgit/thin_repository_spec.rb
 - spec/integration/git/shellgit/working_repository_spec.rb
 - spec/integration/git/stateful_repository_spec.rb
+- spec/integration/util/purageable_spec.rb
 - spec/matchers/exit_with.rb
 - spec/matchers/match_realpath.rb
 - spec/r10k-mocks.rb
@@ -502,6 +522,7 @@ files:
 - spec/r10k-mocks/mock_env.rb
 - spec/r10k-mocks/mock_source.rb
 - spec/shared-contexts/git-fixtures.rb
+- spec/shared-contexts/tarball.rb
 - spec/shared-examples/deploy-actions.rb
 - spec/shared-examples/git-repository.rb
 - spec/shared-examples/git/bare_repository.rb
@@ -525,10 +546,13 @@ files:
 - spec/unit/cli_spec.rb
 - spec/unit/deployment/config_spec.rb
 - spec/unit/deployment_spec.rb
+- spec/unit/environment/bare_spec.rb
 - spec/unit/environment/base_spec.rb
 - spec/unit/environment/git_spec.rb
 - spec/unit/environment/name_spec.rb
+- spec/unit/environment/plain_spec.rb
 - spec/unit/environment/svn_spec.rb
+- spec/unit/environment/tarball_spec.rb
 - spec/unit/environment/with_modules_spec.rb
 - spec/unit/errors/formatting_spec.rb
 - spec/unit/feature_spec.rb
@@ -550,6 +574,7 @@ files:
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_file_spec.rb
 - spec/unit/module/svn_spec.rb
+- spec/unit/module/tarball_spec.rb
 - spec/unit/module_loader/puppetfile_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/puppetfile_spec.rb
@@ -571,8 +596,11 @@ files:
 - spec/unit/source_spec.rb
 - spec/unit/svn/remote_spec.rb
 - spec/unit/svn/working_dir_spec.rb
+- spec/unit/tarball_spec.rb
 - spec/unit/util/attempt_spec.rb
+- spec/unit/util/cacheable_spec.rb
 - spec/unit/util/commands_spec.rb
+- spec/unit/util/downloader_spec.rb
 - spec/unit/util/exec_env_spec.rb
 - spec/unit/util/purgeable_spec.rb
 - spec/unit/util/setopts_spec.rb