r10k 3.15.2 → 3.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8f47b9b316994e718214a6f92e25b7dcd6f9e402e73ddee076920ac65b8317
-  data.tar.gz: '03847035922476e3fc27030c231cbb362ceac63387c4d300443a401eca298f16'
+  metadata.gz: 2300d770bc6d49649bacd705ec99dfb416ac7ab7ca2a0b59246ba12623622253
+  data.tar.gz: bf8e2b45aa052d46b8abe55cc8e1364e48aa4d9f70621280ec7d114c94f1a95e
 SHA512:
-  metadata.gz: db1c6069ec189325027ee5e4015d1b659afc410f5840daacc7d21b724288c1d9e86c2e55792760d8b13ef981794d18c25db9977a5e56002898de005ca6a54b55
-  data.tar.gz: c3d8dca548fb0e57eba9b9a2df5a37c74d4ebdb74f224e9c03f8ee112f3708c8cc4b9630cfe671c944f30089052d5c4275c5e2a44df3ed015b59e3c710b7b40f
+  metadata.gz: 7544a56bf9f5e135b899c95dca1f7dc12ecd0aefa006ccc847a5407dd10d53945d5a58b16220d6fe228a596c853323b7c49da05e530ddf49388759bc7b88309e
+  data.tar.gz: 394171c0c00105467c9a23af8444f36935f2042c1f67c1359fa36c3e856dbcdea50f1440a4a8593339314d6783c673994728a1150547e4c4f4faeb2253107300

data/.github/workflows/rspec_tests.yml

@@ -33,7 +33,8 @@ jobs:
 
       - name: Install bundler and gems
         run: |
-          gem install bundler
+          # Pin bundler to maintain support for Ruby 2.4 and 2.5
+          gem install bundler -v 2.3.26
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 

data/CHANGELOG.mkd

@@ -4,6 +4,15 @@ CHANGELOG
 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)

data/README.mkd

