r10k 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d094f24e1da891308bda6d4589351f1c2e1ba16b1efd8c97c5611414df0ee8
-  data.tar.gz: eaa7e2f7843cbb445a4619fdd30c923a289838a5884c07a19c4da4f2f5912293
+  metadata.gz: 92e0f24af6c95c877f99c222382ee64cebc7ef588e054e4f63104b5d7a13c7fa
+  data.tar.gz: f9798d8056373adcbd3810e1e1c147496b0cf651a61c8c1fdf0b6df5f429e63f
 SHA512:
-  metadata.gz: afa0f4daefb75c0b8c954b27b94a53f634616d7339e18d55f96ad19b26b3e486feee0b8bf41ee2801b516451412b0d5ea8d7a81444adb03909b364b243cca121
-  data.tar.gz: b49551e056b22522ffc8c7778559059830aec6278cec7b37e7f4fc990be57f547a2922306e79a3b24f9bf5d8b887d8cb6c75bafcd357bb632a04ca6d8683ea14
+  metadata.gz: 04c0b9f93fd3fa51f995148fc53d335889e564e52f1bfa8ab746f4fccd71f9165ab40cb62f402c437b11d956890457b3fd59fd05cb86eac3971e7e24c153bfd0
+  data.tar.gz: bc206f67eee547bf511737f90343cf6f684e5700a6f9326cc9a285fe356520c46922dbece4f7e90e5263d1f02c10bc55901381788def071b9260a20dad276d6f

data/CHANGELOG.mkd

@@ -4,6 +4,14 @@ CHANGELOG
 Unreleased
 ----------
 
+4.0.2
+-----
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+- (maint) Update beaker-pe to 3 [#1376](https://github.com/puppetlabs/r10k/pull/1376)
+- (maint) Stop puppet service during tests [#1377](https://github.com/puppetlabs/r10k/pull/1377)
+
 4.0.1
 -----
 
@@ -20,8 +28,15 @@ Unreleased
 - (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
 
 
+3.16.1
+------
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+
 3.16.0
 ------
+
 - Emit more debug output when modules fail to sync [#1347](https://github.com/puppetlabs/r10k/pull/1347)
 - Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
 - Update R10K proxy usage to follow newer rugged best practices [PE-35980](https://tickets.puppet.com/browse/PE-35980)
@@ -29,19 +44,23 @@ Unreleased
 
 3.15.4
 ------
+
 - Pin dependencies to maintain support for old Ruby versions [#1329](https://github.com/puppetlabs/r10k/pull/1329)
 
 3.15.3
 ------
+
 - Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
 - Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)
 
 3.15.2
 ------
+
 - Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
 
 3.15.1
 ------
+
 - Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
 - Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
 

data/CODEOWNERS

@@ -1,2 +1 @@
-# This repo is owned by the dumpling team
-* @puppetlabs/dumpling
+* @puppetlabs/dumpling @puppetlabs/skeletor

data/integration/Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
-gem 'beaker-pe', '~> 2.0'
+gem 'beaker-pe', '~> 3.0'
 gem 'beaker-answers'
 gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
 gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')

data/integration/Rakefile

@@ -69,7 +69,7 @@ rototiller_task :beaker_hostgenerator do |t|
     # This is a hack :(
     t.add_flag(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
 
-    t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+    t.add_flag(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
   end
 end
 

data/integration/pre-suite/00_pe_install.rb

@@ -4,3 +4,6 @@ test_name 'CODEMGMT-20 - C48 - Install Puppet Enterprise'
 
 step 'Install PE'
 install_pe
+
+step 'Stop puppet service to avoid running into existing agent runs'
+on(hosts, puppet('resource service puppet ensure=stopped'))

data/lib/r10k/module_loader/puppetfile.rb

@@ -104,8 +104,11 @@ module R10K
         @existing_module_versions_by_name = @existing_module_metadata.map {|mod| [ mod.name, mod.version ] }.to_h
         empty_load_output.merge(modules: @existing_module_metadata)
 
-      rescue SyntaxError, LoadError, ArgumentError, NameError => e
+      rescue ScriptError, StandardError => e
         logger.warn _("Unable to preload Puppetfile because of %{msg}" % { msg: e.message })
+
+        @existing_module_metadata = []
+        @existing_module_versions_by_name = {}
       end
 
       def add_module_metadata(name, info)

data/lib/r10k/version.rb

@@ -2,5 +2,5 @@ module R10K
   # When updating to a new major (X) or minor (Y) version, include `#major` or
   # `#minor` (respectively) in your commit message to trigger the appropriate
   # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2