puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/pops/functions/dispatcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Evaluate the dispatches defined as {Puppet::Pops::Functions::Dispatch}
 # instances to call the appropriate method on the
 # {Puppet::Pops::Functions::Function} instance.
@@ -8,8 +9,8 @@ class Puppet::Pops::Functions::Dispatcher
   attr_reader :dispatchers
 
   # @api private
-  def initialize()
-    @dispatchers = [ ]
+  def initialize
+    @dispatchers = []
   end
 
   # Answers if dispatching has been defined
@@ -33,7 +34,6 @@ class Puppet::Pops::Functions::Dispatcher
   #
   # @api private
   def dispatch(instance, calling_scope, args, &block)
-
     dispatcher = find_matching_dispatcher(args, &block)
     unless dispatcher
       args_type = Puppet::Pops::Types::TypeCalculator.singleton.infer_set(block_given? ? args + [block] : args)
@@ -58,11 +58,11 @@ class Puppet::Pops::Functions::Dispatcher
   # Produces a CallableType for a single signature, and a Variant[<callables>] otherwise
   #
   # @api private
-  def to_type()
+  def to_type
     # make a copy to make sure it can be contained by someone else (even if it is not contained here, it
     # should be treated as immutable).
     #
-    callables = dispatchers.map { | dispatch | dispatch.type }
+    callables = dispatchers.map { |dispatch| dispatch.type }
 
     # multiple signatures, produce a Variant type of Callable1-n (must copy them)
     # single signature, produce single Callable

data/lib/puppet/pops/functions/function.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @note WARNING: This new function API is still under development and may change at
 #   any time
 #
@@ -105,11 +106,10 @@ class Puppet::Pops::Functions::Function
   #
   # @api public
   def internal_call_function(scope, function_name, args, &block)
-
     the_loader = loader
     unless the_loader
       raise ArgumentError, _("Function %{class_name}(): cannot call function '%{function_name}' - no loader specified") %
-          { class_name: self.class.name, function_name: function_name }
+                           { class_name: self.class.name, function_name: function_name }
     end
 
     func = the_loader.load(:function, function_name)
@@ -125,7 +125,7 @@ class Puppet::Pops::Functions::Function
     func_3x = Puppet::Parser::Functions.function(function_name, loader_scope.environment) if loader_scope.is_a?(Puppet::Parser::Scope)
     unless func_3x
       raise ArgumentError, _("Function %{class_name}(): Unknown function: '%{function_name}'") %
-          { class_name: self.class.name, function_name: function_name }
+                           { class_name: self.class.name, function_name: function_name }
     end
 
     # Call via 3x API
@@ -136,5 +136,4 @@ class Puppet::Pops::Functions::Function
     # Prevent non r-value functions from leaking their result (they are not written to care about this)
     Puppet::Parser::Functions.rvalue?(function_name) ? result : nil
   end
-
 end

data/lib/puppet/pops/issue_reporter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 class IssueReporter
-
   # @param acceptor [Validation::Acceptor] the acceptor containing reported issues
   # @option options [String] :message (nil) A message text to use as prefix in
   #   a single Error message
@@ -50,6 +50,7 @@ class IssueReporter
       unless emit_errors
         raise emit_exception.new(emit_message)
       end
+
       formatter = Validation::DiagnosticFormatterPuppetStyle.new
       if errors.size == 1 || max_errors <= 1
         # raise immediately
@@ -71,10 +72,10 @@ class IssueReporter
       end
       giving_up_message = if (emit_warnings && warnings.size > 0)
                             _("Language validation logged %{error_count} errors, and %{warning_count} warnings. Giving up") %
-                                { error_count: errors.size, warning_count: warnings.size }
+                              { error_count: errors.size, warning_count: warnings.size }
                           else
                             _("Language validation logged %{error_count} errors. Giving up") %
-                                { error_count: errors.size }
+                              { error_count: errors.size }
                           end
       exception = emit_exception.new(giving_up_message)
       exception.file = errors[0].file