@@ -5,11 +5,10 @@ Puppet environment and module deployment
 
 [![Build Status](https://travis-ci.org/puppetlabs/r10k.png?branch=master)](https://travis-ci.org/puppetlabs/r10k)
 
-> R10k is supported and maintained by Puppet, but we consider it to be feature complete
-> and  currently have no plans for future feature development. We will keep it working
-> with current code deployment standards and the Ruby ecosystem that ships with the
-> puppet-agent package, but any new feature development will come from peer-reviewed
-> community contributions, with the onus on the contributor and community for validation.
+> R10k is supported and maintained by Puppet, but we consider it to be feature
+> complete and currently have no plans for any new development. We will keep it
+> working within the context of Puppet Enterprise, but we cannot make any other
+> maintenance promises at this time.
 
 
 Description
@@ -121,24 +120,13 @@ To release a new version of the r10k gem, ensure the [changelog](CHANGELOG.mkd)
 
 By default, a patch (Z) release will be triggered. To release a new major (X) or minor (Y) version, include `#major` or `#minor` (respectively) in your commit message to trigger the appropriate release.
 
-NOTE: This currently only works for the default branch. If you would like to release from a different branch, please contact the [CODEOWNERS](CODEOWNERS).
-
 Getting help
 ------------
 
-  * IRC: r10k has a dedicated channel, `#r10k`, on Freenode where r10k questions
-  can be directed. Questions about r10k can frequently be asked in `#puppet` as well.
+  * [Puppet Community Slack](https://puppetcommunity.slack.com/)
   * Mailing lists: [puppet-users](https://groups.google.com/forum/#!forum/puppet-users)
   * Q&A: [Puppet Ask](https://ask.puppetlabs.com/questions/)
 
-Contributors
-------------
-
-Please see the CHANGELOG for a listing of the (very awesome) contributors.
-
 ## Maintenance
 
-See [CODEOWNERS](CODEOWNERS) for active repo maintainers.
-
-Open [issues](https://github.com/puppetlabs/r10k/issues) directly in the r10k repo.
-
+See [CODEOWNERS](CODEOWNERS) for current project owners.

data/integration/tests/git_source/git_source_submodule.rb

@@ -44,7 +44,7 @@ scp_to(master, helloworld_module_path, File.join(git_clone_module_path, 'hellowo
 git_add_commit_push(master, 'master', 'Add module.', git_clone_module_path)
 
 step 'Add "helloworld" Module Git Repo as Submodule'
-on(master, "cd #{git_environments_path};git submodule add file://#{git_repo_module_path} dist")
+on(master, "cd #{git_environments_path};git -c protocol.file.allow=always submodule add file://#{git_repo_module_path} dist")
 
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

data/lib/r10k/git/shellgit/working_repository.rb

@@ -94,7 +94,7 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
     result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
 
     if result.exit_code != 0
-      dirty_files = result.stdout.split('\n')
+      dirty_files = result.stdout.split("\n")
       dirty_files.delete_if { |f| f.start_with?('spec/') } if exclude_spec
 
       dirty_files.each do |file|

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 = '3.15.2'
+  VERSION = '3.15.4'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-208-gb88bb368\n"
+"Project-Id-Version: r10k 3.9.3-265-gcb0a3463\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2022-02-07 21:13+0000\n"
-"PO-Revision-Date: 2022-02-07 21:13+0000\n"
+"POT-Creation-Date: 2022-12-08 22:58+0000\n"
+"PO-Revision-Date: 2022-12-08 22:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -123,10 +123,6 @@ msgstr ""
 msgid "Environment and %{src} both define the \"%{name}\" module"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:61
-msgid "#{msg_error}. The %{src} definition will be ignored"
-msgstr ""
-
 #: ../lib/r10k/environment/with_modules.rb:71
 msgid "Unexpected value for `module_conflicts` setting in %{env} environment: %{val}"
 msgstr ""
@@ -303,26 +299,10 @@ msgstr ""
 msgid "Using Github App id %{app_id} with SSL key from %{key_path}"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/credentials.rb:178
-msgid ""
-"Unexpected response code: #{get_response.code}\n"
-"Response body: #{get_response.body}"
-msgstr ""
-
 #: ../lib/r10k/git/rugged/credentials.rb:179
 msgid "Error using private key to get Github App access token from url"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/credentials.rb:194
-msgid ""
-"Unexpected response code: #{post_response.code}\n"
-"Response body: #{post_response.body}"
-msgstr ""
-
-#: ../lib/r10k/git/rugged/credentials.rb:195
-msgid "Error using private key to generate access token from #{access_token_url}"
-msgstr ""
-
 #: ../lib/r10k/git/rugged/credentials.rb:200
 msgid "Github App token contains invalid characters."
 msgstr ""
@@ -331,7 +311,7 @@ msgstr ""
 msgid "Github App token generated, expires at: %{expire}"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/thin_repository.rb:85 ../lib/r10k/git/shellgit/thin_repository.rb:65
+#: ../lib/r10k/git/rugged/thin_repository.rb:92 ../lib/r10k/git/shellgit/thin_repository.rb:69
 msgid "Updated repo %{path} to include alternate object db path %{objects_dir}"
 msgstr ""
 
@@ -343,7 +323,7 @@ msgstr ""
 msgid "Fetching remote '%{remote}' at %{path}"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/working_repository.rb:125 ../lib/r10k/git/shellgit/working_repository.rb:100
+#: ../lib/r10k/git/rugged/working_repository.rb:129 ../lib/r10k/git/shellgit/working_repository.rb:101
 msgid "Found local modifications in %{file_path}"
 msgstr ""
 
@@ -395,22 +375,6 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:66
-msgid "Overriding :exclude_spec setting with per module setting for #{@title}"
-msgstr ""
-
-#: ../lib/r10k/module/base.rb:87
-msgid "Spec dir for #{@title} will not be deleted because it is not in the moduledir"
-msgstr ""
-
-#: ../lib/r10k/module/base.rb:99
-msgid "Deleting spec data at #{spec_path}"
-msgstr ""
-
-#: ../lib/r10k/module/base.rb:107
-msgid "No spec dir detected at #{spec_path}, skipping deletion"
-msgstr ""
-
 #: ../lib/r10k/module/base.rb:120
 msgid "Deploying module to %{path}"
 msgstr ""
@@ -439,10 +403,6 @@ msgstr ""
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:205
-msgid "Forge module names must match 'owner/modulename', instead got #{title}"
-msgstr ""
-
 #: ../lib/r10k/module/git.rb:79
 msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
@@ -455,43 +415,43 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:64
+#: ../lib/r10k/module_loader/puppetfile.rb:68
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:65
+#: ../lib/r10k/module_loader/puppetfile.rb:69
 msgid "Using moduledir '%{moduledir}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:86
+#: ../lib/r10k/module_loader/puppetfile.rb:91
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:103
+#: ../lib/r10k/module_loader/puppetfile.rb:108
 msgid "Unable to preload Puppetfile because of %{msg}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:121
+#: ../lib/r10k/module_loader/puppetfile.rb:126
 msgid "Using Forge from Puppetfile: %{forge}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:124
+#: ../lib/r10k/module_loader/puppetfile.rb:129
 msgid "Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:173
+#: ../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:192 ../lib/r10k/puppetfile.rb:104
+#: ../lib/r10k/module_loader/puppetfile.rb:200 ../lib/r10k/puppetfile.rb:104
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:230
+#: ../lib/r10k/module_loader/puppetfile.rb:242
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:232
+#: ../lib/r10k/module_loader/puppetfile.rb:244
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 
@@ -507,7 +467,7 @@ msgstr ""
 msgid "Validation failed for settings group"
 msgstr ""
 
-#: ../lib/r10k/settings/container.rb:91
+#: ../lib/r10k/settings/container.rb:92
 msgid "Key %{key} is not a valid key"
 msgstr ""
 
@@ -551,10 +511,6 @@ msgstr ""
 msgid "Couldn't load config file: %{error_msg}"
 msgstr ""
 
-#: ../lib/r10k/settings/loader.rb:73
-msgid "File exists at #{path} but doesn't contain any YAML"
-msgstr ""
-
 #: ../lib/r10k/settings/uri_definition.rb:12
 msgid "Setting %{name} requires a URL but '%{value}' could not be parsed as a URL"
 msgstr ""

data/r10k.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge', '>= 2.3.0'
+  s.add_dependency 'puppet_forge', ['>= 2.3.0', '< 4.0.0']
 
-  s.add_dependency 'gettext-setup', '~>0.24'
+  s.add_dependency 'gettext-setup', ['>=0.24', '< 2.0.0']
   s.add_dependency 'fast_gettext', ['>= 1.1.0', '< 3.0.0']
   s.add_dependency 'gettext', ['>= 3.0.2', '< 4.0.0']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.4
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,20 +83,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.24'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.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.0
 - !ruby/object:Gem::Dependency
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement