r10k 3.15.0 → 4.1.0

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -16,28 +16,24 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd', :branch => 'main'
 EOS
 
-proxy_env_value = 'http://cattastic.net:3219'
-
 #In-line files
 r10k_conf = <<-CONF
 cachedir: '/var/cache/r10k'
 git:
   provider: '#{git_provider}'
   repositories:
-    - remote: 'http://example.com/fake_git_source.git'
+    - remote: 'https://something.else/repo'
       proxy: 'http://foooooooo.unresolvable:3128'
 sources:
   control:
     basedir: "#{env_path}"
-    remote: "http://example.com/fake_git_source.git"
+    remote: 'https://something.else/repo'
 CONF
 
 teardown do
-  master.clear_env_var('HTTP_PROXY')
-
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
 
@@ -45,8 +41,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTP_PROXY', proxy_env_value)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 
@@ -64,7 +58,8 @@ git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_pat
 
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
-  regex = /proxy.*foooooooo\.unresolvable/
+  # Rugged as of 0.28 has a different error message than shellgit
+  regex = /((failed to resolve address for)|(Could not resolve proxy:)) foooooooo\.unresolvable/
   assert(r.exit_code == 1, 'expected error code was not observed')
   assert_match(regex, r.stderr, 'The expected error message was not observed' )
 end

data/integration/tests/git_source/git_source_git.rb

@@ -5,7 +5,7 @@ test_name 'CODEMGMT-92 - C59235 - Single Git Source Using "GIT" Transport Protoc
 
 confine(:to, :platform => 'el')
 
-if fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, "os.release.major").to_i < 6 || fact_on(master, "os.release.major").to_i > 8
   skip_test('This version of EL is not supported by this test case!')
 end
 
@@ -84,9 +84,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/git_source/git_source_repeated_remote.rb

@@ -44,9 +44,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

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/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb

@@ -68,6 +68,6 @@ on(master, "chmod 600 #{ssh_private_key_path}")
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, "#{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
+on(master, "SSH_AUTH_SOCK= SSH_CONNECTION= SSH_CLIENT= #{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -50,9 +50,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/purging/default_purging.rb

@@ -51,9 +51,6 @@ fake_file_b_to_be_left_alone = "#{fake_environment_path_b}/fakefile2.txt"
 fake_file_c_to_be_purged     = "#{fake_environment_path_c}/fakefile3.txt"
 
 # initalize file content
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/purging/{does_not_purge_files_on_white_list.rb → does_not_purge_files_on_allowlist.rb}

@@ -1,7 +1,7 @@
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'RK-257 - C98046 - r10k does not purge files on whitelist'
+test_name 'RK-257 - C98046 - r10k does not purge files on allowlist'
 
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
@@ -26,9 +26,6 @@ teardown do
 end
 
 # initalize file content
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 
@@ -42,7 +39,7 @@ sources:
     remote: "#{git_control_remote}"
 deploy:
   purge_levels: ['deployment', 'environment', 'puppetfile']
-  purge_whitelist: ['**/*.pp']
+  purge_allowlist: ['**/*.pp']
 CONF
 
 step 'Update the "r10k" Config'

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

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

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

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

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

@@ -102,9 +102,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_forge_module.rb

@@ -29,9 +29,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/negative/neg_disk_full.rb

@@ -2,7 +2,7 @@ require 'git_utils'
 require 'r10k_utils'
 test_name 'CODEMGMT-86 - C59265 - Attempt to Deploy Environment to Disk with Insufficient Free Space'
 
-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/negative/neg_duplicate_module_names.rb

@@ -25,9 +25,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/negative/neg_inaccessible_forge.rb

@@ -19,7 +19,7 @@ PUPPETFILE
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')
 
 #Verification
-error_message_regex = /Error: Could not connect via HTTPS to https:\/\/forgeapi.puppetlabs.com/
+error_message_regex = /Error: Could not connect via HTTPS to https:\/\/forgeapi.puppet(labs)?.com/
 
 #Teardown
 teardown do
@@ -34,7 +34,8 @@ step 'Backup "/etc/hosts" File on Master'
 on(master, "mv #{hosts_file_path} #{hosts_file_path}.bak")
 
 step 'Point Forge Hostname to Localhost'
-on(master, "echo '127.0.0.1  forgeapi.puppetlabs.com' > #{hosts_file_path}")
+on(master, "echo '127.0.0.1  forgeapi.puppet.com' > #{hosts_file_path}")
+on(master, "echo '127.0.0.1  forgeapi.puppetlabs.com' >> #{hosts_file_path}")
 
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

data/integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb

@@ -10,7 +10,7 @@ last_commit = git_last_commit(master, git_environments_path)
 r10k_fqp = get_r10k_fqp(master)
 
 #Verification
-error_notification_regex = /The module puppetlabs-regret does not appear to have any published releases/
+error_notification_regex = /(The module puppetlabs-regret does not appear to have any published releases)|(module puppetlabs-regret does not exist on)/
 
 #File
 puppet_file = <<-PUPPETFILE
@@ -24,10 +24,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-#Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 #Tests
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

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

@@ -3,7 +3,7 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59239 - Single Environment with 10,000 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_custom_forge_git_module.rb

@@ -64,9 +64,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_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

@@ -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.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,18 +90,18 @@ 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
-      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 dirty_files.size > 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