r10k 3.11.0 → 3.12.0

data/lib/r10k/module/git.rb

@@ -13,6 +13,21 @@ class R10K::Module::Git < R10K::Module::Base
     false
   end
 
+  # Will be called if self.implement? above returns true. Will return
+  # the version info, if version is statically defined in the modules
+  # declaration.
+  def self.statically_defined_version(name, args)
+    if !args[:type] && (args[:ref] || args[:tag] || args[:commit])
+      if args[:ref] && args[:ref].to_s.match(/[0-9a-f]{40}/)
+        args[:ref]
+      else
+        args[:tag] || args[:commit]
+      end
+    elsif args[:type].to_s == 'git' && args[:version] && args[:version].to_s.match(/[0-9a-f]{40}/)
+      args[:version]
+    end
+  end
+
   # @!attribute [r] repo
   #   @api private
   #   @return [R10K::Git::StatefulRepository]
@@ -83,10 +98,16 @@ class R10K::Module::Git < R10K::Module::Base
   end
 
   # @param [Hash] opts Deprecated
+  # @return [Boolean] true if the module was updated, false otherwise
   def sync(opts={})
     force = opts[:force] || @force
-    @repo.sync(version, force) if should_sync?
+    if should_sync?
+      updated = @repo.sync(version, force)
+    else
+      updated = false
+    end
     maybe_delete_spec_dir
+    updated
   end
 
   def status

data/lib/r10k/module/local.rb

@@ -1,5 +1,4 @@
 require 'r10k/module'
-require 'r10k/logging'
 
 # A dummy module type that can be used to "protect" Puppet modules that exist
 # inside of the Puppetfile "moduledir" location. Local modules will not be
@@ -12,8 +11,6 @@ class R10K::Module::Local < R10K::Module::Base
     args.is_a?(Hash) && (args[:local] || args[:type].to_s == 'local')
   end
 
-  include R10K::Logging
-
   def version
     "0.0.0"
   end
@@ -31,7 +28,9 @@ class R10K::Module::Local < R10K::Module::Base
   end
 
   # @param [Hash] opts Deprecated
+  # @return [Boolean] false, because local modules are always considered in-sync
   def sync(opts={})
     logger.debug1 _("Module %{title} is a local module, always indicating synced.") % {title: title}
+    false
   end
 end

data/lib/r10k/module/svn.rb

@@ -10,6 +10,10 @@ class R10K::Module::SVN < R10K::Module::Base
     args.has_key?(:svn) || args[:type].to_s == 'svn'
   end
 
+  def self.statically_defined_version(name, args)
+    nil
+  end
+
   # @!attribute [r] expected_revision
   #   @return [String] The SVN revision that the repo should have checked out
   attr_reader :expected_revision
@@ -70,18 +74,24 @@ class R10K::Module::SVN < R10K::Module::Base
   end
 
   # @param [Hash] opts Deprecated
+  # @return [Boolean] true if the module was updated, false otherwise
   def sync(opts={})
+    updated = false
     if should_sync?
       case status
       when :absent
         install
+        updated = true
       when :mismatched
         reinstall
+        updated = true
       when :outdated
         update
+        updated = true
       end
       maybe_delete_spec_dir
     end
+    updated
   end
 
   def exist?

data/lib/r10k/module.rb

@@ -22,17 +22,35 @@ module R10K::Module
   #
   # @return [Object < R10K::Module] A member of the implementing subclass
   def self.new(name, basedir, args, environment=nil)
+    with_implementation(name, args) do |implementation|
+      implementation.new(name, basedir, args, environment)
+    end
+  end
+
+  # Takes the same signature as Module.new but returns an metadata module
+  def self.from_metadata(name, basedir, args, environment=nil)
+    with_implementation(name, args) do |implementation|
+      R10K::Module::Definition.new(name,
+                                   dirname: basedir,
+                                   args: args,
+                                   implementation: implementation,
+                                   environment: environment)
+    end
+  end
+
+  def self.with_implementation(name, args, &block)
     if implementation = @klasses.find { |klass| klass.implement?(name, args) }
-      obj = implementation.new(name, basedir, args, environment)
-      obj
+      block.call(implementation)
     else
       raise _("Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)") % {name: name, args: args.inspect}
     end
   end
 
+
   require 'r10k/module/base'
   require 'r10k/module/git'
   require 'r10k/module/svn'
   require 'r10k/module/local'
   require 'r10k/module/forge'
+  require 'r10k/module/definition'
 end

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

@@ -6,8 +6,9 @@ module R10K
         #
         # @api private
 
-        def initialize(librarian)
-          @librarian = librarian
+        def initialize(librarian, metadata_only: false)
+          @librarian     = librarian
+          @metadata_only = metadata_only
         end
 
         def mod(name, args = nil)
@@ -17,7 +18,11 @@ module R10K
             opts = { version: args }
           end
 
-          @librarian.add_module(name, opts)
+          if @metadata_only
+            @librarian.add_module_metadata(name, opts)
+          else
+            @librarian.add_module(name, opts)
+          end
         end
 
         def forge(location)

data/lib/r10k/module_loader/puppetfile.rb

@@ -1,4 +1,5 @@
 require 'r10k/logging'
+require 'r10k/module'
 
 module R10K
   module ModuleLoader
@@ -8,7 +9,6 @@ module R10K
 
       DEFAULT_MODULEDIR = 'modules'
       DEFAULT_PUPPETFILE_NAME = 'Puppetfile'
-      DEFAULT_FORGE_API = 'forgeapi.puppetlabs.com'
 
       attr_accessor :default_branch_override, :environment
       attr_reader :modules, :moduledir, :puppetfile_path,
@@ -28,34 +28,40 @@ module R10K
       def initialize(basedir:,
                      moduledir: DEFAULT_MODULEDIR,
                      puppetfile: DEFAULT_PUPPETFILE_NAME,
-                     forge: DEFAULT_FORGE_API,
                      overrides: {},
                      environment: nil)
 
         @basedir     = cleanpath(basedir)
         @moduledir   = resolve_path(@basedir, moduledir)
         @puppetfile_path  = resolve_path(@basedir, puppetfile)
-        @forge       = forge
         @overrides   = overrides
         @environment = environment
         @default_branch_override = @overrides.dig(:environments, :default_branch_override)
+        @allow_puppetfile_forge = @overrides.dig(:forge, :allow_puppetfile_override)
 
+        @existing_module_metadata = []
+        @existing_module_versions_by_name = {}
         @modules = []
 
         @managed_directories = []
         @desired_contents = []
         @purge_exclusions = []
+      end
+
+      def load
+        with_readable_puppetfile(@puppetfile_path) do
+          self.load!
+        end
+      end
 
+      def load!
         logger.info _("Using Puppetfile '%{puppetfile}'") % {puppetfile: @puppetfile_path}
         logger.debug _("Using moduledir '%{moduledir}'") % {moduledir: @moduledir}
-      end
 
-      def load
         dsl = R10K::ModuleLoader::Puppetfile::DSL.new(self)
         dsl.instance_eval(puppetfile_content(@puppetfile_path), @puppetfile_path)
 
         validate_no_duplicate_names(@modules)
-        @modules
 
         managed_content = @modules.group_by(&:dirname)
 
@@ -74,6 +80,30 @@ module R10K
         raise R10K::Error.wrap(e, _("Failed to evaluate %{path}") % {path: @puppetfile_path})
       end
 
+      def load_metadata
+        with_readable_puppetfile(@puppetfile_path) do
+          self.load_metadata!
+        end
+      end
+
+      def load_metadata!
+        dsl = R10K::ModuleLoader::Puppetfile::DSL.new(self, metadata_only: true)
+        dsl.instance_eval(puppetfile_content(@puppetfile_path), @puppetfile_path)
+
+        @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
+        logger.warn _("Unable to preload Puppetfile because of %{msg}" % { msg: e.message })
+      end
+
+      def add_module_metadata(name, info)
+        install_path, metadata_info, _ = parse_module_definition(name, info)
+
+        mod = R10K::Module.from_metadata(name, install_path, metadata_info, @environment)
+
+        @existing_module_metadata << mod
+      end
 
       ##
       ## set_forge, set_moduledir, and add_module are used directly by the DSL class
@@ -81,7 +111,12 @@ module R10K
 
       # @param [String] forge
       def set_forge(forge)
-        @forge = forge
+        if @allow_puppetfile_forge
+          logger.debug _("Using Forge from Puppetfile: %{forge}") % { forge: forge }
+          PuppetForge.host = forge
+        else
+          logger.debug _("Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}.") % { forge: PuppetForge.host }
+        end
       end
 
       # @param [String] moduledir
@@ -90,7 +125,7 @@ module R10K
       end
 
       # @param [String] name
-      # @param [Hash, String, Symbol, nil] module_info Calling with
+      # @param [Hash, String, Symbol, nil] info Calling with
       #   anything but a Hash is deprecated. The DSL will now convert
       #   String and Symbol versions to Hashes of the shape
       #     { version: <String or Symbol> }
@@ -103,28 +138,10 @@ module R10K
       #   DSL class, not the Puppetfile author) to do this conversion
       #   itself.
       #
-      def add_module(name, module_info)
-        if !module_info.is_a?(Hash)
-          module_info = { version: module_info }
-        end
-
-        module_info[:overrides] = @overrides
-
-        spec_deletable = false
-
-        if install_path = module_info.delete(:install_path)
-          install_path = resolve_path(@basedir, install_path)
-          validate_install_path(install_path, name)
-        else
-          install_path = @moduledir
-          spec_deletable = true
-        end
-
-        if @default_branch_override
-          module_info[:default_branch_override] = @default_branch_override
-        end
+      def add_module(name, info)
+        install_path, metadata_info, spec_deletable = parse_module_definition(name, info)
 
-        mod = R10K::Module.new(name, install_path, module_info, @environment)
+        mod = R10K::Module.from_metadata(name, install_path, metadata_info, @environment)
         mod.origin = :puppetfile
         mod.spec_deletable = spec_deletable
 
@@ -134,11 +151,60 @@ 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
+        end
+
         @modules << mod
       end
 
      private
 
+      def empty_load_output
+        {
+          modules: [],
+          managed_directories: [],
+          desired_contents: [],
+          purge_exclusions: []
+        }
+      end
+
+      def with_readable_puppetfile(puppetfile_path, &block)
+        if File.readable?(puppetfile_path)
+          block.call
+        else
+          logger.debug _("Puppetfile %{path} missing or unreadable") % {path: puppetfile_path.inspect}
+
+          empty_load_output
+        end
+      end
+
+      def parse_module_definition(name, info)
+        if !info.is_a?(Hash)
+          info = { version: info }
+        end
+
+        info[:overrides] = @overrides
+
+        if @default_branch_override
+          info[:default_branch_override] = @default_branch_override
+        end
+
+        spec_deletable = false
+        if install_path = info.delete(:install_path)
+          install_path = resolve_path(@basedir, install_path)
+          validate_install_path(install_path, name)
+        else
+          install_path = @moduledir
+          spec_deletable = true
+        end
+
+        return [ install_path, info, spec_deletable ]
+      end
+
       # @param [Array<R10K::Module>] modules
       def validate_no_duplicate_names(modules)
         dupes = modules

data/lib/r10k/puppetfile.rb

@@ -78,7 +78,6 @@ class Puppetfile
       basedir: @basedir,
       moduledir: @moduledir,
       puppetfile: @puppetfile,
-      forge: @forge,
       overrides: @overrides,
       environment: @environment
     )
@@ -120,7 +119,7 @@ class Puppetfile
       @loader.default_branch_override = default_branch_override
     end
 
-    @loaded_content = @loader.load
+    @loaded_content = @loader.load!
     @loaded = true
 
     @loaded_content

data/lib/r10k/settings.rb

@@ -126,8 +126,19 @@ module R10K
         URIDefinition.new(:baseurl, {
           :desc => "The URL to the Puppet Forge to use for downloading modules."
         }),
