r10k 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030acd30658f5b8fdf89d1c18512defc7273e39545066e66bc9cd3cd0c16294d
-  data.tar.gz: 1548b9b6d4ce6f136eee88c5504fbcdc781fce4fee5ce847097d8f0a9b18e849
+  metadata.gz: 9a0847e57e56c69ecd6983bbe2f5c73b82a4a2ef81c507b1920549ca18fac27f
+  data.tar.gz: a2aba2cf1697aaa3acbeb098392c2caaabdbf7e9007b072aecf2ad70ba9dd2aa
 SHA512:
-  metadata.gz: be34df44f090809213bb34ca283172c41825f4ccd9b9e50568021d12df30b6c659e87e523e8e2cb1ee8ae0a5acbca806e5e26c8693b3b13adeb00a5912f446d7
-  data.tar.gz: 8ce2f367c6f2367f7bfabc89a9f60e69ac983e4a6b1b142de56be5f137d43f592a51297bd1b507b8b33f6acee399a9280f5ad8dd770753e3747a5e7ba02ed6d9
+  metadata.gz: b05b0aa7c3aa2606e5a8c5637820da64c4fc01f9211314c4f0c39a3f9d2095ff95c83fb0cd46c88579203ddc68d1559a4c45073eb8be9070fbddc4371de0d8cd
+  data.tar.gz: 10e697e58297c7e13b066ad492c386847cccc1311c07718d842e39e679cbc5a1b2db3bdfa2bb941f0640368acb8d9794508eb8bb3279ce393b3ca3e44a0240cb

data/.github/workflows/docker.yml

@@ -22,10 +22,10 @@ jobs:
         with: # This doesn't seem to work unless we point directly to the secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby 3.1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: 3.1
       - run: gem install bundler
       - uses: actions/checkout@v3
       - name: Set up QEMU

data/.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - 3.x
     paths:
       - 'lib/r10k/version.rb'
 
@@ -15,7 +16,7 @@ jobs:
         with:
           fetch-depth: '0'
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@1.67.0
+        uses: anothrNick/github-tag-action@1.71.0
         env:
           GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
           DEFAULT_BUMP: patch

data/.github/workflows/rspec_tests.yml

@@ -12,14 +12,12 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-latest, ruby: 2.6}
-          - {os: ubuntu-latest, ruby: 2.7}
           - {os: ubuntu-latest, ruby: 3.1}
           - {os: ubuntu-latest, ruby: 3.2}
-          - {os: ubuntu-latest, ruby: jruby-9.3}
+          - {os: ubuntu-latest, ruby: 3.3}
           - {os: ubuntu-latest, ruby: jruby-9.4}
-          - {os: windows-latest, ruby: 2.6}
           - {os: windows-latest, ruby: 3.2}
+          - {os: windows-latest, ruby: 3.3}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

data/CHANGELOG.mkd

@@ -4,6 +4,16 @@ CHANGELOG
 Unreleased
 ----------
 
+5.0.0
+-----
+
+- Add Ruby 3.3 to CI [#1403](https://github.com/puppetlabs/r10k/pull/1403)
+- Require Ruby 3.1 [#1402](https://github.com/puppetlabs/r10k/pull/1402)
+- Replace deprecated action: actions/setup-ruby->ruby/setup-ruby [#1406](https://github.com/puppetlabs/r10k/pull/1406)
+- Ensure git repositories are pruned on fetch [#1410](https://github.com/puppetlabs/r10k/pull/1410)
+- Limit Rugged Control Repo refspec to only clone refs/heads [#1412](https://github.com/puppetlabs/r10k/pull/1412)
+- Allow librarian exclusion declaration as a noop
+
 4.1.0
 -----
 
@@ -33,6 +43,10 @@ Unreleased
 - (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.2
+------
+
+- r10k::module::git: expose remote as getter  [#1379](https://github.com/puppetlabs/r10k/pull/1379)
 
 3.16.1
 ------

data/integration/Gemfile

@@ -10,10 +10,9 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
+gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.40')
 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')
-gem 'rototiller', '= 0.1.0'
+gem 'rototiller', '= 1.0'
 gem 'beaker-qa-i18n'

data/integration/Rakefile

@@ -20,24 +20,6 @@ end
 desc 'The acceptance tests for r10k, run in the beaker framework'
 rototiller_task :beaker => [:beaker_hostgenerator] do |t|
 
-  common_setup = <<-EOS
-pre-suite/00_pe_install.rb,
-component/pre-suite/05_install_dev_r10k.rb,
-pre-suite/10_git_config.rb,
-pre-suite/20_pe_r10k.rb,
-EOS
-  common_setup.gsub!("\n", '')
-
-  flags = [
-      {:name => '--hosts', :default => 'configs/generated', :override_env => 'BEAKER_HOST'},
-      {:name => '--keyfile', :default => "#{ENV['HOME']}/.ssh/id_rsa-acceptance", :override_env => 'BEAKER_KEYFILE'},
-      {:name => '--load-path', :default => 'lib'},
-      {:name => '--pre-suite', :default => @acceptance_pre_suite || common_setup, :override_env => 'BEAKER_PRE_SUITE'},
-      {:name => '--tests', :default => 'tests', :override_env => 'BEAKER_TESTS'},
-      {:name => '--preserve-hosts', :default => 'onfail', :override_env => 'BEAKER_PRESERVE_HOSTS'},
-  ]
-  t.add_flag(*flags)
-
   t.add_env do |env|
     env.name = 'PE_FAMILY'
     env.message = 'The puppet enterprise major branch to install from'
@@ -54,7 +36,62 @@ EOS
     env.message = 'The git provider that r10k should use on a SUT'
   end
 
-  t.add_command({:name => 'beaker --debug', :override_env => 'BEAKER_EXECUTABLE'})
+  t.add_command do |cmd|
+    cmd.name = 'beaker --debug'
+
+    common_setup = <<-EOS
+pre-suite/00_pe_install.rb,
+component/pre-suite/05_install_dev_r10k.rb,
+pre-suite/10_git_config.rb,
+pre-suite/20_pe_r10k.rb,
+EOS
+    common_setup.gsub!("\n", '')
+
+    cmd.add_option do |opt|
+      opt.name = '--hosts'
+      opt.add_argument do |arg|
+        arg.name = 'configs/generated'
+        arg.add_env({name: 'BEAKER_HOST'})
+      end
+    end
+
+    cmd.add_option do |opt|
+      opt.name = '--keyfile'
+      opt.add_argument do |arg|
+        arg.name = "#{ENV['HOME']}/.ssh/id_rsa-acceptance"
+        arg.add_env({name: 'BEAKER_KEYFILE'})
+      end
+    end
+
+    cmd.add_option do |opt|
+      opt.name = '--pre-suite'
+      opt.add_argument do |arg|
+        arg.name = @acceptance_pre_suite || common_setup
+        arg.add_env({name: 'BEAKER_PRE_SUITE'})
+      end
+    end
+
+    cmd.add_option do |opt|
+      opt.name = '--tests'
+      opt.add_argument do |arg|
+        arg.name = 'tests'
+        arg.add_env({name: 'BEAKER_TESTS'})
+      end
+    end
+
+    cmd.add_option do |opt|
+      opt.name = '--preserve-hosts'
+      opt.add_argument do |arg|
+        arg.name = 'onfail'
+        arg.add_env({name: 'BEAKER_PRESERVE_HOSTS'})
+      end
+    end
+
+    cmd.add_option do |opt|
+      opt.name = '--load-path'
+      opt.add_argument({name: 'lib'})
+    end
+  end
 end
 
 desc 'Generate a host configuration used by Beaker'
@@ -64,12 +101,10 @@ rototiller_task :beaker_hostgenerator do |t|
     t.add_command do |c|
       c.name = 'beaker-hostgenerator'
       c.argument = '> configs/generated'
+      c.add_option(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
+      c.add_option(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
     end
 
-    # 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=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
   end
 end
 

data/integration/pre-suite/10_git_config.rb

@@ -36,6 +36,7 @@ step 'Install and Configure Git'
 on(master, puppet('apply'), :stdin => git_manifest, :acceptable_exit_codes => [0,2]) do |result|
   assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
 end
+on(master, 'git config --system --add safe.directory "*"')
 
 step 'Create "production" Environment on Git'
 init_r10k_source_from_prod(master, git_repo_path, git_repo_name, git_environments_path, 'production')

data/lib/r10k/git/rugged/bare_repository.rb

@@ -36,7 +36,7 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
     @_rugged_repo = ::Rugged::Repository.init_at(@path.to_s, true).tap do |repo|
       config = repo.config
       config['remote.origin.url']    = remote
-      config['remote.origin.fetch']  = '+refs/*:refs/*'
+      config['remote.origin.fetch']  = '+refs/heads/*:refs/heads/*'
       config['remote.origin.mirror'] = 'true'
     end
 
@@ -60,7 +60,7 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
     proxy = R10K::Git.get_proxy_for_remote(remote)
 
     options = {:credentials => credentials, :prune => true, :proxy_url => proxy}
-    refspecs = ['+refs/*:refs/*']
+    refspecs = ['+refs/heads/*:refs/heads/*']
 
     results = nil
 

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

@@ -89,7 +89,7 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     remote = remotes[remote_name]
     proxy = R10K::Git.get_proxy_for_remote(remote)
 
-    options = {:credentials => credentials, :proxy_url => proxy}
+    options = {:credentials => credentials, :proxy_url => proxy, :prune => true}
     refspecs = ["+refs/heads/*:refs/remotes/#{remote_name}/*"]
 
     results = nil

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

@@ -31,7 +31,7 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
 
   # Fetch refs from the backing bare Git repository.
   def fetch(remote = 'cache')
-    git ['fetch', remote], :path => @path.to_s
+    git ['fetch', remote, '--prune'], :path => @path.to_s
   end
 
   # @return [String] The origin remote URL

data/lib/r10k/module_loader/puppetfile/dsl.rb

@@ -33,6 +33,10 @@ module R10K
           @librarian.set_moduledir(location)
         end
 
+        def exclusion(name)
+          # noop
+        end
+
         def method_missing(method, *args)
           raise NoMethodError, _("unrecognized declaration '%{method}'") % {method: method}
         end

data/lib/r10k/tarball.rb

@@ -173,7 +173,7 @@ module R10K
     def each_tarball_entry(&block)
       File.open(cache_path, 'rb') do |file|
         Zlib::GzipReader.wrap(file) do |reader|
-          Archive::Tar::Minitar::Input.each_entry(reader) do |entry|
+          Minitar::Input.each_entry(reader) do |entry|
             yield entry
           end
         end

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.1.0'
+  VERSION = '5.0.0'
 end

data/r10k.gemspec

@@ -18,27 +18,21 @@ Gem::Specification.new do |s|
     dynamic environments.
   DESCRIPTION
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.1.0'
 
   s.license  = 'Apache-2.0'
 
-  s.add_dependency 'colored2',   '3.1.2'
+  s.add_dependency 'colored2', '~> 4.0'
   s.add_dependency 'cri', '>= 2.15.10'
-
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
-
-  s.add_dependency 'puppet_forge', '>= 4.1', '< 6'
-
+  s.add_dependency 'puppet_forge', '>= 4.1.0', '< 7'
   s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
-
   s.add_dependency 'jwt', '>= 2.2.3', '< 3'
-  s.add_dependency 'minitar', '~> 0.9'
+  s.add_dependency 'minitar', '>= 0.9', '< 2'
 
   s.add_development_dependency 'rspec', '~> 3.1'
-
   s.add_development_dependency 'rake'
-
   s.add_development_dependency 'yard', '~> 0.9.11'
 
   s.files        = %x[git ls-files].split($/).reject { |f| f.match(%r{^spec}) }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +72,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
@@ -130,16 +130,22 @@ dependencies:
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -439,7 +445,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="