@@ -84,19 +85,20 @@ class IssueReporter
 
   def self.format_with_prefix(prefix, message)
     return message unless prefix
+
     [prefix, message].join(' ')
   end
 
   def self.warning(semantic, issue, args)
     Puppet::Util::Log.create({
-      :level => :warning,
-      :message => issue.format(args),
-      :arguments => args,
-      :issue_code => issue.issue_code,
-      :file => semantic.file,
-      :line => semantic.line,
-      :pos => semantic.pos,
-    })
+                               :level => :warning,
+                               :message => issue.format(args),
+                               :arguments => args,
+                               :issue_code => issue.issue_code,
+                               :file => semantic.file,
+                               :line => semantic.line,
+                               :pos => semantic.pos,
+                             })
   end
 
   def self.error(exception_class, semantic, issue, args)
@@ -124,15 +126,15 @@ class IssueReporter
       pos = diagnostic.source_pos.pos
     end
     Puppet::Util::Log.create({
-        :level => severity,
-        :message => formatter.format_message(diagnostic),
-        :arguments => diagnostic.arguments,
-        :issue_code => diagnostic.issue.issue_code,
-        :file => file,
-        :line => line,
-        :pos => pos,
-      })
+                               :level => severity,
+                               :message => formatter.format_message(diagnostic),
+                               :arguments => diagnostic.arguments,
+                               :issue_code => diagnostic.issue.issue_code,
+                               :file => file,
+                               :line => line,
+                               :pos => pos,
+                             })
   end
   private_class_method :log_message
 end
-end
+end

data/lib/puppet/pops/issues.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Defines classes to deal with issues, and message formatting and defines constants with Issues.
 # @api public
 #
@@ -23,6 +24,7 @@ module Issues
 
     # If this issue can have its severity lowered to :warning, :deprecation, or :ignored
     attr_writer :demotable
+
     # Configures the Issue with required arguments (bound by occurrence), and a block producing a message.
     def initialize issue_code, *args, &block
       @issue_code = issue_code
@@ -42,7 +44,7 @@ module Issues
     # in the given `hash`.
     # @api public
     #
-    def format(hash ={})
+    def format(hash = {})
       # Create a Message Data where all hash keys become methods for convenient interpolation
       # in issue text.
       msgdata = MessageData.new(*arg_names)
@@ -90,16 +92,18 @@ module Issues
     # @raise [Puppet::Error] if no label provider is found
     def label_provider
       label_provider = @data[:label]
-      #TRANSLATORS ":label" is a keyword and should not be translated
+      # TRANSLATORS ":label" is a keyword and should not be translated
       raise Puppet::Error, _('Label provider key :label must be set to produce the text of the message!') unless label_provider
+
       label_provider
     end
 
     # Returns the label provider given as a key in the hash passed to #format.
     #
     def semantic
-      #TRANSLATORS ":semantic" is a keyword and should not be translated
+      # TRANSLATORS ":semantic" is a keyword and should not be translated
       raise Puppet::Error, _('Label provider key :semantic must be set to produce the text of the message!') unless @data[:semantic]
+
       @data[:semantic]
     end
   end
@@ -207,6 +211,10 @@ module Issues
     _("The numeric parameter name '$%{name}' cannot be used (clashes with numeric match result variables)") % { name: name }
   end
 
+  ILLEGAL_NONLITERAL_PARAMETER_TYPE = issue :ILLEGAL_NONLITERAL_PARAMETER_TYPE, :name, :type_class do
+    _("The parameter '$%{name}' must be a literal type, not %{type_class}") % { name: name, type_class: label.a_an(type_class) }
+  end
+
   # In certain versions of Puppet it may be allowed to assign to a not already assigned key
   # in an array or a hash. This is an optional validation that may be turned on to prevent accidental
   # mutation.
@@ -542,7 +550,7 @@ module Issues
     _("Illegal Resource Type expression, expected result to be a type name, or untitled Resource, got %{actual}") % { actual: actual }
   end
 
