r10k 3.14.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da22a28bcd5de19a996ff2c869ba074c402e393d7a3caa2528bb342c75192234
-  data.tar.gz: 9bf7067d8412b9d158f2d47ad96499f90183c5dcade26b97fede2a344b06dca0
+  metadata.gz: 51cffcbc4e3340cf55e51da3a60e66e4c4b851d17bdd566d257213e6a4244bdc
+  data.tar.gz: 10c04f87924b3c5f4eb84cba797879a0a1ac09a6fbc3e0f598c53788d1d5f9b2
 SHA512:
-  metadata.gz: a2a529ce1b781f858253f1d929e4cf521806a8f11ce9733a4f2dc92dcfd4792d4afcbad9290a814d10a14be645eb0ada9551c542def43f6acc48d28931783bc2
-  data.tar.gz: 31d2a9e5d85f29da1c6f62d77d7bbd83c7ed8c4687bb5035f7185c8b37042e2707e59b623d6603af5d533ee79c44380d4a3a4a1a2a28ddd06af9c723c6f1c1bb
+  metadata.gz: 8684fc987a031207807de406810ec0529ef00ab8cad321923451a51d5d869ec2aee3cbca411ca37dbe1bbc7ec3c4a0e7daa58df099b0bc1c74005e5c914e0ba2
+  data.tar.gz: b8515912cdc5099dfd5c238da01663f7352185bd8454363cdce4bf562138302002fd563fe7783c212071fee2a8855f5abc78dd7d66c1dc006595613b697cd8eb

data/.github/workflows/rspec_tests.yml

@@ -16,9 +16,9 @@ jobs:
           - {os: ubuntu-18.04, ruby: 2.6}
           - {os: ubuntu-18.04, ruby: 2.7}
           - {os: ubuntu-18.04, ruby: jruby-9.2.10.0}
-          - {os: windows-2016, ruby: 2.5}
-          - {os: windows-2016, ruby: 2.6}
-          - {os: windows-2016, ruby: 2.7}
+          - {os: windows-2019, ruby: 2.5}
+          - {os: windows-2019, ruby: 2.6}
+          - {os: windows-2019, ruby: 2.7}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

data/.github/workflows/stale.yml

@@ -15,5 +15,7 @@ jobs:
         days-before-close: 7
         stale-issue-message: 'This issue has been marked stale because it has had no activity for 60 days. The Puppet Team is actively prioritizing existing bugs and new features, if this issue is still important to you please comment and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
         stale-issue-label: 'stale'
+        exempt-issue-labels: 'community interest'
         stale-pr-message: "This PR has been marked stale because it has had no activity for 60 days. If you are still interested in getting this merged, please comment and we'll try to move it forward. Otherwise, it will be closed in 7 days."
         stale-pr-label: 'stale'
+        exempt-pr-labels: 'community interest'

data/.gitignore

@@ -7,3 +7,4 @@ coverage
 integration/log
 integration/junit
 integration/configs
+r10k.log

data/CHANGELOG.mkd

@@ -4,6 +4,14 @@ CHANGELOG
 Unreleased
 ----------
 
