puppet 3.8.7 → 4.0.0

data/lib/puppet/interface/action_manager.rb

@@ -29,18 +29,6 @@ module Puppet::Interface::ActionManager
     @actions[action.name] = action
   end
 
-  # Defines an action without using ActionBuilder. The block given is
-  # the code that will be executed when the action is invoked.
-  # @api public
-  # @deprecated
-  def script(name, &block)
-    @actions ||= {}
-    Puppet.warning "Redefining action #{name} for #{self}" if action?(name)
-
-    # REVISIT: (#18048) it's possible to create multiple default actions
-    @actions[name] = Puppet::Interface::Action.new(self, name, :when_invoked => block)
-  end
-
   # Returns the list of available actions for this face.
   # @return [Array<Symbol>] The names of the actions for this face
   # @api private
@@ -56,7 +44,7 @@ module Puppet::Interface::ActionManager
     # We need to uniq the result, because we duplicate actions when they are
     # fetched to ensure that they have the correct bindings; they shadow the
     # parent, and uniq implements that. --daniel 2011-06-01
-    result.uniq.sort
+    (result - @deactivated_actions.to_a).uniq.sort
   end
 
   # Retrieves a named action
@@ -94,6 +82,14 @@ module Puppet::Interface::ActionManager
     default.first
   end
 
+  # Deactivate a named action
+  # @return [Puppet::Interface::Action]
+  # @api public
+  def deactivate_action(name)
+    @deactivated_actions ||= Set.new
+    @deactivated_actions.add name.to_sym
+  end
+
   # @api private
   def action?(name)
     actions.include?(name.to_sym)

data/lib/puppet/interface/face_collection.rb

@@ -27,8 +27,8 @@ module Puppet::Interface::FaceCollection
       # ...we need to search for it bound to an o{lder,ther} version.  Since
       # we load all actions when the face is first references, this will be in
       # memory in the known set of versions of the face.
-      (@faces[name].keys - [ :current ]).sort.reverse.each do |version|
-        break if action = @faces[name][version].get_action(action_name)
+      (@faces[name].keys - [ :current ]).sort.reverse.each do |vers|
+        break if action = @faces[name][vers].get_action(action_name)
       end
     end
 

data/lib/puppet/interface/option_builder.rb

@@ -83,9 +83,7 @@ class Puppet::Interface::OptionBuilder
     if @option.has_default?
       raise ArgumentError, "#{@option} already has a default value"
     end
-    # Ruby 1.8 treats a block without arguments as accepting any number; 1.9
-    # gets this right, so we work around it for now... --daniel 2011-07-20
-    unless block.arity == 0 or (RUBY_VERSION =~ /^1\.8/ and block.arity == -1)
+    unless block.arity == 0
       raise ArgumentError, "#{@option} default_to block should not take any arguments"
     end
     @option.default = block

data/lib/puppet/interface.rb

@@ -31,13 +31,6 @@ class Puppet::Interface
     # This is just so we can search for actions.  We only use its
     # list of directories to search.
 
-    # @api private
-    # @deprecated
-    def autoloader
-      Puppet.deprecation_warning("Puppet::Interface.autoloader is deprecated; please use Puppet::Interface#loader instead")
-      @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/face")
-    end
-
     # Lists all loaded faces
     # @return [Array<Symbol>] The names of the loaded faces
     def faces

data/lib/puppet/metatype/manager.rb

@@ -83,12 +83,6 @@ module Manager
 
     options = symbolize_options(options)
 
-
-    if options.include?(:parent) 
-      Puppet.deprecation_warning "option :parent is deprecated. It has no effect"
-      options.delete(:parent)
-    end
-
     # Then create the class.
 
     klass = genclass(
@@ -174,7 +168,7 @@ module Manager
   # @api private
   def typeloader
     unless defined?(@typeloader)
-      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type", :wrap => false)
+      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type")
     end
 
     @typeloader

data/lib/puppet/module.rb

@@ -33,6 +33,25 @@ class Puppet::Module
     env.module(modname)
   end
 
+  def self.is_module_directory?(name, path)
+    # it must be a directory
+    fullpath = File.join(path, name)
+    return false unless Puppet::FileSystem.directory?(fullpath)
+    return is_module_directory_name?(name)
+  end
+
+  def self.is_module_directory_name?(name)
+    # it must match an installed module name according to forge validator
+    return true if name =~ /^[a-z][a-z0-9_]*$/
+    return false
+  end
+
+  def self.is_module_namespaced_name?(name)
+    # it must match the full module name according to forge validator
+    return true if name =~ /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/   
+    return false
+  end
+
   attr_reader :name, :environment, :path, :metadata
   attr_writer :environment
 
@@ -124,14 +143,9 @@ class Puppet::Module
         end
       end
 
-      # NOTICE: The fallback to `versionRequirement` is something we'd like to
-      # not have to support, but we have a reasonable number of releases that
-      # don't use `version_requirement`. When we can deprecate this, we should.
       if attr == :dependencies
-        value.tap do |dependencies|
-          dependencies.each do |dep|
-            dep['version_requirement'] ||= dep['versionRequirement'] || '>= 0.0.0'
-          end
+        value.each do |dep|
+          dep['version_requirement'] ||= '>= 0.0.0'
         end
       end
 
@@ -140,7 +154,7 @@ class Puppet::Module
   end
 
   # Return the list of manifests matching the given glob pattern,
-  # defaulting to 'init.{pp,rb}' for empty modules.
+  # defaulting to 'init.pp' for empty modules.
   def match_manifests(rest)
     if rest
       wanted_manifests = wanted_manifests_from(rest)
@@ -150,14 +164,17 @@ class Puppet::Module
     end
 
     # (#4220) Always ensure init.pp in case class is defined there.
-    init_manifests = [manifest("init.pp"), manifest("init.rb")].compact
-    init_manifests + searched_manifests
+    init_manifest = manifest("init.pp")
+    if !init_manifest.nil? && !searched_manifests.include?(init_manifest)
+      searched_manifests.unshift(init_manifest)
+    end
+    searched_manifests
   end
 
   def all_manifests
     return [] unless Puppet::FileSystem.exist?(manifests)
 
-    Dir.glob(File.join(manifests, '**', '*.{rb,pp}'))
+    Dir.glob(File.join(manifests, '**', '*.pp'))
   end
 
   def metadata_file
@@ -210,19 +227,6 @@ class Puppet::Module
     environment.module_requirements[self.forge_name] || {}
   end
 
-  def has_local_changes?
-    Puppet.deprecation_warning("This method is being removed.")
-    require 'puppet/module_tool/applications'
-    changes = Puppet::ModuleTool::Applications::Checksummer.run(path)
-    !changes.empty?
-  end
-
-  def local_changes
-    Puppet.deprecation_warning("This method is being removed.")
-    require 'puppet/module_tool/applications'
-    Puppet::ModuleTool::Applications::Checksummer.run(path)
-  end
-
   # Identify and mark unmet dependencies.  A dependency will be marked unmet
   # for the following reasons:
   #
@@ -254,7 +258,8 @@ class Puppet::Module
     return unmet_dependencies unless dependencies
 
     dependencies.each do |dependency|
-      forge_name = dependency['name']
+      name = dependency['name']
+      forge_name = name.tr('-', '/')
       version_string = dependency['version_requirement'] || '>= 0.0.0'
 
       dep_mod = begin
@@ -264,7 +269,7 @@ class Puppet::Module
       end
 
       error_details = {
-        :name => forge_name,
+        :name => name,
         :version_constraint => version_string.gsub(/^(?=\d)/, "v"),
         :parent => {
           :name => self.forge_name,
@@ -307,11 +312,18 @@ class Puppet::Module
     raise IncompatibleModule, "Module #{self.name} is only compatible with Puppet version #{puppetversion}, not #{Puppet.version}"
   end
 
+  def ==(other)
+    self.name == other.name &&
+    self.version == other.version &&
+    self.path == other.path &&
+    self.environment == other.environment
+  end
+
   private
 
   def wanted_manifests_from(pattern)
     begin
-      extended = File.extname(pattern).empty? ? "#{pattern}.{pp,rb}" : pattern
+      extended = File.extname(pattern).empty? ? "#{pattern}.pp" : pattern
       relative_pattern = Puppet::FileSystem::PathPattern.relative(extended)
     rescue Puppet::FileSystem::PathPattern::InvalidPattern => error
       raise Puppet::Module::InvalidFilePattern.new(
@@ -327,13 +339,8 @@ class Puppet::Module
   end
 
   def assert_validity
-    raise InvalidName, "Invalid module name #{name}; module names must be alphanumeric (plus '-'), not '#{name}'" unless name =~ /^[-\w]+$/
-  end
-
-  def ==(other)
-    self.name == other.name &&
-    self.version == other.version &&
-    self.path == other.path &&
-    self.environment == other.environment
+    if !Puppet::Module.is_module_directory_name?(@name) && !Puppet::Module.is_module_namespaced_name?(@name)
+      raise InvalidName, "Invalid module name #{@name}; module names must be alphanumeric (plus '-'), not '#{@name}'"
+    end
   end
 end

data/lib/puppet/module_tool/applications/application.rb

@@ -41,10 +41,9 @@ module Puppet::ModuleTool
         end
 
         if require_metadata && !Puppet::ModuleTool.is_module_root?(@path)
-          raise ArgumentError, "Unable to find metadata.json or Modulefile in module root at #{@path} See http://links.puppetlabs.com/modulefile for required file format."
+          raise ArgumentError, "Unable to find metadata.json in module root at #{@path} See https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html for required file format."
         end
 
-        modulefile_path = File.join(@path, 'Modulefile')
         metadata_path   = File.join(@path, 'metadata.json')
 
         if File.file?(metadata_path)
@@ -57,14 +56,8 @@ module Puppet::ModuleTool
           end
         end
 
-        if File.file?(modulefile_path)
-          if File.file?(metadata_path)
-            Puppet.warning "Modulefile is deprecated. Merging your Modulefile and metadata.json."
-          else
-            Puppet.warning "Modulefile is deprecated. Building metadata.json from Modulefile."
-          end
-
-          Puppet::ModuleTool::ModulefileReader.evaluate(@metadata, modulefile_path)
+        if File.file?(File.join(@path, 'Modulefile'))
+          Puppet.warning "A Modulefile was found in the root directory of the module. This file will be ignored and can safely be removed."
         end
 
         return @metadata

data/lib/puppet/module_tool/applications/installer.rb

@@ -57,11 +57,11 @@ module Puppet::ModuleTool
         results = { :action => :install, :module_name => name, :module_version => version }
 
         begin
-          if mod = installed_modules[name]
+          if installed_module = installed_modules[name]
             unless forced?
-              if Semantic::VersionRange.parse(version).include? mod.version
+              if Semantic::VersionRange.parse(version).include? installed_module.version
                 results[:result] = :noop
-                results[:version] = mod.version
+                results[:version] = installed_module.version
                 return results
               else
                 changes = Checksummer.run(installed_modules[name].mod.path) rescue []
@@ -101,19 +101,17 @@ module Puppet::ModuleTool
               # Since upgrading already installed modules can be troublesome,
               # we'll place constraints on the graph for each installed module,
               # locking it to upgrades within the same major version.
-              ">=#{version} #{version.major}.x".tap do |range|
-                graph.add_constraint('installed', mod, range) do |node|
-                  Semantic::VersionRange.parse(range).include? node.version
-                end
+              installed_range = ">=#{version} #{version.major}.x"
+              graph.add_constraint('installed', mod, installed_range) do |node|
+                Semantic::VersionRange.parse(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
                 dep_name = dep['name'].tr('/', '-')
 
-                dep['version_requirement'].tap do |range|
-                  graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                    Semantic::VersionRange.parse(range).include? node.version
-                  end
+                range = dep['version_requirement']
+                graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
+                  Semantic::VersionRange.parse(range).include? node.version
                 end
               end
             end
@@ -135,8 +133,8 @@ module Puppet::ModuleTool
           unless forced?
             # Check for module name conflicts.
             releases.each do |rel|
-              if mod = installed_modules_source.by_name[rel.name.split('-').last]
-                next if mod.has_metadata? && mod.forge_name.tr('/', '-') == rel.name
+              if installed_module = installed_modules_source.by_name[rel.name.split('-').last]
+                next if installed_module.has_metadata? && installed_module.forge_name.tr('/', '-') == rel.name
 
                 if rel.name != name
                   dependency = {
@@ -149,8 +147,8 @@ module Puppet::ModuleTool
                   :requested_module  => name,
                   :requested_version => options[:version] || 'latest',
                   :dependency        => dependency,
-                  :directory         => mod.path,
-                  :metadata          => mod.metadata
+                  :directory         => installed_module.path,
+                  :metadata          => installed_module.metadata
               end
             end
           end

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -93,7 +93,7 @@ module Puppet::ModuleTool
       # @api private
       # @return [String] path to temporary unpacking location
       def tmpdir
-        @dir ||= Dir.mktmpdir('tmp', Puppet::Forge::Cache.base_path)
+        @dir ||= Dir.mktmpdir('tmp-unpacker', Puppet::Forge::Cache.base_path)
       end
     end
   end

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -107,9 +107,9 @@ module Puppet::ModuleTool
             add_module_name_constraints_to_graph(graph)
           end
 
-          installed_modules.each do |mod, release|
-            mod = mod.tr('/', '-')
-            next if mod == name
+          installed_modules.each do |installed_module, release|
+            installed_module = installed_module.tr('/', '-')
+            next if installed_module == name
 
             version = release.version
 
@@ -117,19 +117,17 @@ module Puppet::ModuleTool
               # Since upgrading already installed modules can be troublesome,
               # we'll place constraints on the graph for each installed
               # module, locking it to upgrades within the same major version.
-              ">=#{version} #{version.major}.x".tap do |range|
-                graph.add_constraint('installed', mod, range) do |node|
-                  Semantic::VersionRange.parse(range).include? node.version
-                end
+              installed_range = ">=#{version} #{version.major}.x"
+              graph.add_constraint('installed', installed_module, installed_range) do |node|
+                Semantic::VersionRange.parse(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
                 dep_name = dep['name'].tr('/', '-')
 
-                dep['version_requirement'].tap do |range|
-                  graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                    Semantic::VersionRange.parse(range).include? node.version
-                  end
+                range = dep['version_requirement']
+                graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
+                  Semantic::VersionRange.parse(range).include? node.version
                 end
               end
             end

data/lib/puppet/module_tool/contents_description.rb

@@ -42,9 +42,9 @@ module Puppet::ModuleTool
           end
         end
 
-        type_names.each do |type_name|
-          if type = Puppet::Type.type(type_name.to_sym)
-            type_hash = {:name => type_name, :doc => type.doc}
+        type_names.each do |name|
+          if type = Puppet::Type.type(name.to_sym)
+            type_hash = {:name => name, :doc => type.doc}
             type_hash[:properties] = attr_doc(type, :property)
             type_hash[:parameters] = attr_doc(type, :param)
             if type.providers.size > 0
@@ -52,7 +52,7 @@ module Puppet::ModuleTool
             end
             @data << type_hash
           else
-            Puppet.warning "Could not find/load type: #{type_name}"
+            Puppet.warning "Could not find/load type: #{name}"
           end
         end
       end
@@ -62,23 +62,27 @@ module Puppet::ModuleTool
     # Return an array of hashes representing this +type+'s attrs of +kind+
     # (e.g. :param or :property), each containing :name and :doc.
     def attr_doc(type, kind)
-      [].tap do |attrs|
-        type.allattrs.each do |name|
-          if type.attrtype(name) == kind && name != :provider
-            attrs.push(:name => name, :doc => type.attrclass(name).doc)
-          end
+      attrs = []
+
+      type.allattrs.each do |name|
+        if type.attrtype(name) == kind && name != :provider
+          attrs.push(:name => name, :doc => type.attrclass(name).doc)
         end
       end
+
+      attrs
     end
 
     # Return an array of hashes representing this +type+'s providers, each
     # containing :name and :doc.
     def provider_doc(type)
-      [].tap do |providers|
-        type.providers.sort.each do |prov|
-          providers.push(:name => prov, :doc => type.provider(prov).doc)
-        end
+      providers = []
+
+      type.providers.sort.each do |prov|
+        providers.push(:name => prov, :doc => type.provider(prov).doc)
       end
+
+      providers
     end
   end
 end

data/lib/puppet/module_tool/installed_modules.rb

@@ -69,14 +69,12 @@ module Puppet::ModuleTool
         super(source, name, version, {})
 
         if mod.dependencies
-          mod.dependencies.each do |dep|
-            results = Puppet::ModuleTool.parse_module_dependency(release, dep)
+          mod.dependencies.each do |dependency|
+            results = Puppet::ModuleTool.parse_module_dependency(release, dependency)
             dep_name, parsed_range, range = results
 
-            dep.tap do |dep|
-              add_constraint('initialize', dep_name, range.to_s) do |node|
-                parsed_range === node.version
-              end
+            add_constraint('initialize', dep_name, range.to_s) do |node|
+              parsed_range === node.version
             end
           end
         end

data/lib/puppet/module_tool/metadata.rb

@@ -19,7 +19,7 @@ module Puppet::ModuleTool
       'version'      => nil,
       'author'       => nil,
       'summary'      => nil,
-      'license'      => 'Apache 2.0',
+      'license'      => 'Apache-2.0',
       'source'       => '',
       'project_page' => nil,
       'issues_url'   => nil,
@@ -66,7 +66,7 @@ module Puppet::ModuleTool
       validate_version_range(version_requirement) if version_requirement
 
       if dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
-        raise ArgumentError, "Dependency conflict for #{full_module_name}: Dependency #{name} was given conflicting version requirements #{version_requirement} and #{dup.version_requirement}. Verify that there are no duplicates in the metadata.json or the Modulefile."
+        raise ArgumentError, "Dependency conflict for #{full_module_name}: Dependency #{name} was given conflicting version requirements #{version_requirement} and #{dup.version_requirement}. Verify that there are no duplicates in the metadata.json."
       end
 
       dep = Dependency.new(name, version_requirement, repository)
@@ -99,18 +99,7 @@ module Puppet::ModuleTool
     def to_json
       data = @data.dup.merge('dependencies' => dependencies)
 
-      # This is used to simulate an ordered hash.  In particular, some keys
-      # are promoted to the top of the serialized hash (while others are
-      # demoted) for human-friendliness.
-      #
-      # This particularly works around the lack of ordered hashes in 1.8.7.
-      promoted_keys = %w[ name version author summary license source ]
-      demoted_keys = %w[ dependencies ]
-      keys = data.keys
-      keys -= promoted_keys
-      keys -= demoted_keys
-
-      contents = (promoted_keys + keys + demoted_keys).map do |k|
+      contents = data.keys.map do |k|
         value = (JSON.pretty_generate(data[k]) rescue data[k].to_json)
         "#{k.to_json}: #{value}"
       end

data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 3.3']
 gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint', '>= 0.3.2'
+gem 'puppetlabs_spec_helper', '>= 0.8.2'
+gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'

data/lib/puppet/module_tool/skeleton/templates/generator/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')

data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb

@@ -15,7 +15,7 @@
 # Here you should define a list of variables that this module would require.
 #
 # [*sample_variable*]
-#   Explanation of how this variable affects the funtion of this class and if
+#   Explanation of how this variable affects the function of this class and if
 #   it has a default. e.g. "The parameter enc_ntp_servers must be set by the
 #   External Node Classifier as a comma separated list of hostnames." (Note,
 #   global variables should be avoided in favor of class parameters as

data/lib/puppet/module_tool/tar/gnu.rb

@@ -8,7 +8,7 @@ class Puppet::ModuleTool::Tar::Gnu
     Dir.chdir(destdir) do
       Puppet::Util::Execution.execute("gzip -dc #{Shellwords.shellescape(sourcefile)} | tar xof -")
       Puppet::Util::Execution.execute("find . -type d -exec chmod 755 {} +")
-      Puppet::Util::Execution.execute("find . -type f -exec chmod a-wst {} +")
+      Puppet::Util::Execution.execute("find . -type f -exec chmod u+rw,g+r,a-st {} +")
       Puppet::Util::Execution.execute("chown -R #{owner} .")
     end
   end

data/lib/puppet/module_tool/tar/mini.rb

@@ -4,7 +4,7 @@ class Puppet::ModuleTool::Tar::Mini
       Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
         case action
         when :file_done
-          File.chmod(0444, "#{destdir}/#{name}")
+          File.chmod(0644, "#{destdir}/#{name}")
         when :dir, :file_start
           validate_entry(destdir, name)
           Puppet.debug("Extracting: #{destdir}/#{name}")
@@ -31,7 +31,7 @@ class Puppet::ModuleTool::Tar::Mini
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
       if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
-        entry.full_name
+        entry.name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"
         next

data/lib/puppet/module_tool.rb

@@ -39,8 +39,7 @@ module Puppet
     end
 
     # Find the module root when given a path by checking each directory up from
-    # its current location until it finds one that contains a file called
-    # 'Modulefile'.
+    # its current location until it finds one that satisfies is_module_root?
     #
     # @param path [Pathname, String] path to start from
     # @return [Pathname, nil] the root path of the module directory or nil if
@@ -56,14 +55,14 @@ module Puppet
     end
 
     # Analyse path to see if it is a module root directory by detecting a
-    # file named 'metadata.json' or 'Modulefile' in the directory.
+    # file named 'metadata.json'
     #
     # @param path [Pathname, String] path to analyse
     # @return [Boolean] true if the path is a module root, false otherwise
     def self.is_module_root?(path)
       path = Pathname.new(path) if path.class == String
 
-      FileTest.file?(path + 'metadata.json') || FileTest.file?(path + 'Modulefile')
+      FileTest.file?(path + 'metadata.json')
     end
 
     # Builds a formatted tree from a list of node hashes containing +:text+
@@ -136,7 +135,7 @@ module Puppet
     # Given a hash of options, we should discover or create a
     # {Puppet::Node::Environment} instance that reflects the provided options.
     #
-    # Generally speaking, the `:modulepath` parameter should supercede all
+    # Generally speaking, the `:modulepath` parameter should supersede all
     # others, the `:environment` parameter should follow after that, and we
     # should default to Puppet's current environment.
     #
@@ -168,7 +167,7 @@ module Puppet
     #         unparsed range expression.
     def self.parse_module_dependency(where, dep)
       dep_name = dep['name'].tr('/', '-')
-      range = dep['version_requirement'] || dep['versionRequirement'] || '>= 0.0.0'
+      range = dep['version_requirement'] || '>= 0.0.0'
 
       begin
         parsed_range = Semantic::VersionRange.parse(range)
@@ -189,6 +188,5 @@ require 'puppet/module_tool/checksums'
 require 'puppet/module_tool/contents_description'
 require 'puppet/module_tool/dependency'
 require 'puppet/module_tool/metadata'
-require 'puppet/module_tool/modulefile'
 require 'puppet/forge/cache'
 require 'puppet/forge'

data/lib/puppet/network/auth_config_parser.rb

@@ -40,8 +40,8 @@ class AuthConfigParser
     # Verify each of the rights are valid.
     # We let the check raise an error, so that it can raise an error
     # pointing to the specific problem.
-    rights.each { |name, right|
-      right.valid?
+    rights.each { |name, r|
+      r.valid?
     }
     rights
   end