r10k 4.0.0.pre → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8209d4d067f8bfb87d3ea39cd66402d17b1b72a9c7ef6047f22ca9b7d2dd7114
-  data.tar.gz: b742aed73430365dec9d82a5007d1d1bef130b932307c2128d1cb08d789735cc
+  metadata.gz: e3243dd00fc7260b6cbbb51f070418886dfd76ad16befc18d0511185d17d4fae
+  data.tar.gz: dc8dcfe9644c9dabfd4532cc8b5a91064d57a5c8377fb38932aaf0aab1d0d6ef
 SHA512:
-  metadata.gz: 7c77bbce995d3f69fa1fa2c67bdb1db79c4bcda6f783a365ca7a06d6d3e873e661bdadb9cd4c5637fe8010b92c1081aab7fb93b5ee725aa74339dab70e110039
-  data.tar.gz: 3c694c48a648ca097662568efe27b228ca99610a0f7f6b5f3858459bbc41a0fd805b1a2d9bde707a724c9473327f35ea5c4409f0c71749ce4b26175ec5819f40
+  metadata.gz: 22a3158bc9c7c65caf1c437d9d855c4586c14ac836730121826d1eaaa326e4237e74675818fb6e71430523b416f318e9f757106fba9b8c3e83b6cfbe2a2144e3
+  data.tar.gz: 3d51941a78ec8e651c4657222a5f7f27b169b5b3811d472948c55f5b00e47244b2807aa6037182241a5c9b14a8df43748102d787e0218a2d8bacf2d17ae32fd9

data/.github/workflows/rspec_tests.yml

@@ -3,7 +3,8 @@ name: Rspec tests
 on:
   pull_request:
     branches:
-      - 4.x
+      - main
+      - 3.x
 
 jobs:
   rspec_tests:
@@ -16,8 +17,9 @@ jobs:
           - {os: ubuntu-latest, ruby: 3.1}
           - {os: ubuntu-latest, ruby: 3.2}
           - {os: ubuntu-latest, ruby: jruby-9.3}
-          - {os: windows-2019, ruby: 2.6}
-          - {os: windows-2019, ruby: 2.7}
+          - {os: ubuntu-latest, ruby: jruby-9.4}
+          - {os: windows-latest, ruby: 2.6}
+          - {os: windows-latest, ruby: 3.2}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

data/CHANGELOG.mkd

@@ -3,9 +3,17 @@ CHANGELOG
 
 Unreleased
 ----------
-- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
 
-- Drop Ruby 2.3/2.4/2.5 support; puppet_forge: Use 4.1 and newer [#1336](https://github.com/puppetlabs/r10k/pull/1336)
+
+4.0.0
+-----
+- Drop Ruby 2.3/2.4/2.5 support; use puppet_forge 4.1 or newer [#1336](https://github.com/puppetlabs/r10k/pull/1336)
+- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261)
+- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277)
+- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275)
+- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261)
+- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254)
+- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
 
 
 3.16.0
@@ -33,14 +41,6 @@ Unreleased
 - 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)
 
-- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277)
-- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275)
-- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261)
-- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261)
-- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254)
-- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
-- Drop EoL Ruby 2.3/2.4 support [#1280](https://github.com/puppetlabs/r10k/pull/1208)
-
 3.15.0
 ------
 

data/Gemfile

@@ -6,7 +6,7 @@ group :extra do
 end
 
 group :development do
-  gem 'simplecov', '~> 0.17.1'
+  gem 'simplecov', '~> 0.22.0'
   gem 'ruby-prof', :platforms => :ruby
 end
 

data/doc/common-patterns.mkd

@@ -12,8 +12,7 @@ Use a [Control Repo](https://docs.puppet.com/pe/latest/cmgmt_control_repo.html)
 to store your `Puppetfile`.
 
 Hiera data should be in the Control repo OR as a separate source in
-`r10k.yaml`. Any `hiera.yaml` in the Control repo will be ignored on a per
-environment basis, locating it at `/etc/puppetlabs/puppet/hiera.yaml` is prefered.
+`r10k.yaml`.
 
 Each puppet module should be contained in its own independent forge module or
 repository.

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.0.pre'
+  VERSION = '4.0.0'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-289-g2f5deb72\n"
+"Project-Id-Version: r10k 3.9.3-373-g117587fb\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2023-06-27 17:39+0000\n"
-"PO-Revision-Date: 2023-06-27 17:39+0000\n"
+"POT-Creation-Date: 2023-07-26 22:34+0000\n"
+"PO-Revision-Date: 2023-07-26 22:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,47 +31,47 @@ msgstr ""
 msgid "Reason: %{write_lock}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:116
+#: ../lib/r10k/action/deploy/environment.rb:99
 msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:136
+#: ../lib/r10k/action/deploy/environment.rb:119
 msgid "Executing postrun command."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:150
+#: ../lib/r10k/action/deploy/environment.rb:133
 msgid "Environment %{env_dir} does not match environment name filter, skipping"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:158
+#: ../lib/r10k/action/deploy/environment.rb:141
 msgid "Deploying environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:161
+#: ../lib/r10k/action/deploy/environment.rb:144
 msgid "Environment %{env_dir} is now at %{env_signature}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:165
+#: ../lib/r10k/action/deploy/environment.rb:148
 msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:81
+#: ../lib/r10k/action/deploy/module.rb:82
 msgid "Running postrun command for environments: %{envs_to_run}."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:91
+#: ../lib/r10k/action/deploy/module.rb:92
 msgid "No environments were modified, not executing postrun command."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:103
+#: ../lib/r10k/action/deploy/module.rb:104
 msgid "Only updating modules in environment(s) %{opt_env} skipping environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:105
+#: ../lib/r10k/action/deploy/module.rb:106
 msgid "Updating modules %{modules} in environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/check.rb:18
+#: ../lib/r10k/action/puppetfile/check.rb:25
 msgid "Syntax OK"
 msgstr ""
 
@@ -111,10 +111,6 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/bare.rb:6
-msgid "\"bare\" environment type is deprecated; please use \"plain\" instead (environment: %{name})"
-msgstr ""
-
 #: ../lib/r10k/environment/base.rb:89 ../lib/r10k/environment/base.rb:105 ../lib/r10k/environment/base.rb:114 ../lib/r10k/source/base.rb:83
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
@@ -327,7 +323,7 @@ msgstr ""
 msgid "Fetching remote '%{remote}' at %{path}"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/working_repository.rb:129 ../lib/r10k/git/shellgit/working_repository.rb:101
+#: ../lib/r10k/git/rugged/working_repository.rb:131 ../lib/r10k/git/shellgit/working_repository.rb:101
 msgid "Found local modifications in %{file_path}"
 msgstr ""
 
@@ -407,7 +403,7 @@ msgstr ""
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:79
+#: ../lib/r10k/module/git.rb:78
 msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
 
@@ -443,19 +439,15 @@ msgstr ""
 msgid "Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:181
-msgid "\"basedir\" is deprecated. Please use \"environment_name\" instead. \"basedir\" will be removed in a future version."
-msgstr ""
-
-#: ../lib/r10k/module_loader/puppetfile.rb:200 ../lib/r10k/puppetfile.rb:104
+#: ../lib/r10k/module_loader/puppetfile.rb:193 ../lib/r10k/puppetfile.rb:104
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:242
+#: ../lib/r10k/module_loader/puppetfile.rb:235
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:244
+#: ../lib/r10k/module_loader/puppetfile.rb:237
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 

data/r10k.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'puppet_forge', '>= 4.1', '< 6'
 
-  s.add_dependency 'gettext-setup', '~>0.24'
+  s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
 
   s.add_dependency 'jwt', '>= 2.2.3', '< 2.8.0'
   s.add_dependency 'minitar', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre
+  version: 4.0.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -90,16 +90,22 @@ dependencies:
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.24'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.24'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -436,9 +442,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: