r10k 3.15.4 → 4.0.0.pre

data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb

@@ -65,9 +65,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 initial_env_names.each do |env|
   if env == 'production'
     step "Checkout \"#{env}\" Branch"

data/lib/r10k/action/deploy/environment.rb

@@ -45,6 +45,7 @@ module R10K
                 incremental: @incremental
               },
               modules: {
+                default_ref: settings.dig(:git, :default_ref),
                 exclude_spec: settings.dig(:deploy, :exclude_spec),
                 requested_modules: [],
                 deploy_modules: @modules,
@@ -53,8 +54,7 @@ module R10K
               },
               purging: {
                 purge_levels: settings.dig(:deploy, :purge_levels) || [],
-                purge_allowlist: read_purge_allowlist(settings.dig(:deploy, :purge_whitelist) || [],
-                                                      settings.dig(:deploy, :purge_allowlist) || [])
+                purge_allowlist: settings.dig(:deploy, :purge_allowlist) || []
               },
               forge: {
                 allow_puppetfile_override: settings.dig(:forge, :allow_puppetfile_override) || false
@@ -83,23 +83,6 @@ module R10K
 
         private
 
-        def read_purge_allowlist (whitelist, allowlist)
-          whitelist_has_content = !whitelist.empty?
-          allowlist_has_content = !allowlist.empty?
-          case
-          when whitelist_has_content == false && allowlist_has_content == false
-            []
-          when whitelist_has_content && allowlist_has_content
-            raise R10K::Error.new "Values found for both purge_whitelist and purge_allowlist. Setting " <<
-                                  "purge_whitelist is deprecated, please only use purge_allowlist."
-          when allowlist_has_content
-            allowlist
-          else
-            logger.warn "Setting purge_whitelist is deprecated; please use purge_allowlist instead."
-            whitelist
-          end
-        end
-
         def visit_deployment(deployment)
           # Ensure that everything can be preloaded. If we cannot preload all
           # sources then we can't fully enumerate all environments which

data/lib/r10k/action/deploy/module.rb

@@ -39,6 +39,7 @@ module R10K
                 generate_types: @generate_types
               },
               modules: {
+                default_ref: settings.dig(:git, :default_ref),
                 exclude_spec: settings.dig(:deploy, :exclude_spec),
                 pool_size: @settings[:pool_size] || 4,
                 requested_modules: @argv.map.to_a,

data/lib/r10k/action/puppetfile/check.rb

@@ -9,12 +9,19 @@ module R10K
 
         def call
           options = { basedir: @root }
+          options[:overrides] = {}
+          options[:overrides][:modules] = { default_ref: @settings.dig(:git, :default_ref) }
           options[:moduledir] = @moduledir if @moduledir
           options[:puppetfile] = @puppetfile if @puppetfile
 
           loader = R10K::ModuleLoader::Puppetfile.new(**options)
           begin
             loader.load!
+            loader.modules.each do |mod|
+              if mod.instance_of?(R10K::Module::Git)
+                mod.validate_ref_defined
+              end
+            end
             $stderr.puts _("Syntax OK")
             true
           rescue => e

data/lib/r10k/action/puppetfile/install.rb

@@ -12,6 +12,7 @@ module R10K
         def call
           begin
             options = { basedir: @root, overrides: { force: @force || false } }
+            options[:overrides][:modules] = { default_ref: @settings.dig(:git, :default_ref) }
             options[:moduledir]  = @moduledir  if @moduledir
             options[:puppetfile] = @puppetfile if @puppetfile
             options[:module_exclude_regex] = @module_exclude_regex if @module_exclude_regex

data/lib/r10k/cli/deploy.rb

@@ -10,6 +10,19 @@ require 'cri'
 
 module R10K::CLI
   module Deploy
+
+    class TransformExcludeSpec
+      def call(input)
+        # To be backward compatible with the 3.x flag version of this setting,
+        # r10k allows this flag to have an optional argument. When no argument
+        # is supplied, cri defaults to setting the class to true, so we check
+        # for TrueClass here as well as "true".
+        return true if input == true || input == 'true'
+        return false if input == 'false'
+        raise ArgumentError
+      end
+    end
+
     def self.command
       @cmd ||= Cri::Command.define do
         name    'deploy'
@@ -24,7 +37,8 @@ module R10K::CLI
         option nil, :cachedir, 'Specify a cachedir, overriding the value in config', argument: :required
         flag nil, :'no-force', 'Prevent the overwriting of local module modifications'
         flag nil, :'generate-types', 'Run `puppet generate types` after updating an environment'
-        flag nil, :'exclude-spec', 'Exclude the module\'s spec dir from deployment'
+        option nil, :'exclude-spec', 'Exclude the module\'s spec dir for deployment', argument: :optional,
+                                                                                      transform: TransformExcludeSpec.new
         option nil, :'puppet-path', 'Path to puppet executable', argument: :required do |value, cmd|
           unless File.executable? value
             $stderr.puts "The specified puppet executable #{value} is not executable."

data/lib/r10k/content_synchronizer.rb

@@ -79,8 +79,13 @@ module R10K
         begin
           while mods = mods_queue.pop(true) do
             mods.each do |mod|
-              updated = mod.sync
-              updated_modules << mod.name if updated
+              begin
+                updated = mod.sync
+                updated_modules << mod.name if updated
+              rescue Exception => e
+                logger.error _("Module %{mod_name} failed to synchronize due to %{message}") % {mod_name: mod.name, message: e.message}
+                raise e
+              end
             end
           end
         rescue ThreadError => e

data/lib/r10k/environment.rb

@@ -31,7 +31,6 @@ module R10K
     require 'r10k/environment/base'
     require 'r10k/environment/with_modules'
     require 'r10k/environment/plain'
-    require 'r10k/environment/bare'
     require 'r10k/environment/git'
     require 'r10k/environment/svn'
     require 'r10k/environment/tarball'

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

@@ -56,11 +56,12 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
       logger.warn { _("Rugged versions prior to 0.24.0 do not support pruning stale branches during fetch, please upgrade your \'rugged\' gem. (Current version is: %{version})") % {version: Rugged::Version} }
     end
 
-    options = {:credentials => credentials, :prune => true}
-    refspecs = ['+refs/*:refs/*']
-
     remote = remotes[remote_name]
     proxy = R10K::Git.get_proxy_for_remote(remote)
+
+    options = {:credentials => credentials, :prune => true, :proxy_url => proxy}
+    refspecs = ['+refs/*:refs/*']
+
     results = nil
 
     R10K::Git.with_proxy(proxy) do

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

@@ -27,6 +27,7 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
   def clone(remote, opts = {})
     logger.debug1 { _("Cloning '%{remote}' into %{path}") % {remote: remote, path: @path } }
 
+    proxy = R10K::Git.get_proxy_for_remote(remote)
     # libgit2/rugged doesn't support cloning a repository and providing an
     # alternate object database, making the handling of :alternates a noop.
     # Unfortunately this means that this method can't really use alternates
@@ -34,10 +35,9 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     # repository. However alternate databases can be handled when an existing
     # repository is loaded, so loading a cloned repo will correctly use
     # alternate object database.
-    options = {:credentials => credentials}
+    options = {:credentials => credentials, :proxy_url => proxy}
     options.merge!(:alternates => [File.join(opts[:reference], 'objects')]) if opts[:reference]
 
-    proxy = R10K::Git.get_proxy_for_remote(remote)
 
     R10K::Git.with_proxy(proxy) do
       @_rugged_repo = ::Rugged::Repository.clone_at(remote, @path.to_s, options)
@@ -85,11 +85,13 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
 
   def fetch(remote_name = 'origin')
     logger.debug1 { _("Fetching remote '%{remote}' at %{path}") % {remote: remote_name, path: @path} }
-    options = {:credentials => credentials}
-    refspecs = ["+refs/heads/*:refs/remotes/#{remote_name}/*"]
 
     remote = remotes[remote_name]
     proxy = R10K::Git.get_proxy_for_remote(remote)
+
+    options = {:credentials => credentials, :proxy_url => proxy}
+    refspecs = ["+refs/heads/*:refs/remotes/#{remote_name}/*"]
+
     results = nil
 
     R10K::Git.with_proxy(proxy) do
@@ -117,7 +119,7 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     with_repo { |repo| repo.config['remote.origin.url'] }
   end
 
-  def dirty?(exclude_spec=false)
+  def dirty?(exclude_spec=true)
     with_repo do |repo|
       if exclude_spec
         diff = repo.diff_workdir('HEAD').select { |d| ! d.delta.old_file[:path].start_with?('spec/') }

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

@@ -90,7 +90,7 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
   end
 
   # does the working tree have local modifications to tracked files?
-  def dirty?(exclude_spec=false)
+  def dirty?(exclude_spec=true)
     result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
 
     if result.exit_code != 0

data/lib/r10k/git/stateful_repository.rb

@@ -36,7 +36,7 @@ class R10K::Git::StatefulRepository
   end
 
   # Returns true if the sync actually updated the repo, false otherwise
-  def sync(ref, force=true, exclude_spec=false)
+  def sync(ref, force=true, exclude_spec=true)
     @cache.sync if sync_cache?(ref)
 
     sha = @cache.resolve(ref)
@@ -75,7 +75,7 @@ class R10K::Git::StatefulRepository
     updated
   end
 
-  def status(ref, exclude_spec=false)
+  def status(ref, exclude_spec=true)
     if !@repo.exist?
       :absent
     elsif !@cache.exist?

data/lib/r10k/module/base.rb

@@ -60,8 +60,8 @@ class R10K::Module::Base
     @environment = environment
     @overrides = args.delete(:overrides) || {}
     @spec_deletable = true
-    @exclude_spec = false
-    @exclude_spec = @overrides.dig(:modules, :exclude_spec) if @overrides.dig(:modules, :exclude_spec)
+    @exclude_spec = true
+    @exclude_spec = @overrides.dig(:modules, :exclude_spec) unless @overrides.dig(:modules, :exclude_spec).nil?
     if args.has_key?(:exclude_spec)
       logger.debug2 _("Overriding :exclude_spec setting with per module setting for #{@title}")
       @exclude_spec = args.delete(:exclude_spec)
@@ -78,7 +78,7 @@ class R10K::Module::Base
     path.to_s
   end
 
-  # Delete the spec dir if @exclude_spec has been set to true and @spec_deletable is also true
+  # Delete the spec dir if @exclude_spec is true and @spec_deletable is also true
   def maybe_delete_spec_dir
     if @exclude_spec
       if @spec_deletable

data/lib/r10k/module/git.rb

@@ -63,15 +63,14 @@ class R10K::Module::Git < R10K::Module::Base
       :commit                  => :desired_ref,
       :ref                     => :desired_ref,
       :git                     => :remote,
-      :default_branch          => :default_ref,
+      :default_branch          => :default_branch,
       :default_branch_override => :default_override_ref,
     }, :raise_on_unhandled => false)
 