-  DUPLICATE_TITLE = issue :DUPLICATE_TITLE, :title  do
+  DUPLICATE_TITLE = issue :DUPLICATE_TITLE, :title do
     _("The title '%{title}' has already been used in this resource expression") % { title: title }
   end
 
@@ -592,7 +600,7 @@ module Issues
   end
 
   DISCONTINUED_IMPORT = hard_issue :DISCONTINUED_IMPORT do
-    #TRANSLATORS "import" is a function name and should not be translated
+    # TRANSLATORS "import" is a function name and should not be translated
     _("Use of 'import' has been discontinued in favor of a manifest directory. See http://links.puppet.com/puppet-import-deprecation")
   end
 

data/lib/puppet/pops/label_provider.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Provides a label for an object.
 # This simple implementation calls #to_s on the given object, and handles articles 'a/an/the'.
 #
@@ -68,9 +69,9 @@ module Puppet::Pops::LabelProvider
   private
 
   def first_letter_of(string)
-    char = string[0,1]
+    char = string[0, 1]
     if SKIPPED_CHARACTERS.include? char
-      char = string[1,1]
+      char = string[1, 1]
     end
 
     if char == ""

data/lib/puppet/pops/loader/base_loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Loader
 # BaseLoader
@@ -10,7 +11,6 @@ module Loader
 # @api private
 #
 class BaseLoader < Loader
-
   # The parent loader
   attr_reader :parent
 
@@ -85,7 +85,7 @@ class BaseLoader < Loader
       if typed_name.type == :type && !allow_shadowing?
         entry = loaded_entry(typed_name)
         if entry
-          fail_redefine(entry) unless entry.value.nil? #|| entry.value == value
+          fail_redefine(entry) unless entry.value.nil? # || entry.value == value
         end
       end
 
@@ -149,7 +149,7 @@ class BaseLoader < Loader
   end
 
   def format_uri(uri)
-    (uri.scheme == 'puppet' ? 'by ' : 'at ') + uri.to_s.sub(/^puppet:/,'')
+    (uri.scheme == 'puppet' ? 'by ' : 'at ') + uri.to_s.sub(/^puppet:/, '')
   end
 
   # loads in priority order:
@@ -176,4 +176,3 @@ class BaseLoader < Loader
 end
 end
 end
-

data/lib/puppet/pops/loader/dependency_loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # =DependencyLoader
 # This loader provides visibility into a set of other loaders. It is used as a child of a ModuleLoader (or other
 # loader) to make its direct dependencies visible for loading from contexts that have access to this dependency loader.
@@ -44,6 +45,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # lookup otherwise).
       loaded = @dependency_loaders.reduce(nil) do |previous, loader|
         break previous if !previous.nil?
+
         loader.load_typed(typed_name)
       end
       if loaded
@@ -60,7 +62,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
   end
 
   def to_s
-    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map {|loader| loader.to_s }.join(' ,') + "])"
+    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map { |loader| loader.to_s }.join(' ,') + "])"
   end
 
   private
@@ -80,6 +82,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # lookup otherwise).
       @dependency_loaders.reduce(nil) do |previous, loader|
         break previous if !previous.nil?
+
         loader.loaded_entry(typed_name, check_dependencies)
       end
     end
@@ -87,6 +90,6 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
 
   # An index of module_name to module loader used to speed up lookup of qualified names
   def index
-    @index ||= @dependency_loaders.reduce({}) { |index, loader| index[loader.module_name] = loader; index }
+    @index ||= @dependency_loaders.each_with_object({}) { |loader, index| index[loader.module_name] = loader; }
   end
 end

data/lib/puppet/pops/loader/gem_support.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # GemSupport offers methods to find a gem's location by name or gem://gemname URI.
 #
 # TODO: The Puppet 3x, uses Puppet::Util::RubyGems to do this, and obtain paths, and avoids using ::Gems
@@ -9,7 +10,6 @@
 # and then trying to access those.
 #
 module Puppet::Pops::Loader::GemSupport
-
   # Produces the root directory of a gem given as an URI (gem://gemname/optional/path), or just the
   # gemname as a string.
   #
@@ -31,6 +31,7 @@ module Puppet::Pops::Loader::GemSupport
     unless spec
       raise ArgumentError, _("Gem not found %{uri}") % { uri: uri }
     end
+
     # if path given append that, else append given subdir
     if uri.path.empty?
       spec.gem_dir
@@ -47,6 +48,7 @@ module Puppet::Pops::Loader::GemSupport
     unless spec
       raise ArgumentError, _("Gem not found '%{gem_name}'") % { gem_name: gem_name }
     end
+
     spec.full_gem_path
   end
-end
+end

data/lib/puppet/pops/loader/generic_plan_instantiator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Loader
 # The GenericPlanInstantiator dispatches to either PuppetPlanInstantiator or a

data/lib/puppet/pops/loader/loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Loader
 # ===
 # A Loader is responsible for loading "entities" ("instantiable and executable objects in the puppet language" which
@@ -22,7 +23,6 @@
 #
 module Puppet::Pops
 module Loader
-
 ENVIRONMENT = 'environment'
 ENVIRONMENT_PRIVATE = 'environment private'
 
@@ -202,7 +202,6 @@ class Loader
     self.to_s
   end
 
-
   # An entry for one entity loaded by the loader.
   #
   class NamedEntry

data/lib/puppet/pops/loader/loader_paths.rb

@@ -10,7 +10,6 @@
 module Puppet::Pops
 module Loader
 module LoaderPaths
-
   # Returns an array of SmartPath, each instantiated with a reference to the given loader (for root path resolution
   # and existence checks). The smart paths in the array appear in precedence order. The returned array may be
   # mutated.
@@ -19,16 +18,16 @@ module LoaderPaths
     result = []
     case type
     when :function
-        # Only include support for the loadable items the loader states it can contain
-        if loader.loadables.include?(:func_4x)
-          result << FunctionPath4x.new(loader)
-        end
-        if loader.loadables.include?(:func_4xpp)
-          result << FunctionPathPP.new(loader)
-        end
-        if loader.loadables.include?(:func_3x)
-          result << FunctionPath3x.new(loader)
-        end
+      # Only include support for the loadable items the loader states it can contain
+      if loader.loadables.include?(:func_4x)
+        result << FunctionPath4x.new(loader)
+      end
+      if loader.loadables.include?(:func_4xpp)
+        result << FunctionPathPP.new(loader)
+      end
+      if loader.loadables.include?(:func_3x)
+        result << FunctionPath3x.new(loader)
+      end
     when :plan
       result << PlanPath.new(loader)
     when :task
@@ -45,14 +44,14 @@ module LoaderPaths
     result
   end
 
-#  # DO NOT REMOVE YET. needed later? when there is the need to decamel a classname
-#  def de_camel(fq_name)
-#    fq_name.to_s.gsub(/::/, '/').
-#    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-#    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-#    tr("-", "_").
-#    downcase
-#  end
+  #  # DO NOT REMOVE YET. needed later? when there is the need to decamel a classname
+  #  def de_camel(fq_name)
+  #    fq_name.to_s.gsub(/::/, '/').
+  #    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+  #    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+  #    tr("-", "_").
+  #    downcase
+  #  end
 
   class SmartPath
     # Creates SmartPath for the given loader (loader knows how to check for existence etc.)
@@ -91,7 +90,7 @@ module LoaderPaths
       n = ''.dup
       unless extension.empty?
         # Remove extension
-        relative_path = relative_path[0..-(extension.length+1)]
+        relative_path = relative_path[0..-(extension.length + 1)]
       end
       relative_path.split('/').each do |segment|
         n << '::' if n.size > 0
@@ -147,7 +146,8 @@ module LoaderPaths
       parts = typed_name.name_parts
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
-        parts = parts[start_index_in_name..-1]
+
+        parts = parts[start_index_in_name..]
       end
       "#{File.join(generic_path, parts)}#{extension}"
     end
@@ -157,7 +157,7 @@ module LoaderPaths
       n << module_name unless module_name.nil?
       unless extension.empty?
         # Remove extension
-        relative_path = relative_path[0..-(extension.length+1)]
+        relative_path = relative_path[0..-(extension.length + 1)]
       end
       relative_path.split('/').each do |segment|
         n << '::' if n.size > 0
@@ -335,7 +335,7 @@ module LoaderPaths
       PLAN_PATH
     end
 
-    def instantiator()
+    def instantiator
       Puppet::Pops::Loader::GenericPlanInstantiator
     end
 
@@ -354,7 +354,7 @@ module LoaderPaths
         n = ''.dup
         n << module_name unless module_name.nil?
         ext = @extensions.find { |extension| relative_path.end_with?(extension) }
-        relative_path = relative_path[0..-(ext.length+1)]
+        relative_path = relative_path[0..-(ext.length + 1)]
 
         relative_path.split('/').each do |segment|
           n << '::' if n.size > 0
@@ -370,7 +370,8 @@ module LoaderPaths
       parts = typed_name.name_parts
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
-        parts = parts[start_index_in_name..-1]
+
+        parts = parts[start_index_in_name..]
       end
       basename = File.join(generic_path, parts)
       @extensions.map { |ext| "#{basename}#{ext}" }
@@ -410,4 +411,3 @@ module LoaderPaths
 end
 end
 end
-

data/lib/puppet/pops/loader/module_loaders.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Loader
 # =ModuleLoaders
@@ -20,7 +21,6 @@ module Loader
 # @api private
 #
 module ModuleLoaders
-
   # Wildcard module name for module loaders, makes loading possible from any namespace.
   NAMESPACE_WILDCARD = '*'
 
@@ -30,12 +30,11 @@ module ModuleLoaders
   #
   def self.cached_loader_from(parent_loader, loaders)
     LibRootedFileBased.new(parent_loader,
-      loaders,
-      NAMESPACE_WILDCARD,
-      Puppet[:libdir],
-      'cached_puppet_lib',
-      [:func_4x, :func_3x, :datatype]
-    )
+                           loaders,
+                           NAMESPACE_WILDCARD,
+                           Puppet[:libdir],
+                           'cached_puppet_lib',
+                           [:func_4x, :func_3x, :datatype])
   end
 
   def self.system_loader_from(parent_loader, loaders)
@@ -48,10 +47,9 @@ module ModuleLoaders
     LibRootedFileBased.new(parent_loader,
                            loaders,
                            nil,
-                           puppet_lib,   # may or may not have a 'lib' above 'puppet'
+                           puppet_lib, # may or may not have a 'lib' above 'puppet'
                            'puppet_system',
-                           [:func_4x, :func_3x, :datatype]   # only load ruby functions and types from "puppet"
-                          )
+                           [:func_4x, :func_3x, :datatype]) # only load ruby functions and types from "puppet"
   end
 
   def self.environment_loader_from(parent_loader, loaders, env_path)
@@ -59,30 +57,27 @@ module ModuleLoaders
       EmptyLoader.new(parent_loader, ENVIRONMENT, loaders.environment)
     else
       FileBased.new(parent_loader,
-        loaders,
-        ENVIRONMENT,
-        env_path,
-        ENVIRONMENT
-      )
+                    loaders,
+                    ENVIRONMENT,
+                    env_path,
+                    ENVIRONMENT)
     end
   end
 
   def self.module_loader_from(parent_loader, loaders, module_name, module_path)
     ModuleLoaders::FileBased.new(parent_loader,
-                                                       loaders,
-                                                       module_name,
-                                                       module_path,
-                                                       module_name
-                                                       )
+                                 loaders,
+                                 module_name,
+                                 module_path,
+                                 module_name)
   end
 
   def self.pcore_resource_type_loader_from(parent_loader, loaders, environment_path)
     ModuleLoaders::FileBased.new(parent_loader,
-      loaders,
-      nil,
-      environment_path,
-      'pcore_resource_types'
-    )
+                                 loaders,
+                                 nil,
+                                 environment_path,
+                                 'pcore_resource_types')
   end
 
   class EmptyLoader < BaseLoader
