r10k 3.12.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f378346234a9e8a8d92b3acb64735f88ca6b8e8edd60aa33adad9a09d7efd537
-  data.tar.gz: 1b94403eb2e5cb420939d85b73ec299c709418afabb45705f70b1cfb8606a1f5
+  metadata.gz: 5500f864c81a0b1ff5f48461bca9de375450f452028a93d381ec65eac3b35865
+  data.tar.gz: 1d675799b9bf1df2ee328780bc90ed4e79c02bf7706a166dd40f5af952e9610a
 SHA512:
-  metadata.gz: a3eda38f3fc6e79ea62082c7c71bd65383089dce82e87dc6473c1f278f1560239f3e2189df28ef23a9ce8e47f3446cdd63e8794344ee62895914353bdcdec6ee
-  data.tar.gz: 0dc89955ede8226bf59c7cd4f8e03d9a89688700f5767d0578884fce97643c937f3363dd0d965404fd2b900128b181874dfb129952d64891a3700516239a2af6
+  metadata.gz: cc75dcceceb3b368c6ee9dd1773a92530e67a59b1e35b52e3d8205d3dffb6b1b7d4b927edbe58bc828d9a1782d1052254464ca7c0556ea6099c5975811ddad1a
+  data.tar.gz: 12ecfa266d5c7cafc1a6656bb54d5429ecb030c2b89af8d61a2dcd6587f8bc1ff6f94221a4f185d9e463a96df652d2434adec0c59a78288bc44dda087c67ca12

data/CHANGELOG.mkd

@@ -4,6 +4,12 @@ CHANGELOG
 Unreleased
 ----------
 