+3.14.1
+------
+
+- (RK-395) Make `exclude_spec` from a Puppetfile the priority override [#1271](https://github.com/puppetlabs/r10k/issues/1271)
+- (RK-394) Fix `force` always resolving to true for `puppetfile install` [#1269](https://github.com/puppetlabs/r10k/issues/1265)
+- (RK-393) Bug fix: not all spec directories are deleted when :exclude_spec is true [#1267](https://github.com/puppetlabs/r10k/pull/1267)
+- Refactor internal module creation to always expect a hash, even for Forge modules, which can be specified in the Puppetfile with just a version string. [#1170](https://github.com/puppetlabs/r10k/pull/1170)
+
 3.14.0
 ------
 

data/doc/dynamic-environments/configuration.mkd

@@ -128,6 +128,18 @@ git:
   private_key: "/etc/puppetlabs/r10k/ssh/id_rsa"
 ```
 
+#### oauth_token
+
+The oauth_token setting is only used by the Rugged git provider.
+
+The oauth_token option specifies the path to the default access token for Git HTTPS remotes.
+Public git repositories can be accessed via HTTPS without authentication, but the oauth_token setting may be set if any non-public HTTPS remotes are used.
+
+```yaml
+git:
+  oauth_token: "/etc/puppetlabs/r10k/token"
+```
+
 #### repositories
 
 The repositories option allows configuration to be set on a per-remote basis. Each entry is a map of
@@ -145,6 +157,18 @@ git:
       private_key: "/etc/puppetlabs/r10k/ssh/id_rsa-protected-repo-deploy-key"
 ```
 
+##### oauth_token
+
+A repository specific access token to use for HTTPS connections for the given repository URL. This
+overrides the global oauth_token setting.
+
+```yaml
+git:
+  repositories:
+    - remote: "https://tessier-ashpool.freeside/protected-repo.git"
+      oauth_token: "/etc/puppetlabs/r10k/protected-repo-deploy-token"
+```
+
 ##### proxy
 
 The 'proxy' setting allows you to set or override the global proxy setting for a single, specific
@@ -349,12 +373,13 @@ deploy:
 
 #### exclude_spec
 
-During module deployment, r10k's default behavior is to deploy the spec directory.
-This behavior can be configured for all modules using the `exclude_spec` setting in the r10k config.
-This config setting can be overridden in each module definition in the Puppetfile
-or more globally via the CLI for deploys. The following example sets all modules to
-not deploy the spec dir.
-
+During module deployment, r10k's default behavior is to deploy the spec directory. Setting
+`exclude_spec` to true will deploy modules without their spec directory. This behavior
+can be configured for all modules using the `exclude_spec` setting in the r10k config.
+It can also be passed as a CLI argument for `deploy environment/module`, overriding the
+r10k config. Setting this per module in a `Puppetfile` will override the default, r10k config,
+and cli flag for that module. The following example sets all modules to not deploy the spec
+dir via the r10k config.
 
 ```yaml
 deploy:

data/doc/git/providers.mkd

@@ -56,6 +56,28 @@ git:
       private_key: '/root/.ssh/private_repo_id'
 ```
 
+### HTTPS Configuration
+
+Public HTTPS based Git repositories can be accessed with no additional settings.
+For repos that do require authentication, the 'oauth_token' option may be provided.
+
+```yaml
+git:
+  oauth_token: '/etc/puppetlabs/r10k/token'
+```
+
+If you have per repository access tokens you can add them with the repositories list.
+
+```yaml
+git:
+  # default access token
+  oauth_token: '/etc/puppetlabs/r10k/token'
+  repositories:
+    - remote: "https://github.com/my_org/private_repo.git"
+      # access token for this repo only
+      oauth_token: '/etc/puppetlabs/r10k/private_repo_token'
+```
+
 #### Supported transports with Rugged
 
 Rugged compiles libgit2 and and the Ruby bindings when the gem is installed. You

data/docker/Makefile

@@ -6,7 +6,7 @@ build_date := $(shell date -u +%FT%T)
 hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
 hadolint_command := hadolint
 hadolint_container := ghcr.io/hadolint/hadolint:latest
-alpine_version := 3.9
+alpine_version := 3.14
 export BUNDLE_PATH = $(PWD)/.bundle/gems
 export BUNDLE_BIN = $(PWD)/.bundle/bin
 export GEMFILE = $(PWD)/Gemfile

data/docker/r10k/Dockerfile

@@ -1,4 +1,4 @@
-ARG alpine_version=3.9
+ARG alpine_version=3.14
 FROM alpine:${alpine_version} as build
 
 # hadolint ignore=DL3018

data/docker/r10k/release.Dockerfile

@@ -1,4 +1,4 @@
-ARG alpine_version=3.9
+ARG alpine_version=3.14
 FROM alpine:${alpine_version}
 
 ARG vcs_ref

data/lib/r10k/environment/with_modules.rb

@@ -96,7 +96,7 @@ class R10K::Environment::WithModules < R10K::Environment::Base
   def load_modules(module_hash)
     module_hash.each do |name, args|
       if !args.is_a?(Hash)
-        args = { version: args }
+        args = { type: 'forge', version: args }
       end
 
       add_module(name, args)

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

@@ -64,7 +64,7 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
     results = nil
 
     R10K::Git.with_proxy(proxy) do
-      results = with_repo { |repo| repo.fetch(remote_name, refspecs, options) }
+      results = with_repo { |repo| repo.fetch(remote_name, refspecs, **options) }
     end
 
     report_transfer(results, remote_name)

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

@@ -130,7 +130,7 @@ class R10K::Git::Rugged::Credentials
 
     user = nil
 
-    if !username_from_url.nil?
+    if !username_from_url.nil? && !username_from_url.empty?
       user = username_from_url
       logger.debug2 _("URL %{url} includes the username %{username}, using that user for authentication.") % {url: url.inspect, username: username_from_url}
     elsif git_user

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

@@ -93,7 +93,7 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     results = nil
 
     R10K::Git.with_proxy(proxy) do
-      results = with_repo { |repo| repo.fetch(remote_name, refspecs, options) }
+      results = with_repo { |repo| repo.fetch(remote_name, refspecs, **options) }
     end
 
     report_transfer(results, remote)

data/lib/r10k/module/base.rb

@@ -60,8 +60,12 @@ class R10K::Module::Base
     @environment = environment
     @overrides = args.delete(:overrides) || {}
     @spec_deletable = true
-    @exclude_spec = args.delete(:exclude_spec)
-    @exclude_spec = @overrides[:modules].delete(:exclude_spec) if @overrides.dig(:modules, :exclude_spec)
+    @exclude_spec = false
+    @exclude_spec = @overrides.dig(:modules, :exclude_spec) if @overrides.dig(:modules, :exclude_spec)
+    if args.has_key?(:exclude_spec)
+      logger.debug2 _("Overriding :exclude_spec setting with per module setting for #{@title}")
+      @exclude_spec = args.delete(:exclude_spec)
+    end
     @origin = 'external' # Expect Puppetfile or R10k::Environment to set this to a specific value
 
     @requested_modules = @overrides.dig(:modules, :requested_modules) || []

data/lib/r10k/module/forge.rb

@@ -13,16 +13,7 @@ class R10K::Module::Forge < R10K::Module::Base
   R10K::Module.register(self)
 
   def self.implement?(name, args)
-    args[:type].to_s == 'forge' ||
-      (!!
-       ((args.keys & %i{git svn type}).empty? &&
-        args.has_key?(:version) &&
-        name.match(%r[\w+[/-]\w+]) &&
-        valid_version?(args[:version])))
-  end
-
-  def self.valid_version?(expected_version)
-    expected_version == :latest || expected_version.nil? || PuppetForge::Util.version_valid?(expected_version)
+    args[:type].to_s == 'forge'
   end
 
   def self.statically_defined_version(name, args)
@@ -54,11 +45,20 @@ class R10K::Module::Forge < R10K::Module::Base
       :type    => ::R10K::Util::Setopts::Ignore,
     }, :raise_on_unhandled => false)
 
+    # Validate version and raise on issue. Title is validated by base class.
+    unless valid_version?(@expected_version)
+      raise ArgumentError, _("Module version %{ver} is not a valid Forge module version") % {ver: @expected_version}
+    end
+
     @expected_version ||= current_version || :latest
 
     @v3_module = PuppetForge::V3::Module.new(:slug => @title)
   end
 
+  def valid_version?(version)
+    version == :latest || version.nil? || PuppetForge::Util.version_valid?(version)
+  end
+
   # @param [Hash] opts Deprecated
   # @return [Boolean] true if the module was updated, false otherwise
   def sync(opts={})

data/lib/r10k/module/git.rb

@@ -9,8 +9,6 @@ class R10K::Module::Git < R10K::Module::Base
 
   def self.implement?(name, args)
     args.has_key?(:git) || args[:type].to_s == 'git'
-  rescue
-    false
   end
 
   # Will be called if self.implement? above returns true. Will return
@@ -69,7 +67,7 @@ class R10K::Module::Git < R10K::Module::Base
       :default_branch_override => :default_override_ref,
     }, :raise_on_unhandled => false)
 