@@ -100,11 +95,9 @@ module ModuleLoaders
   end
 
   class AbstractPathBasedModuleLoader < BaseLoader
-
     # The name of the module, or nil, if this is a global "component", or "any module" if set to the `NAMESPACE_WILDCARD` (*)
     attr_reader :module_name
 
-
     # The path to the location of the module/component - semantics determined by subclass
     attr_reader :path
 
@@ -136,9 +129,10 @@ module ModuleLoaders
       @loaders = loaders
       @loadables = loadables
       unless (loadables - LOADABLE_KINDS).empty?
-        #TRANSLATORS 'loadables' is a variable containing loadable modules and should not be translated
+        # TRANSLATORS 'loadables' is a variable containing loadable modules and should not be translated
         raise ArgumentError, _('given loadables are not of supported loadable kind')
       end
+
       loaders.add_loader_by_name(self)
     end
 
@@ -153,6 +147,7 @@ module ModuleLoaders
           relative_paths(sp).each do |rp|
             tp = sp.typed_name(type, name_authority, rp, global ? nil : @module_name)
             next unless sp.valid_name?(tp)
+
             begin
               load_typed(tp) unless block_given? && !block.yield(tp)
             rescue StandardError => e
@@ -163,7 +158,8 @@ module ModuleLoaders
                   Issues::LOADER_FAILURE.format(:type => type),
                   'PUPPET_LOADER_FAILURE',
                   { 'original_error' => e.message },
-                  Issues::LOADER_FAILURE.issue_code)
+                  Issues::LOADER_FAILURE.issue_code
+                )
                 error_collector << err unless error_collector.include?(err)
               end
             end
@@ -243,7 +239,7 @@ module ModuleLoaders
 
             # TRANSLATORS 'TypeSet' should not be translated
             raise ArgumentError, _("The code loaded from %{origin} does not define the TypeSet '%{module_name}'") %
-                { origin: origin, module_name: name_parts[0].capitalize }
+                                 { origin: origin, module_name: name_parts[0].capitalize }
           end
         else
           # anything else cannot possibly be in this module
@@ -405,6 +401,7 @@ module ModuleLoaders
       is_global = global?
       smart_paths.effective_paths(typed_name.type).each do |sp|
         next unless sp.valid_name?(typed_name)
+
         origin = sp.effective_path(typed_name, is_global ? 0 : 1)
         unless origin.nil?
           if sp.fuzzy_matching?
@@ -412,12 +409,11 @@ module ModuleLoaders
             # whichever ones exist. Otherwise, find all paths that *might* be
             # related to origin
             if origin.is_a?(Array)
-              origins = origin.map { |ori| existing_path(ori) }.compact
-              return [origins, sp] unless origins.empty?
+              origins = origin.filter_map { |ori| existing_path(ori) }
             else
               origins = candidate_paths(origin)
-              return [origins, sp] unless origins.empty?
             end
+            return [origins, sp] unless origins.empty?
           else
             existing = existing_path(origin)
             return [origin, sp] unless existing.nil?
@@ -431,7 +427,6 @@ module ModuleLoaders
   # @api private
   #
   class FileBased < AbstractPathBasedModuleLoader
-
     attr_reader :smart_paths
     attr_reader :path_index
 
@@ -469,10 +464,10 @@ module ModuleLoaders
     end
 
     def meaningful_to_search?(smart_path)
-      ! add_to_index(smart_path).empty?
+      !add_to_index(smart_path).empty?
     end
 
-    def to_s()
+    def to_s
       "(ModuleLoader::FileBased '#{loader_name}' '#{module_name}')"
     end
 
@@ -548,7 +543,7 @@ module ModuleLoaders
       super parent_loader, loaders, module_name, gem_dir(gem_ref), loader_name, loadables
     end
 
-    def to_s()
+    def to_s
       "(ModuleLoader::GemBased '#{loader_name}' '#{@gem_ref}' [#{module_name}])"
     end
   end