+
         Definition.new(:authorization_token, {
           :desc => "The token for Puppet Forge authorization. Leave blank for unauthorized or license-based connections."
+        }),
+
+        Definition.new(:allow_puppetfile_override, {
+          :desc => "Whether to use `forge` declarations in the Puppetfile as an override of `baseurl`.",
+          :default => false,
+          :validate => lambda do |value|
+            unless !!value == value
+              raise ArgumentError, "`allow_puppetfile_override` can only be a boolean value, not '#{value}'"
+            end
+          end
         })
       ])
     end

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.11.0'
+  VERSION = '3.12.0'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-75-ge9bdb69\n"
+"Project-Id-Version: r10k 3.9.3-110-gfe65c736\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2021-08-13 23:48+0000\n"
-"PO-Revision-Date: 2021-08-13 23:48+0000\n"
+"POT-Creation-Date: 2021-09-15 21:23+0000\n"
+"PO-Revision-Date: 2021-09-15 21:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,35 +31,47 @@ msgstr ""
 msgid "Reason: %{write_lock}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:113
+#: ../lib/r10k/action/deploy/environment.rb:118
 msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:146
+#: ../lib/r10k/action/deploy/environment.rb:138
+msgid "Executing postrun command."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:152
 msgid "Environment %{env_dir} does not match environment name filter, skipping"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:154
+#: ../lib/r10k/action/deploy/environment.rb:160
 msgid "Deploying environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:157
+#: ../lib/r10k/action/deploy/environment.rb:163
 msgid "Environment %{env_dir} is now at %{env_signature}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:161
+#: ../lib/r10k/action/deploy/environment.rb:167
 msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:98
+#: ../lib/r10k/action/deploy/module.rb:82
+msgid "Running postrun command for environments: %{envs_to_run}."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:92
+msgid "No environments were modified, not executing postrun command."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:104
 msgid "Only updating modules in environment(s) %{opt_env} skipping environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:100
+#: ../lib/r10k/action/deploy/module.rb:106
 msgid "Updating modules %{modules} in environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/check.rb:16
+#: ../lib/r10k/action/puppetfile/check.rb:18
 msgid "Syntax OK"
 msgstr ""
 
@@ -75,15 +87,15 @@ msgstr ""
 msgid "No config file explicitly given and no default config file could be found, default settings will be used."
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:27
+#: ../lib/r10k/content_synchronizer.rb:33
 msgid "Updating modules with %{pool_size} threads"
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:37
+#: ../lib/r10k/content_synchronizer.rb:46
 msgid "Error during concurrent deploy of a module: %{message}"
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:75
+#: ../lib/r10k/content_synchronizer.rb:87
 msgid "Module thread %{id} exiting: %{message}"
 msgstr ""
 
@@ -95,7 +107,7 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/base.rb:68 ../lib/r10k/environment/base.rb:84 ../lib/r10k/environment/base.rb:93 ../lib/r10k/source/base.rb:83
+#: ../lib/r10k/environment/base.rb:89 ../lib/r10k/environment/base.rb:105 ../lib/r10k/environment/base.rb:114 ../lib/r10k/source/base.rb:83
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
@@ -103,15 +115,15 @@ msgstr ""
 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 ""
 
-#: ../lib/r10k/environment/with_modules.rb:57
+#: ../lib/r10k/environment/with_modules.rb:60
 msgid "Environment and %{src} both define the \"%{name}\" module"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:58
+#: ../lib/r10k/environment/with_modules.rb:61
 msgid "#{msg_error}. The %{src} definition will be ignored"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:68
+#: ../lib/r10k/environment/with_modules.rb:71
 msgid "Unexpected value for `module_conflicts` setting in %{env} environment: %{val}"
 msgstr ""
 
@@ -323,31 +335,31 @@ msgstr ""
 msgid "Found local modifications in %{file_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:44
+#: ../lib/r10k/git/stateful_repository.rb:45
 msgid "Unable to sync repo to unresolvable ref '%{ref}'"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:51
+#: ../lib/r10k/git/stateful_repository.rb:53
 msgid "Cloning %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:54
+#: ../lib/r10k/git/stateful_repository.rb:56
 msgid "Replacing %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:58 ../lib/r10k/git/stateful_repository.rb:63
+#: ../lib/r10k/git/stateful_repository.rb:60 ../lib/r10k/git/stateful_repository.rb:65
 msgid "Updating %{repo_path} to %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:62
+#: ../lib/r10k/git/stateful_repository.rb:64
 msgid "Overwriting local modifications to %{repo_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:66
+#: ../lib/r10k/git/stateful_repository.rb:68
 msgid "Skipping %{repo_path} due to local modifications"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:69
+#: ../lib/r10k/git/stateful_repository.rb:72
 msgid "%{repo_path} is already at Git ref %{ref}"
 msgstr ""
 
@@ -367,51 +379,55 @@ msgstr ""
 msgid "Invalid log level '%{val}'. Valid levels are %{log_levels}"
 msgstr ""
 
-#: ../lib/r10k/module.rb:29
+#: ../lib/r10k/module.rb:45
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:80
+#: ../lib/r10k/module/base.rb:83
 msgid "Spec dir for #{@title} will not be deleted because it is not in the moduledir"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:92
+#: ../lib/r10k/module/base.rb:95
 msgid "Deleting spec data at #{spec_path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:100
+#: ../lib/r10k/module/base.rb:103
 msgid "No spec dir detected at #{spec_path}, skipping deletion"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:112
+#: ../lib/r10k/module/base.rb:116
 msgid "Deploying module to %{path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:115
+#: ../lib/r10k/module/base.rb:119
 msgid "Only updating modules %{modules}, skipping module %{name}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:171
+#: ../lib/r10k/module/base.rb:175
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:90
+#: ../lib/r10k/module/definition.rb:28
+msgid "Not updating module %{name}, assuming content unchanged"
+msgstr ""
+
+#: ../lib/r10k/module/forge.rb:98
 msgid "The module %{title} does not appear to have any published releases, cannot determine latest version."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:93 ../lib/r10k/module/forge.rb:122
+#: ../lib/r10k/module/forge.rb:101 ../lib/r10k/module/forge.rb:130
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:197
+#: ../lib/r10k/module/forge.rb:205
 msgid "Forge module names must match 'owner/modulename', instead got #{title}"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:66
+#: ../lib/r10k/module/git.rb:81
 msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
 
-#: ../lib/r10k/module/local.rb:35
+#: ../lib/r10k/module/local.rb:33
 msgid "Module %{title} is a local module, always indicating synced."
 msgstr ""
 
@@ -419,34 +435,46 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:49
+#: ../lib/r10k/module_loader/puppetfile.rb:58
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:50
+#: ../lib/r10k/module_loader/puppetfile.rb:59
 msgid "Using moduledir '%{moduledir}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:74
+#: ../lib/r10k/module_loader/puppetfile.rb:80
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:149
-msgid "Puppetfiles cannot contain duplicate module names."
+#: ../lib/r10k/module_loader/puppetfile.rb:97
+msgid "Unable to preload Puppetfile because of %{msg}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:151
-msgid "Remove the duplicates of the following modules: %{dupes}"
+#: ../lib/r10k/module_loader/puppetfile.rb:115
+msgid "Using Forge from Puppetfile: %{forge}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile/dsl.rb:32
-msgid "unrecognized declaration '%{method}'"
+#: ../lib/r10k/module_loader/puppetfile.rb:118
+msgid "Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}."
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:105
+#: ../lib/r10k/module_loader/puppetfile.rb:179 ../lib/r10k/puppetfile.rb:104
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
+#: ../lib/r10k/module_loader/puppetfile.rb:215
+msgid "Puppetfiles cannot contain duplicate module names."
+msgstr ""
+
+#: ../lib/r10k/module_loader/puppetfile.rb:217
+msgid "Remove the duplicates of the following modules: %{dupes}"
+msgstr ""
+
+#: ../lib/r10k/module_loader/puppetfile/dsl.rb:37
+msgid "unrecognized declaration '%{method}'"
+msgstr ""
+
 #: ../lib/r10k/settings/collection.rb:77
 msgid "Validation failed for '%{name}' settings group"
 msgstr ""