+    @default_ref = @default_branch.nil? ? @overrides.dig(:modules, :default_ref) : @default_branch
     force = @overrides[:force]
     @force = force == false ? false : true
 
-    @desired_ref ||= 'master'
-
     if @desired_ref == :control_branch
       if @environment && @environment.respond_to?(:ref)
         @desired_ref = @environment.ref
@@ -116,6 +115,14 @@ class R10K::Module::Git < R10K::Module::Base
     @repo.cache.sanitized_dirname
   end
 
+  def validate_ref_defined
+    if @desired_ref.nil? && @default_ref.nil? && @default_override_ref.nil?
+      msg = "No ref defined for module #{@name}. Add a ref to the module definition "
+      msg << "or set git:default_ref in the r10k.yaml config to configure a global default ref."
+      raise ArgumentError, msg
+    end
+  end
+
   private
 
   def validate_ref(desired, default, default_override)
@@ -147,7 +154,9 @@ class R10K::Module::Git < R10K::Module::Base
         msg << "or resolve default ref '%{default}'"
         vars[:default] = default
       else
-        msg << "and no default provided"
+        msg << "and no default provided. r10k no longer hardcodes 'master' as the default ref."
+        msg << "Consider setting a ref per module in the Puppetfile or setting git:default_ref"
+        msg << "in your r10k config."
       end
 
       raise ArgumentError, _(msg.join(' ')) % vars