+3.12.1
+------
+
+- Fix requiring individual R10K::Actions without having already required 'r10k'. [#1223](https://github.com/puppetlabs/r10k/issues/1223)
+- Fix evaluation of Puppetfiles that include local modules. [#1224](https://github.com/puppetlabs/r10k/pull/1224)
+
 3.12.0
 ------
 

data/lib/r10k/action/base.rb

@@ -1,5 +1,5 @@
-require 'r10k/util/setopts'
 require 'r10k/logging'
+require 'r10k/util/setopts'
 
 module R10K
   module Action

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

@@ -1,8 +1,12 @@
+require 'r10k/logging'
+
 module R10K
   module Action
     module Deploy
       module DeployHelpers
 
+        include R10K::Logging
+
         # Ensure that a config file has been found (and presumably loaded) and exit
         # with a helpful error if it hasn't.
         #

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

@@ -1,6 +1,6 @@
-require 'r10k/deployment'
 require 'r10k/action/base'
 require 'r10k/action/deploy/deploy_helpers'
+require 'r10k/deployment'
 
 module R10K
   module Action

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

@@ -1,10 +1,9 @@
-require 'r10k/util/setopts'
-require 'r10k/util/cleaner'
-require 'r10k/deployment'
-require 'r10k/logging'
-require 'r10k/action/visitor'
 require 'r10k/action/base'
 require 'r10k/action/deploy/deploy_helpers'
+require 'r10k/action/visitor'
+require 'r10k/deployment'
+require 'r10k/util/setopts'
+
 require 'json'
 
 module R10K
@@ -13,6 +12,7 @@ module R10K
       class Environment < R10K::Action::Base
 
         include R10K::Action::Deploy::DeployHelpers
+        include R10K::Action::Visitor
 
         # Deprecated
         attr_reader :force
@@ -81,8 +81,6 @@ module R10K
           @visit_ok
         end
 
-        include R10K::Action::Visitor
-
         private
 
         def read_purge_allowlist (whitelist, allowlist)

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

@@ -1,7 +1,7 @@
-require 'r10k/deployment'
-require 'r10k/action/visitor'
 require 'r10k/action/base'
 require 'r10k/action/deploy/deploy_helpers'
+require 'r10k/action/visitor'
+require 'r10k/deployment'
 
 module R10K
   module Action
@@ -9,6 +9,7 @@ module R10K
       class Module < R10K::Action::Base
 
         include R10K::Action::Deploy::DeployHelpers
+        include R10K::Action::Visitor
 
         # Deprecated
         attr_reader :force
@@ -69,8 +70,6 @@ module R10K
           @visit_ok
         end
 
-        include R10K::Action::Visitor
-
         private
 
         def visit_deployment(deployment)

data/lib/r10k/action/visitor.rb

@@ -1,4 +1,5 @@
 require 'r10k/errors/formatting'
+require 'r10k/logging'
 
 module R10K
   module Action
@@ -13,6 +14,8 @@ module R10K
     # @api private
     module Visitor
 
+      include R10K::Logging
+
       # Dispatch to the type specific visitor method
       #
       # @param type [Symbol] The object type to dispatch for

data/lib/r10k/module/local.rb

@@ -11,10 +11,14 @@ class R10K::Module::Local < R10K::Module::Base
     args.is_a?(Hash) && (args[:local] || args[:type].to_s == 'local')
   end
 
-  def version
+  def self.statically_defined_version(*)
     "0.0.0"
   end
 
+  def version
+    self.class.statically_defined_version
+  end
+
   def properties
     {
       :expected => "0.0.0 (local)",

data/lib/r10k/module_loader/puppetfile.rb

@@ -1,5 +1,9 @@
+require 'r10k/errors'
 require 'r10k/logging'
 require 'r10k/module'
+require 'r10k/module_loader/puppetfile/dsl'
+
+require 'pathname'
 
 module R10K
   module ModuleLoader

data/lib/r10k/util/purgeable.rb

@@ -1,3 +1,5 @@
+require 'r10k/logging'
+
 require 'fileutils'
 
 module R10K
@@ -9,6 +11,8 @@ module R10K
     #   {#desired_contents}
     module Purgeable
 
+      include R10K::Logging
+
       HIDDEN_FILE = /\.[^.]+/
 
       FN_MATCH_OPTS = File::FNM_PATHNAME | File::FNM_DOTMATCH

data/lib/r10k/util/setopts.rb

@@ -1,3 +1,5 @@
+require 'r10k/logging'
+
 module R10K
   module Util
 

data/lib/r10k/util/subprocess.rb

@@ -1,3 +1,4 @@
+require 'r10k/logging'
 require 'r10k/util/platform'
 
 module R10K

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.12.0'
+  VERSION = '3.12.1'
 end

data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile

@@ -7,3 +7,4 @@ mod 'bar', git: 'this/remote', tag: 'v1.2.3'
 mod 'baz', git: 'this/remote', commit: '123abc456'
 mod 'fizz', git: 'this/remote', ref: '1234567890abcdef1234567890abcdef12345678'
 mod 'buzz', git: 'this/remote', ref: 'refs/heads/main'
+mod 'canary', local: true

data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new

@@ -7,3 +7,4 @@ mod 'bar', git: 'this/remote', tag: 'v1.2.3'
 mod 'baz', git: 'this/remote', commit: '123abc456'
 mod 'fizz', git: 'this/remote', ref: '1234567890abcdef1234567890abcdef12345678'
 mod 'buzz', git: 'this/remote', ref: 'refs/heads/main'
+mod 'canary', local: true

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -366,6 +366,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(metadata['baz']).to eq('123abc456')
         expect(metadata['fizz']).to eq('1234567890abcdef1234567890abcdef12345678')
         expect(metadata['buzz']).to eq(nil)
+        expect(metadata['canary']).to eq('0.0.0')
       end
 
       it 'does not load module implementations for static versioned' do
@@ -381,6 +382,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(modules['baz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['fizz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['buzz']).to be_a_kind_of(R10K::Module::Git)
+        expect(modules['canary']).to be_a_kind_of(R10K::Module::Definition)
       end
 
       it 'loads module implementations whose static versions are different' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2