-    force = @overrides.dig(:modules, :force)
+    force = @overrides[:force]
     @force = force == false ? false : true
 
     @desired_ref ||= 'master'

data/lib/r10k/module/local.rb

@@ -8,7 +8,7 @@ class R10K::Module::Local < R10K::Module::Base
   R10K::Module.register(self)
 
   def self.implement?(name, args)
-    args.is_a?(Hash) && (args[:local] || args[:type].to_s == 'local')
+    args[:local] || args[:type].to_s == 'local'
   end
 
   def self.statically_defined_version(*)

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

@@ -15,7 +15,7 @@ module R10K
           if args.is_a?(Hash)
             opts = args
           else
-            opts = { version: args }
+            opts = { type: 'forge', version: args }
           end
 
           if @metadata_only

data/lib/r10k/module_loader/puppetfile.rb

@@ -196,8 +196,10 @@ module R10K
       end
 
       def parse_module_definition(name, info)
+        # The only valid (deprecated) way a module can be defined with a
+        # non-hash info is if it is a Forge module.
         if !info.is_a?(Hash)
-          info = { version: info }
+          info = { type: 'forge', version: info }
         end
 
         info[:overrides] = @overrides

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.14.0'
+  VERSION = '3.14.1'
 end

data/locales/r10k.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2021 Puppet, Inc.
+# Copyright (C) 2022 Puppet, Inc.
 # This file is distributed under the same license as the r10k package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-170-g8cb36435\n"
