r10k 3.15.1 → 3.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe3c00c11efc712b5146a3dc869eb9855151bbe1d686fef6c13f9c17efc6283
-  data.tar.gz: 8d67474c7fe6266d04fd5ae42a301c4eb9f72f284b7d487350843384f1e37816
+  metadata.gz: 1b8f47b9b316994e718214a6f92e25b7dcd6f9e402e73ddee076920ac65b8317
+  data.tar.gz: '03847035922476e3fc27030c231cbb362ceac63387c4d300443a401eca298f16'
 SHA512:
-  metadata.gz: 5eadfe0185cd3bf7dcad760135e566dff7d8652a42c4b70e3968c9dfffd08770a722c07ad89a3c92065c5b57ef91ace5c79d13edf54277932297a67431c818df
-  data.tar.gz: 49cdc0476700c4938ac010eae9293fe94945ff81450bc72aaac00b969af96d9f04cc7733a54e79a576d9533011cec8e947d893fb79f824a9bbb6992f57912de0
+  metadata.gz: db1c6069ec189325027ee5e4015d1b659afc410f5840daacc7d21b724288c1d9e86c2e55792760d8b13ef981794d18c25db9977a5e56002898de005ca6a54b55
+  data.tar.gz: c3d8dca548fb0e57eba9b9a2df5a37c74d4ebdb74f224e9c03f8ee112f3708c8cc4b9630cfe671c944f30089052d5c4275c5e2a44df3ed015b59e3c710b7b40f

data/CHANGELOG.mkd

@@ -4,6 +4,10 @@ CHANGELOG
 Unreleased
 ----------
 
+3.15.2
+------
+- Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
+
 3.15.1
 ------
 - Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)

data/README.mkd

@@ -5,6 +5,13 @@ Puppet environment and module deployment
 
 [![Build Status](https://travis-ci.org/puppetlabs/r10k.png?branch=master)](https://travis-ci.org/puppetlabs/r10k)
 
+> R10k is supported and maintained by Puppet, but we consider it to be feature complete
+> and  currently have no plans for future feature development. We will keep it working
+> with current code deployment standards and the Ruby ecosystem that ships with the
+> puppet-agent package, but any new feature development will come from peer-reviewed
+> community contributions, with the onus on the contributor and community for validation.
+
+
 Description
 -----------
 
@@ -14,6 +21,10 @@ R10k provides a general purpose toolset for deploying Puppet environments and
 modules. It implements the [Puppetfile](doc/puppetfile.mkd) format and provides a native
 implementation of Puppet [environments][workflow].
 
+You might also consider [g10k](https://github.com/xorpaul/g10k) as a non-ruby
+based alternative.
+
+
 Requirements
 ------------
 

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

@@ -14,6 +14,7 @@ module R10K
             options = { basedir: @root, overrides: { force: @force || false } }
             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 +41,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/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/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)
 
@@ -223,6 +228,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/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.1'
+  VERSION = '3.15.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.15.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2