r10k 3.14.1 → 5.0.1

data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_module.rb

@@ -45,9 +45,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb

@@ -3,7 +3,7 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59242 - Single Environment with Large Binary Files'
 
-if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 

data/integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb

@@ -44,9 +44,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Add motd module from the forge using the PMT'
 on(master, puppet('module', 'install', 'puppetlabs-motd', '--modulepath', forge_module_path))
 

data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb

@@ -43,9 +43,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_remote_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb

@@ -27,7 +27,7 @@ PUPPETFILE
 
 puppet_file_git = <<-PUPPETFILE
 mod "puppetlabs/motd",
-  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
   :tag => '1.2.0'
 PUPPETFILE
 
@@ -57,9 +57,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb

@@ -60,9 +60,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

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,8 +12,10 @@ 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
 
             loader = R10K::ModuleLoader::Puppetfile.new(**options)
             loaded_content = loader.load!
@@ -40,7 +42,7 @@ module R10K
         private
 
         def allowed_initialize_opts
-          super.merge(root: :self, puppetfile: :self, moduledir: :self, force: :self )
+          super.merge(root: :self, puppetfile: :self, moduledir: :self, :'module-exclude-regex' => :self, force: :self )
         end
       end
     end

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/cli/puppetfile.rb

@@ -31,6 +31,7 @@ Puppetfile (http://bombasticmonkey.com/librarian-puppet/).
           summary 'Install all modules from a Puppetfile'
           option nil, :moduledir, 'Path to install modules to', argument: :required
           option nil, :puppetfile, 'Path to puppetfile', argument: :required
+          option nil, :'module-exclude-regex', 'A regex to exclude modules from installation. Helpful in CI environments.', argument: :required
           flag     nil, :force, 'Force locally changed files to be overwritten'
           runner R10K::Action::Puppetfile::CriRunner.wrap(R10K::Action::Puppetfile::Install)
         end

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/with_modules.rb

@@ -103,6 +103,29 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     end
   end
 
+  def resolve_path(base, dirname, path)
+    if Pathname.new(path).absolute?
+      cleanpath(path)
+    else
+      cleanpath(File.join(base, dirname, path))
+    end
+  end
+
+  # .cleanpath is as good as we can do without touching the filesystem.
+  # The .realpath methods will choke if some of the intermediate paths
+  # are missing, even though in some cases we will create them later as
+  # needed.
+  def cleanpath(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  def validate_install_path(path, modname)
+    unless /^#{Regexp.escape(@basedir)}.*/ =~ path
+      raise R10K::Error.new("Environment cannot manage content '#{modname}' outside of containing environment: #{path} is not within #{@basedir}")
+    end
+    true
+  end
+
   # @param [String] name
   # @param [Hash] args
   def add_module(name, args)
@@ -111,7 +134,7 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     args[:overrides] = @overrides
 
     if install_path = args.delete(:install_path)
-      install_path = resolve_install_path(install_path)
+      install_path = resolve_path(@basedir, @dirname, install_path)
       validate_install_path(install_path, name)
     else
       install_path = @moduledir

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

@@ -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
 
@@ -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, :download_tags => true}
+    refspecs = ['+refs/heads/*:refs/heads/*', '+refs/tags/*:refs/tags/*']
+
     results = nil
 
     R10K::Git.with_proxy(proxy) do

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

@@ -75,6 +75,13 @@ class R10K::Git::Rugged::ThinRepository < R10K::Git::Rugged::WorkingRepository
     end
   end
 
+  def stage_files(files=['.'])
+    with_repo do |repo|
+      index = repo.index
+      files.each { |p| index.add( :path => p ) }
+    end
+  end
+
   private
 
   # Override the parent class repo setup so that we can make sure the alternates file is up to date

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, :prune => true}
+    refspecs = ["+refs/heads/*:refs/remotes/#{remote_name}/*"]
+
     results = nil
 
     R10K::Git.with_proxy(proxy) do
@@ -117,11 +119,15 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     with_repo { |repo| repo.config['remote.origin.url'] }
   end
 
-  def dirty?
+  def dirty?(exclude_spec=true)
     with_repo do |repo|
-      diff = repo.diff_workdir('HEAD')
+      if exclude_spec
+        diff = repo.diff_workdir('HEAD').select { |d| ! d.delta.old_file[:path].start_with?('spec/') }
+      else
+        diff = repo.diff_workdir('HEAD').to_a
+      end
 
-      diff.each_patch do |p|
+      diff.each do |p|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, p.delta.old_file[:path])}))
         logger.debug1(p.to_s)
       end

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
@@ -43,6 +43,10 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
     git(['ls-tree', '-t', '-r', '--name-only', ref], :path => @path.to_s).stdout.split("\n")
   end
 
+  def stage_files(files=['.'])
+    git(['add', files].flatten, :path => @path.to_s)
+  end
+
   private
 
   def setup_cache_remote

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

@@ -90,20 +90,21 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
   end
 
   # does the working tree have local modifications to tracked files?
-  def dirty?
+  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
-      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|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, file)}))
 
         # Do this in a block so that the extra subprocess only gets invoked when needed.