+"Project-Id-Version: r10k 3.9.3-208-gb88bb368\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2021-11-16 21:43+0000\n"
-"PO-Revision-Date: 2021-11-16 21:43+0000\n"
+"POT-Creation-Date: 2022-02-07 21:13+0000\n"
+"PO-Revision-Date: 2022-02-07 21:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
-#: ../lib/r10k/environment/name.rb:78
+#: ../lib/r10k/environment/name.rb:83
 msgid "Improper configuration value given for strip_component setting in %{src} source. Value must be a string, a /regex/, false, or omitted. Got \"%{val}\" (%{type})"
 msgstr ""
 
@@ -395,27 +395,31 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:83
+#: ../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:95
+#: ../lib/r10k/module/base.rb:99
 msgid "Deleting spec data at #{spec_path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:103
+#: ../lib/r10k/module/base.rb:107
 msgid "No spec dir detected at #{spec_path}, skipping deletion"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:116
+#: ../lib/r10k/module/base.rb:120
 msgid "Deploying module to %{path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:119
+#: ../lib/r10k/module/base.rb:123
 msgid "Only updating modules %{modules}, skipping module %{name}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:175
+#: ../lib/r10k/module/base.rb:179
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
@@ -423,6 +427,10 @@ msgstr ""
 msgid "Not updating module %{name}, assuming content unchanged"
 msgstr ""
 
+#: ../lib/r10k/module/forge.rb:50
+msgid "Module version %{ver} is not a valid Forge module version"
+msgstr ""
+
 #: ../lib/r10k/module/forge.rb:98
 msgid "The module %{title} does not appear to have any published releases, cannot determine latest version."
 msgstr ""
@@ -435,7 +443,7 @@ msgstr ""
 msgid "Forge module names must match 'owner/modulename', instead got #{title}"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:81
+#: ../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 ""
 
@@ -479,11 +487,11 @@ msgstr ""
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:228
+#: ../lib/r10k/module_loader/puppetfile.rb:230
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:230
+#: ../lib/r10k/module_loader/puppetfile.rb:232
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 

data/r10k.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
 
   s.add_dependency 'jwt', '~> 2.2.3'
-  s.add_dependency 'minitar', '~> 0.9.0'
+  s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 

data/spec/unit/module/forge_spec.rb

@@ -33,21 +33,17 @@ describe R10K::Module::Forge do
 
   describe "implementing the Puppetfile spec" do
     it "should implement 'branan/eight_hundred', '8.0.0'" do
-      expect(described_class).to be_implement('branan/eight_hundred', { version: '8.0.0' })
+      expect(described_class).to be_implement('branan/eight_hundred', { type: 'forge', version: '8.0.0' })
     end
 
     it "should implement 'branan-eight_hundred', '8.0.0'" do
-      expect(described_class).to be_implement('branan-eight_hundred', { version: '8.0.0' })
-    end
-
-    it "should fail with an invalid title" do
-      expect(described_class).to_not be_implement('branan!eight_hundred', { version: '8.0.0' })
+      expect(described_class).to be_implement('branan-eight_hundred', { type: 'forge', version: '8.0.0' })
     end
   end
 
   describe "implementing the standard options interface" do
     it "should implement {type: forge}" do
-      expect(described_class).to be_implement('branan-eight_hundred', {type: 'forge', version: '8.0.0', source: 'not implemented'})
+      expect(described_class).to be_implement('branan-eight_hundred', { type: 'forge', version: '8.0.0', source: 'not implemented' })
     end
   end
 
@@ -71,6 +67,12 @@ describe R10K::Module::Forge do
     end
   end
 
+  describe "invalid attributes" do
+    it "errors on invalid versions" do
+      expect { described_class.new('branan/eight_hundred', '/moduledir', { version: '_8.0.0_' }) }.to raise_error ArgumentError, /version/
+    end
+  end
+
   describe "properties" do
     subject { described_class.new('branan/eight_hundred', fixture_modulepath, { version: '8.0.0' }) }
 

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -80,7 +80,8 @@ describe R10K::ModuleLoader::Puppetfile do
   describe 'adding modules' do
     let(:basedir) { '/test/basedir' }
 