data/lib/r10k/module_loader/puppetfile.rb

@@ -175,13 +175,6 @@ module R10K
         @modules << mod
       end
 
-      # @deprecated
-      # @return [String] The base directory that contains the Puppetfile
-      def basedir
-        logger.warn _('"basedir" is deprecated. Please use "environment_name" instead. "basedir" will be removed in a future version.')
-        @basedir
-      end
-
      private
 
       def empty_load_output

data/lib/r10k/puppetfile.rb

@@ -72,7 +72,7 @@ class Puppetfile
     @overrides       = options.delete(:overrides) || {}
     @default_branch_override = @overrides.dig(:environments, :default_branch_override)
 
-    @forge   = 'forgeapi.puppetlabs.com'
+    @forge   = 'forgeapi.puppet.com'
 
     @loader = ::R10K::ModuleLoader::Puppetfile.new(
       basedir: @basedir,

data/lib/r10k/settings.rb

@@ -19,6 +19,10 @@ module R10K
     def self.git_settings
       R10K::Settings::Collection.new(:git, [
 
+        Definition.new(:default_ref, {
+          :desc => "User-defined default ref from which to deploy modules when not otherwise specified; nil unless configured via the r10k.yaml config.",
+          :default => nil}),
+
         EnumDefinition.new(:provider, {
           :desc => "The Git provider to use. Valid values: 'shellgit', 'rugged'",
           :normalize => lambda { |input| input.to_sym },
@@ -175,11 +179,6 @@ module R10K
           :default => [],
         }),
 
-        Definition.new(:purge_whitelist, {
-          :desc => "Deprecated; please use purge_allowlist instead. This setting will be removed in a future version.",
-          :default => [],
-        }),
-
         Definition.new(:generate_types, {
           :desc => "Controls whether to generate puppet types after deploying an environment. Defaults to false.",
           :default => false,
@@ -207,8 +206,8 @@ module R10K
           end
         }),
         Definition.new(:exclude_spec, {
-          :desc => "Whether or not to deploy the spec dir of a module. Defaults to false.",
-          :default => false,
+          :desc => "Whether or not to deploy the spec dir of a module. Defaults to true.",
+          :default => true,
           :validate => lambda do |value|
             unless !!value == value
               raise ArgumentError, "`exclude_spec` can only be a boolean value, not '#{value}'"

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

data/locales/r10k.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2022 Puppet, Inc.
+# Copyright (C) 2023 Puppet, Inc.
 # This file is distributed under the same license as the r10k package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-265-gcb0a3463\n"
+"Project-Id-Version: r10k 3.9.3-289-g2f5deb72\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2022-12-08 22:58+0000\n"
-"PO-Revision-Date: 2022-12-08 22:58+0000\n"
+"POT-Creation-Date: 2023-06-27 17:39+0000\n"
+"PO-Revision-Date: 2023-06-27 17:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -95,7 +95,11 @@ msgstr ""
 msgid "Error during concurrent deploy of a module: %{message}"
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:87
+#: ../lib/r10k/content_synchronizer.rb:86
+msgid "Module %{mod_name} failed to synchronize due to %{message}"
+msgstr ""
+
+#: ../lib/r10k/content_synchronizer.rb:92
 msgid "Module thread %{id} exiting: %{message}"
 msgstr ""
 

data/r10k.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     dynamic environments.
   DESCRIPTION
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.license  = 'Apache-2.0'
 
@@ -28,13 +28,11 @@ 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', '< 4.0.0']
+  s.add_dependency 'puppet_forge', '>= 4.1', '< 6'
 
-  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']
+  s.add_dependency 'gettext-setup', '~>0.24'
 
-  s.add_dependency 'jwt', '~> 2.2.3'
+  s.add_dependency 'jwt', '>= 2.2.3', '< 2.8.0'
   s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'rspec', '~> 3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.15.4
+  version: 4.0.0.pre
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -72,94 +72,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
 - !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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: gettext
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 2.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: jwt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +187,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/dependabot.yml"
 - ".github/pull_request_template.md"
 - ".github/workflows/docker.yml"
 - ".github/workflows/release.yml"
@@ -256,19 +217,6 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
-- docker/.gitignore
-- docker/.rspec
-- docker/Gemfile
-- docker/Makefile
-- docker/README.md
-- docker/docker-compose.yml
-- docker/r10k/Dockerfile
-- docker/r10k/adduser.sh
-- docker/r10k/docker-entrypoint.d/10-analytics.sh
-- docker/r10k/docker-entrypoint.sh
-- docker/r10k/release.Dockerfile
-- docker/spec/dockerfile_spec.rb
-- docker/spec/fixtures/Puppetfile
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -295,13 +243,11 @@ files:
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/basic_deployment.rb
-- integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb
 - integration/tests/basic_functionality/negative/negative_bad_proxy.rb
 - integration/tests/basic_functionality/proxy_specified_in_configuration.rb
-- integration/tests/basic_functionality/proxy_with_pe_only_module.rb
 - integration/tests/basic_functionality/proxy_with_puppetfile.rb
 - integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
 - integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
@@ -320,8 +266,7 @@ files:
 - integration/tests/i18n/deploy_module_with_unicode_in_file_name.rb
 - integration/tests/purging/content_not_purged_at_root.rb
 - integration/tests/purging/default_purging.rb
-- integration/tests/purging/does_not_purge_files_on_white_list.rb
-- integration/tests/purging/invalid_whitelist_types.rb
+- integration/tests/purging/does_not_purge_files_on_allowlist.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb
@@ -339,7 +284,6 @@ files:
 - integration/tests/user_scenario/basic_workflow/negative/neg_inaccessible_forge.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_invalid_env_name.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_invalid_puppet_file.rb
-- integration/tests/user_scenario/basic_workflow/negative/neg_module_specified_at_deleted_release.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_read_only.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb
 - integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb
@@ -348,7 +292,6 @@ files:
 - integration/tests/user_scenario/basic_workflow/single_env_custom_module.rb
 - integration/tests/user_scenario/basic_workflow/single_env_large_files.rb
 - integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb
-- integration/tests/user_scenario/basic_workflow/single_env_module_last_release_deleted.rb
 - integration/tests/user_scenario/basic_workflow/single_env_non-existent_base_dir.rb
 - integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb
 - integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb
@@ -383,7 +326,6 @@ files:
 - lib/r10k/deployment.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/environment.rb
-- lib/r10k/environment/bare.rb
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/name.rb
@@ -491,12 +433,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/docker/.gitignore

@@ -1 +0,0 @@
-TEST-rspec.xml

data/docker/.rspec

@@ -1,4 +0,0 @@
---require pupperware/spec_helper
---format RspecJunitFormatter
---out TEST-rspec.xml
---format documentation