-        logger.debug1 { git(['diff-index', '-p', 'HEAD', file], :path => @path.to_s, :raise_on_fail => false).stdout }
+        logger.debug1 { git(['diff-index', '-p', 'HEAD', '--', file], :path => @path.to_s, :raise_on_fail => false).stdout }
       end
 
-      return true
+      return dirty_files.size > 0
     else
       return false
     end

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)
+  def sync(ref, force=true, exclude_spec=true)
     @cache.sync if sync_cache?(ref)
 
     sha = @cache.resolve(ref)
@@ -45,7 +45,7 @@ class R10K::Git::StatefulRepository
       raise R10K::Git::UnresolvableRefError.new(_("Unable to sync repo to unresolvable ref '%{ref}'") % {ref: ref}, :git_dir => @repo.git_dir)
     end
 
-    workdir_status = status(ref)
+    workdir_status = status(ref, exclude_spec)
 
     updated = true
     case workdir_status
@@ -75,7 +75,7 @@ class R10K::Git::StatefulRepository
     updated
   end
 
-  def status(ref)
+  def status(ref, exclude_spec=true)
     if !@repo.exist?
       :absent
     elsif !@cache.exist?
@@ -88,7 +88,7 @@ class R10K::Git::StatefulRepository
       :mismatched
     elsif @repo.head.nil?
       :mismatched
-    elsif @repo.dirty?
+    elsif @repo.dirty?(exclude_spec)
       :dirty
     elsif !(@repo.head == @cache.resolve(ref))
       :outdated

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

@@ -46,6 +46,11 @@ class R10K::Module::Git < R10K::Module::Base
   #   @return [String]
   attr_reader :default_override_ref
 
+  # @!attribute[r] remote
+  #   @api private
+  #   @return [String]
+  attr_reader :remote
+
   include R10K::Util::Setopts
 
   def initialize(title, dirname, opts, environment=nil)
@@ -63,15 +68,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
@@ -100,7 +104,7 @@ class R10K::Module::Git < R10K::Module::Base
   def sync(opts={})
     force = opts[:force] || @force
     if should_sync?
-      updated = @repo.sync(version, force)
+      updated = @repo.sync(version, force, @exclude_spec)
     else
       updated = false
     end
@@ -116,6 +120,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 +159,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/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/module_loader/puppetfile.rb

@@ -30,17 +30,21 @@ module R10K
       # @param overrides [Hash] Configuration for loaded modules' behavior
       # @param environment [R10K::Environment] When provided, the environment
       #     in which loading takes place
+      # @param module_exclude_regex [Regex] A regex to exclude modules from
+      #     installation. Helpful in CI environments.
       def initialize(basedir:,
                      moduledir: DEFAULT_MODULEDIR,
                      puppetfile: DEFAULT_PUPPETFILE_NAME,
                      overrides: {},
-                     environment: nil)
+                     environment: nil,
+                     module_exclude_regex: nil)
 
         @basedir     = cleanpath(basedir)
         @moduledir   = resolve_path(@basedir, moduledir)
         @puppetfile_path  = resolve_path(@basedir, puppetfile)
         @overrides   = overrides
         @environment = environment
+        @module_exclude_regex = module_exclude_regex
         @environment_name = @environment&.name
         @default_branch_override = @overrides.dig(:environments, :default_branch_override)
         @allow_puppetfile_forge = @overrides.dig(:forge, :allow_puppetfile_override)
@@ -68,6 +72,7 @@ module R10K
         dsl.instance_eval(puppetfile_content(@puppetfile_path), @puppetfile_path)
 
         validate_no_duplicate_names(@modules)
+        @modules = filter_modules(@modules, @module_exclude_regex) if @module_exclude_regex
 
         managed_content = @modules.group_by(&:dirname)
 
@@ -99,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)
@@ -157,23 +165,19 @@ module R10K
           return @modules
         end
 
-        # If this module's metadata has a static version and that version
-        # matches the existing module declaration use it, otherwise create
-        # a regular module to sync.
-        unless mod.version && (mod.version == @existing_module_versions_by_name[mod.name])
-          mod = mod.to_implementation
+        # If this module's metadata has a static version, and that version
+        # matches the existing module declaration, and it ostensibly
+        # has already has been deployed to disk, use it. Otherwise create a
+        # regular module to sync.
+        unless mod.version &&
+               mod.version == @existing_module_versions_by_name[mod.name] &&
+               File.directory?(mod.path)
+            mod = mod.to_implementation
         end
 
         @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
@@ -220,6 +224,10 @@ module R10K
         return [ install_path, info, spec_deletable ]
       end
 
+      def filter_modules(modules, exclude_regex)
+        modules.reject { |mod| mod.name =~ /#{exclude_regex}/ }
+      end
+
       # @param [Array<R10K::Module>] modules
       def validate_no_duplicate_names(modules)
         dupes = modules

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/container.rb

@@ -1,3 +1,4 @@
+require 'set'
 # Defines a collection for application settings
 #
 # This implements a hierarchical interface to application settings. Containers