-    subject { R10K::ModuleLoader::Puppetfile.new(basedir: basedir) }
+    subject { R10K::ModuleLoader::Puppetfile.new(basedir: basedir,
+                                                 overrides: {modules: {exclude_spec: true}}) }
 
     it 'should transform Forge modules with a string arg to have a version key' do
       expect(R10K::Module).to receive(:from_metadata).with('puppet/test_module', subject.moduledir, hash_including(version: '1.2.3'), anything).and_call_original
@@ -94,11 +95,23 @@ describe R10K::ModuleLoader::Puppetfile do
 
       expect {
         subject.add_module('puppet/test_module', '< 1.2.0')
-      }.to raise_error(RuntimeError, /module puppet\/test_module.*doesn't have an implementation/i)
+      }.to raise_error(ArgumentError, /module version .* is not a valid forge module version/i)
 
       expect(subject.modules.collect(&:name)).not_to include('test_module')
     end
 
+    it 'should not modify the overrides when adding modules' do
+      module_opts = { git: 'git@example.com:puppet/test_module.git' }
+      subject.add_module('puppet/test_module', module_opts)
+      expect(subject.instance_variable_get("@overrides")[:modules]).to eq({exclude_spec: true})
+    end
+
+    it 'should read the `exclude_spec` setting in the module definition and override the overrides' do
+      module_opts = { git: 'git@example.com:puppet/test_module.git', exclude_spec: false }
+      subject.add_module('puppet/test_module', module_opts)
+      expect(subject.modules[0].instance_variable_get("@exclude_spec")).to be false
+    end
+
     it 'should set :spec_deletable to true for modules in the basedir' do
       module_opts = { git: 'git@example.com:puppet/test_module.git' }
       subject.add_module('puppet/test_module', module_opts)

data/spec/unit/module_spec.rb

@@ -31,12 +31,11 @@ describe R10K::Module do
       'bar-quux',
     ].each do |scenario|
       it "accepts a name matching #{scenario} and version nil" do
-        obj = R10K::Module.new(scenario, '/modulepath', { version: nil })
+        obj = R10K::Module.new(scenario, '/modulepath', { type: 'forge', version: nil })
         expect(obj).to be_a_kind_of(R10K::Module::Forge)
       end
     end
-    [ {version: '8.0.0'},
-      {type: 'forge', version: '8.0.0'},
+    [ {type: 'forge', version: '8.0.0'},
     ].each do |scenario|
       it "accepts a name matching bar-quux and args #{scenario.inspect}" do
         obj = R10K::Module.new('bar-quux', '/modulepath', scenario)
@@ -65,7 +64,7 @@ describe R10K::Module do
       end
 
       it 'sets the expected version to what is found in the metadata' do
-        obj = R10K::Module.new(@title, @dirname, {version: nil})
+        obj = R10K::Module.new(@title, @dirname, {type: 'forge', version: nil})
         expect(obj.send(:instance_variable_get, :'@expected_version')).to eq('1.2.0')
       end
     end
@@ -82,7 +81,6 @@ describe R10K::Module do
       ['name', {type: 'git', source: 'git url'}],
       ['name', {svn: 'svn url'}],
       ['name', {type: 'svn', source: 'svn url'}],
-      ['namespace-name', {version: '8.0.0'}],
       ['namespace-name', {type: 'forge', version: '8.0.0'}]
     ].each do |(name, options)|
       it 'can handle the default_branch_override option' do
@@ -92,12 +90,21 @@ describe R10K::Module do
         }.not_to raise_error
       end
       describe 'the exclude_spec setting' do
+        it 'sets the exclude_spec instance variable to false by default' do
+          obj = R10K::Module.new(name, '/modulepath', options)
+          expect(obj.instance_variable_get("@exclude_spec")).to eq(false)
+        end
         it 'sets the exclude_spec instance variable' do
           obj = R10K::Module.new(name, '/modulepath', options.merge({exclude_spec: true}))
           expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
         end
-        it 'can be overridden by the overrides map' do
-          options = options.merge({exclude_spec: false, overrides: {modules: {exclude_spec: true}}})
+        it 'cannot be overridden by the settings from the cli, r10k.yaml, or settings default' do
+          options = options.merge({exclude_spec: true, overrides: {modules: {exclude_spec: false}}})
+          obj = R10K::Module.new(name, '/modulepath', options)
+          expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
+        end
+        it 'reads the setting from the cli, r10k.yaml, or settings default when not provided directly' do
+          options = options.merge({overrides: {modules: {exclude_spec: true}}})
           obj = R10K::Module.new(name, '/modulepath', options)
           expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.14.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement