r10k 3.9.0 → 3.10.0

data/spec/unit/settings_spec.rb

@@ -250,8 +250,12 @@ describe R10K::Settings do
 
     describe "forge settings" do
       it "passes settings through to the forge settings" do
-        output = subject.evaluate("forge" => {"baseurl" => "https://forge.tessier-ashpool.freeside", "proxy" => "https://proxy.tessier-ashpool.freesize:3128"})
-        expect(output[:forge]).to eq(:baseurl => "https://forge.tessier-ashpool.freeside", :proxy => "https://proxy.tessier-ashpool.freesize:3128")
+        output = subject.evaluate("forge" => {"baseurl" => "https://forge.tessier-ashpool.freeside",
+                                              "proxy" => "https://proxy.tessier-ashpool.freesize:3128",
+                                              "authorization_token" => "faketoken"})
+        expect(output[:forge]).to eq(:baseurl => "https://forge.tessier-ashpool.freeside",
+                                     :proxy => "https://proxy.tessier-ashpool.freesize:3128",
+                                     :authorization_token => "faketoken")
       end
     end
   end

data/spec/unit/util/purgeable_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'r10k/util/purgeable'
+require 'r10k/util/cleaner'
 
 RSpec.describe R10K::Util::Purgeable do
   let(:managed_directories) do
@@ -18,17 +19,11 @@ RSpec.describe R10K::Util::Purgeable do
       'spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_new_1',
       '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',
     ]
   end
 
-  let(:test_class) do
-    Struct.new(:managed_directories, :desired_contents) do
-      include R10K::Util::Purgeable
-      include R10K::Logging
-    end
-  end
-
-  subject { test_class.new(managed_directories, desired_contents) }
+  subject { R10K::Util::Cleaner.new(managed_directories, desired_contents) }
 
   context 'without recurse option' do
     let(:recurse) { false }
@@ -104,7 +99,13 @@ RSpec.describe R10K::Util::Purgeable do
 
     describe '#current_contents' do
       it 'collects contents of all managed directories recursively' do
-        expect(subject.current_contents(recurse)).to contain_exactly(/\/expected_1/, /\/expected_2/, /\/unmanaged_1/, /\/unmanaged_2/, /\/managed_subdir_1/, /\/subdir_expected_1/, /\/subdir_unmanaged_1/)
+        expect(subject.current_contents(recurse)).
+          to contain_exactly(/\/expected_1/, /\/expected_2/,
+                             /\/unmanaged_1/, /\/unmanaged_2/,
+                             /\/managed_subdir_1/,
+                             /\/subdir_expected_1/, /\/subdir_unmanaged_1/,
+                             /\/managed_subdir_2/, /\/ignored_1/,
+                             /\/\.hidden/)
       end
     end
 
@@ -120,7 +121,8 @@ RSpec.describe R10K::Util::Purgeable do
         let(:whitelist) { [] }
 
         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/)
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).
+            to contain_exactly(/\/unmanaged_1/, /\/unmanaged_2/, /\/subdir_unmanaged_1/, /\/ignored_1/)
         end
       end
 
@@ -130,7 +132,17 @@ 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/, /\/subdir_unmanaged_1/)
+
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).
+            to contain_exactly(/\/unmanaged_2/, /\/subdir_unmanaged_1/, /\/ignored_1/)
+        end
+
+        it 'does not collect contents that match recursive globbed whitelist items as intermediate values' do
+          recursive_whitelist = ['**/managed_subdir_1/**/*']
+          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/)
         end
       end
 
@@ -140,7 +152,17 @@ 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/, /\/subdir_unmanaged_1/)
+
+          expect(subject.stale_contents(recurse, exclusions, whitelist)).
+            to contain_exactly(/\/unmanaged_1/, /\/subdir_unmanaged_1/, /\/ignored_1/)
+        end
+
+        it 'does not collect contents that match recursive globbed exclusion items as intermediate values' do
+          recursive_exclusions = ['**/managed_subdir_1/**/*']
+          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/)
         end
       end
     end
@@ -185,7 +207,11 @@ RSpec.describe R10K::Util::Purgeable do
     end
 
     context "recursive whitelist glob" do
-      let(:whitelist) { managed_directories.collect { |dir| File.join(dir, "**", "*unmanaged*") } }
+      let(:whitelist) do
+        managed_directories.flat_map do |dir|
+          [File.join(dir, "**", "*unmanaged*"), File.join(dir, "**", "managed_subdir_2")]
+        end
+      end
       let(:purge_opts) { { recurse: true, whitelist: whitelist } }
 
       describe '#purge!' do
@@ -220,7 +246,7 @@ RSpec.describe R10K::Util::Purgeable do
     context "when class does not implement #purge_exclusions" do
       describe '#purge!' do
         it 'purges normally' do
-          expect(FileUtils).to receive(:rm_r).at_least(3).times
+          expect(FileUtils).to receive(:rm_r).at_least(4).times
 
           subject.purge!(purge_opts)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -199,6 +199,7 @@ files:
 - ".github/workflows/docker.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/rspec_tests.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -346,6 +347,7 @@ files:
 - lib/r10k/cli/help.rb
 - lib/r10k/cli/puppetfile.rb
 - lib/r10k/cli/version.rb
+- lib/r10k/content_synchronizer.rb
 - lib/r10k/deployment.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/environment.rb
@@ -391,6 +393,8 @@ files:
 - lib/r10k/module/local.rb
 - lib/r10k/module/metadata_file.rb
 - lib/r10k/module/svn.rb
+- lib/r10k/module_loader/puppetfile.rb
+- lib/r10k/module_loader/puppetfile/dsl.rb
 - lib/r10k/puppetfile.rb
 - lib/r10k/settings.rb
 - lib/r10k/settings/collection.rb
@@ -415,6 +419,7 @@ files:
 - lib/r10k/svn/working_dir.rb
 - lib/r10k/util/attempt.rb
 - lib/r10k/util/basedir.rb
+- lib/r10k/util/cleaner.rb
 - lib/r10k/util/commands.rb
 - lib/r10k/util/exec_env.rb
 - lib/r10k/util/license.rb
@@ -443,6 +448,8 @@ files:
 - 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_puppet_path.yaml
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
@@ -454,9 +461,11 @@ files:
 - spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
 - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
 - 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/subdir_expected_1
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
 - spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
+- 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
@@ -522,6 +531,7 @@ files:
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_file_spec.rb
 - spec/unit/module/svn_spec.rb
+- spec/unit/module_loader/puppetfile_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/puppetfile_spec.rb
 - spec/unit/settings/collection_spec.rb