puppet 6.0.5-x64-mingw32 → 8.8.1-x64-mingw32

data/lib/puppet/module_tool/install_directory.rb

@@ -1,5 +1,7 @@
-require 'puppet/module_tool'
-require 'puppet/module_tool/errors'
+# frozen_string_literal: true
+
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/module_tool/errors'
 
 module Puppet
   module ModuleTool
@@ -8,6 +10,7 @@ module Puppet
       include Puppet::ModuleTool::Errors
 
       attr_reader :target
+
       def initialize(target)
         @target = target
       end
@@ -25,7 +28,7 @@ module Puppet
         end
       end
 
-    private
+      private
 
       ERROR_MAPPINGS = {
         Errno::EACCES => PermissionDeniedCreateInstallDirectoryError,
@@ -33,12 +36,12 @@ module Puppet
       }
 
       def converted_to_friendly_error(module_name, version, orig_error)
-        return orig_error if not ERROR_MAPPINGS.include?(orig_error.class)
+        return orig_error unless ERROR_MAPPINGS.include?(orig_error.class)
 
         ERROR_MAPPINGS[orig_error.class].new(orig_error,
-          :requested_module  => module_name,
-          :requested_version => version,
-          :directory         => @target.to_s)
+                                             :requested_module => module_name,
+                                             :requested_version => version,
+                                             :directory => @target.to_s)
       end
     end
   end

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class InstalledModules < SemanticPuppet::Dependency::Source
@@ -22,6 +24,7 @@ module Puppet::ModuleTool
         modules[path].each do |mod|
           @by_name[mod.name] = mod
           next unless mod.has_metadata?
+
           release = ModuleRelease.new(self, mod)
           @modules[release.name] ||= release
         end
@@ -41,9 +44,9 @@ module Puppet::ModuleTool
 
       if @modules.key? name
         @fetched << name
-        [ @modules[name] ]
+        [@modules[name]]
       else
-        [ ]
+        []
       end
     end
 

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'tmpdir'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class LocalTarball < SemanticPuppet::Dependency::Source
@@ -18,9 +20,9 @@ module Puppet::ModuleTool
 
     def fetch(name)
       if @release.name == name
-        [ @release ]
+        [@release]
       else
-        [ ]
+        []
       end
     end
 
@@ -54,7 +56,7 @@ module Puppet::ModuleTool
           dependencies = mod.dependencies.map do |dep|
             Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           end
-          dependencies = Hash[dependencies]
+          dependencies = dependencies.to_h
         end
 
         super(source, name, version, dependencies || {})
@@ -75,16 +77,16 @@ module Puppet::ModuleTool
     # Obtain a suitable temporary path for unpacking tarballs
     #
     # @return [String] path to temporary unpacking location
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def tmpdir
       @dir ||= Dir.mktmpdir('local-tarball', Puppet::Forge::Cache.base_path)
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     def unpack(file, destination)
-      begin
-        Puppet::ModuleTool::Applications::Unpacker.unpack(file, destination)
-      rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-      end
+      Puppet::ModuleTool::Applications::Unpacker.unpack(file, destination)
+    rescue Puppet::ExecutionFailure => e
+      raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
     end
   end
 end

data/lib/puppet/module_tool/metadata.rb

@@ -1,11 +1,12 @@
-require 'puppet/module_tool'
-require 'puppet/network/format_support'
+# frozen_string_literal: true
+
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/network/format_support'
 require 'uri'
-require 'puppet/util/json'
+require_relative '../../puppet/util/json'
 require 'set'
 
 module Puppet::ModuleTool
-
   # This class provides a data structure representing a module's metadata.
   # @api private
   class Metadata
@@ -14,15 +15,15 @@ module Puppet::ModuleTool
     attr_accessor :module_name
 
     DEFAULTS = {
-      'name'          => nil,
-      'version'       => nil,
-      'author'        => nil,
-      'summary'       => nil,
-      'license'       => 'Apache-2.0',
-      'source'        => '',
-      'project_page'  => nil,
-      'issues_url'    => nil,
-      'dependencies'  => Set.new.freeze,
+      'name' => nil,
+      'version' => nil,
+      'author' => nil,
+      'summary' => nil,
+      'license' => 'Apache-2.0',
+      'source' => '',
+      'project_page' => nil,
+      'issues_url' => nil,
+      'dependencies' => Set.new.freeze,
       'data_provider' => nil,
     }
 
@@ -39,7 +40,8 @@ module Puppet::ModuleTool
     # Returns a string that uniquely represents this version of this module.
     def release_name
       return nil unless @data['name'] && @data['version']
-      [ dashed_name, @data['version'] ].join('-')
+
+      [dashed_name, @data['version']].join('-')
     end
 
     alias :name :module_name
@@ -56,19 +58,18 @@ module Puppet::ModuleTool
       merge_dependencies(data) if data['dependencies']
 
       @data.merge!(data)
-      return self
+      self
     end
 
     # Validates the name and version_requirement for a dependency, then creates
     # the Dependency and adds it.
     # Returns the Dependency that was added.
-    def add_dependency(name, version_requirement=nil, repository=nil)
+    def add_dependency(name, version_requirement = nil, repository = nil)
       validate_name(name)
       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 %{module_name}: Dependency %{name} was given conflicting version requirements %{version_requirement} and %{dup_version}. Verify that there are no duplicates in the metadata.json.") % { module_name: full_module_name, name: name, version_requirement: version_requirement, dup_version: dup.version_requirement }
-      end
+      dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
+      raise ArgumentError, _("Dependency conflict for %{module_name}: Dependency %{name} was given conflicting version requirements %{version_requirement} and %{dup_version}. Verify that there are no duplicates in the metadata.json.") % { module_name: full_module_name, name: name, version_requirement: version_requirement, dup_version: dup.version_requirement } if dup
 
       dep = Dependency.new(name, version_requirement, repository)
       @data['dependencies'].add(dep)
@@ -101,8 +102,12 @@ module Puppet::ModuleTool
       data = @data.dup.merge('dependencies' => dependencies)
 
       contents = data.keys.map do |k|
-        value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
-        %Q("#{k.to_s}": #{value})
+        value = begin
+          Puppet::Util::Json.dump(data[k], :pretty => true)
+        rescue
+          data[k].to_json
+        end
+        %Q("#{k}": #{value})
       end
 
       "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"
@@ -111,6 +116,7 @@ module Puppet::ModuleTool
     # Expose any metadata keys as callable reader methods.
     def method_missing(name, *args)
       return @data[name.to_s] if @data.key? name.to_s
+
       super
     end
 
@@ -119,7 +125,7 @@ module Puppet::ModuleTool
     # Do basic validation and parsing of the name parameter.
     def process_name(data)
       validate_name(data['name'])
-      author, @module_name = data['name'].split(/[-\/]/, 2)
+      author, @module_name = data['name'].split(%r{[-/]}, 2)
 
       data['author'] ||= author if @data['author'] == DEFAULTS['author']
     end
@@ -137,7 +143,7 @@ module Puppet::ModuleTool
     # GitHub, we can predict sensible defaults for both project_page and
     # issues_url.
     def process_source(data)
-      if data['source'] =~ %r[://]
+      if data['source'] =~ %r{://}
         source_uri = URI.parse(data['source'])
       else
         source_uri = URI.parse("http://#{data['source']}")
@@ -147,11 +153,10 @@ module Puppet::ModuleTool
         source_uri.scheme = 'https'
         source_uri.path.sub!(/\.git$/, '')
         data['project_page'] ||= @data['project_page'] || source_uri.to_s
-        data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(/\/*$/, '') + '/issues'
+        data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(%r{/*$}, '') + '/issues'
       end
-
     rescue URI::Error
-      return
+      nil
     end
 
     # Validates and parses the dependencies.
@@ -166,21 +171,21 @@ module Puppet::ModuleTool
 
     # Validates that the given module name is both namespaced and well-formed.
     def validate_name(name)
-      return if name =~ /\A[a-z0-9]+[-\/][a-z][a-z0-9_]*\Z/i
+      return if name =~ %r{\A[a-z0-9]+[-/][a-z][a-z0-9_]*\Z}i
 
-      namespace, modname = name.split(/[-\/]/, 2)
+      namespace, modname = name.split(%r{[-/]}, 2)
       modname = :namespace_missing if namespace == ''
 
       err = case modname
-      when nil, '', :namespace_missing
-        _("the field must be a namespaced module name")
-      when /[^a-z0-9_]/i
-        _("the module name contains non-alphanumeric (or underscore) characters")
-      when /^[^a-z]/i
-        _("the module name must begin with a letter")
-      else
-        _("the namespace contains non-alphanumeric characters")
-      end
+            when nil, '', :namespace_missing
+              _("the field must be a namespaced module name")
+            when /[^a-z0-9_]/i
+              _("the module name contains non-alphanumeric (or underscore) characters")
+            when /^[^a-z]/i
+              _("the module name must begin with a letter")
+            else
+              _("the namespace contains non-alphanumeric characters")
+            end
 
       raise ArgumentError, _("Invalid 'name' field in metadata.json: %{err}") % { err: err }
     end

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -1,19 +1,21 @@
-module Puppet::ModuleTool::Shared
+# frozen_string_literal: true
 
+module Puppet::ModuleTool::Shared
   include Puppet::ModuleTool::Errors
 
   def get_local_constraints
-    @local      = Hash.new { |h,k| h[k] = { } }
-    @conditions = Hash.new { |h,k| h[k] = [] }
-    @installed  = Hash.new { |h,k| h[k] = [] }
+    @local      = Hash.new { |h, k| h[k] = {} }
+    @conditions = Hash.new { |h, k| h[k] = [] }
+    @installed  = Hash.new { |h, k| h[k] = [] }
 
     @environment.modules_by_path.values.flatten.each do |mod|
-      mod_name = (mod.forge_name || mod.name).gsub('/', '-')
+      mod_name = (mod.forge_name || mod.name).tr('/', '-')
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
-        name, conditions = hash['name'], hash['version_requirement']
-        name = name.gsub('/', '-')
+        name = hash['name']
+        conditions = hash['version_requirement']
+        name = name.tr('/', '-')
         d[name] = conditions
         @conditions[name] << {
           :module => mod_name,
@@ -25,24 +27,28 @@ module Puppet::ModuleTool::Shared
   end
 
   def get_remote_constraints(forge)
-    @remote   = Hash.new { |h,k| h[k] = { } }
+    @remote   = Hash.new { |h, k| h[k] = {} }
     @urls     = {}
-    @versions = Hash.new { |h,k| h[k] = [] }
+    @versions = Hash.new { |h, k| h[k] = [] }
 
     Puppet.notice _("Downloading from %{uri} ...") % { uri: forge.uri }
     author, modname = Puppet::ModuleTool.username_and_modname_from(@module_name)
     info = forge.remote_dependency_info(author, modname, @options[:version])
     info.each do |pair|
       mod_name, releases = pair
-      mod_name = mod_name.gsub('/', '-')
+      mod_name = mod_name.tr('/', '-')
       releases.each do |rel|
-        semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
+        semver = begin
+          SemanticPuppet::Version.parse(rel['version'])
+        rescue
+          SemanticPuppet::Version::MIN
+        end
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
-        @versions[mod_name].sort! { |a, b| a[:semver] <=> b[:semver] }
+        @versions[mod_name].sort_by! { |a| a[:semver] }
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
-          d[name.gsub('/', '-')] = conditions
+          d[name.tr('/', '-')] = conditions
         end
       end
     end
@@ -53,33 +59,40 @@ module Puppet::ModuleTool::Shared
     if @conditions[mod].all? { |c| c[:queued] || c[:module] == :you }
       return :latest
     end
-    return :best
+
+    :best
   end
 
   def annotated_version(mod, versions)
     if versions.empty?
-      return implicit_version(mod)
+      implicit_version(mod)
     else
-      return "#{implicit_version(mod)}: #{versions.last}"
+      "#{implicit_version(mod)}: #{versions.last}"
     end
   end
 
-  def resolve_constraints(dependencies, source = [{:name => :you}], seen = {}, action = @action)
-    dependencies = dependencies.map do |mod, range|
+  def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, action = @action)
+    dependencies = dependencies.filter_map do |mod, range|
       source.last[:dependency] = range
 
       @conditions[mod] << {
-        :module     => source.last[:name],
-        :version    => source.last[:version],
+        :module => source.last[:name],
+        :version => source.last[:version],
         :dependency => range,
-        :queued     => true
+        :queued => true
       }
 
       if forced?
-        range = Puppet::Module.parse_range(@version) rescue Puppet::Module.parse_range('>= 0.0.0')
+        range = begin
+          Puppet::Module.parse_range(@version)
+        rescue
+          Puppet::Module.parse_range('>= 0.0.0')
+        end
       else
         range = (@conditions[mod]).map do |r|
-          Puppet::Module.parse_range(r[:dependency]) rescue Puppet::Module.parse_range('>= 0.0.0')
+          Puppet::Module.parse_range(r[:dependency])
+        rescue
+          Puppet::Module.parse_range('>= 0.0.0')
         end.inject(&:&)
       end
 
@@ -87,17 +100,18 @@ module Puppet::ModuleTool::Shared
         next if range === seen[mod][:semver]
 
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise InvalidDependencyCycleError,
-          :module_name       => mod,
-          :source            => (source + [{ :name => mod, :version => source.last[:dependency] }]),
-          :requested_module  => req_module,
-          :requested_version => @version || annotated_version(req_module, req_versions),
-          :conditions        => @conditions
+              :module_name => mod,
+              :source => (source + [{ :name => mod, :version => source.last[:dependency] }]),
+              :requested_module => req_module,
+              :requested_version => @version || annotated_version(req_module, req_versions),
+              :conditions => @conditions
       end
 
       if !(forced? || @installed[mod].empty? || source.last[:name] == :you)
         next if range === SemanticPuppet::Version.parse(@installed[mod].first.version)
+
         action = :upgrade
       elsif @installed[mod].empty?
         action = :install
@@ -107,39 +121,44 @@ module Puppet::ModuleTool::Shared
         @conditions.each { |_, conds| conds.delete_if { |c| c[:module] == mod } }
       end
 
-      versions = @versions["#{mod}"].select { |h| range === h[:semver] }
+      versions = @versions[mod.to_s].select { |h| range === h[:semver] }
       valid_versions = versions.select { |x| x[:semver].special == '' }
       valid_versions = versions if valid_versions.empty?
 
-      unless version = valid_versions.last
+      version = valid_versions.last
+      unless version
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise NoVersionsSatisfyError,
-          :requested_name    => req_module,
-          :requested_version => @version || annotated_version(req_module, req_versions),
-          :installed_version => @installed[@module_name].empty? ? nil : @installed[@module_name].first.version,
-          :dependency_name   => mod,
-          :conditions        => @conditions[mod],
-          :action            => @action
+              :requested_name => req_module,
+              :requested_version => @version || annotated_version(req_module, req_versions),
+              :installed_version => @installed[@module_name].empty? ? nil : @installed[@module_name].first.version,
+              :dependency_name => mod,
+              :conditions => @conditions[mod],
+              :action => @action
       end
 
       seen[mod] = version
 
       {
-        :module           => mod,
-        :version          => version,
-        :action           => action,
+        :module => mod,
+        :version => version,
+        :action => action,
         :previous_version => @installed[mod].empty? ? nil : @installed[mod].first.version,
-        :file             => @urls["#{mod}@#{version[:vstring]}"],
-        :path             => action == :install ? @options[:target_dir] : (@installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath),
-        :dependencies     => []
+        :file => @urls["#{mod}@#{version[:vstring]}"],
+        :path => if action == :install
+                   @options[:target_dir]
+                 else
+                   @installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath
+                 end,
+        :dependencies => []
       }
-    end.compact
+    end
     dependencies.each do |mod|
       deps = @remote["#{mod[:module]}@#{mod[:version][:vstring]}"].sort_by(&:first)
       mod[:dependencies] = resolve_constraints(deps, source + [{ :name => mod[:module], :version => mod[:version][:vstring] }], seen, :install)
     end unless @ignore_dependencies
-    return dependencies
+    dependencies
   end
 
   def download_tarballs(graph, default_path, forge)
@@ -155,7 +174,7 @@ module Puppet::ModuleTool::Shared
       end
 
       [
-        { (release[:path] ||= default_path) => cache_path},
+        { (release[:path] ||= default_path) => cache_path },
         *download_tarballs(release[:dependencies], default_path, forge)
       ]
     end.flatten
@@ -171,7 +190,7 @@ module Puppet::ModuleTool::Shared
     # problems at install time, we should reject any solution that
     # depends on multiple nodes with the same "module name".
     graph.add_graph_constraint('PMT') do |nodes|
-      names = nodes.map { |x| x.dependency_names + [ x.name ] }.flatten
+      names = nodes.map { |x| x.dependency_names + [x.name] }.flatten
       names = names.map { |x| x.tr('/', '-') }.uniq
       names = names.map { |x| x[/-(.*)/, 1] }
       names.length == names.uniq.length

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

@@ -1,19 +1,23 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 class Puppet::ModuleTool::Tar::Gnu
   def unpack(sourcefile, destdir, owner)
-    sourcefile = File.expand_path(sourcefile)
+    safe_sourcefile = Shellwords.shellescape(File.expand_path(sourcefile))
     destdir = File.expand_path(destdir)
+    safe_destdir = Shellwords.shellescape(destdir)
 
-    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 u+rw,g+r,a-st {} +")
-      Puppet::Util::Execution.execute("chown -R #{owner} .")
-    end
+    Puppet::Util::Execution.execute("gzip -dc #{safe_sourcefile} | tar --extract --no-same-owner --directory #{safe_destdir} --file -")
+    Puppet::Util::Execution.execute(['find', destdir, '-type', 'd', '-exec', 'chmod', '755', '{}', '+'])
+    Puppet::Util::Execution.execute(['find', destdir, '-type', 'f', '-exec', 'chmod', 'u+rw,g+r,a-st', '{}', '+'])
+    Puppet::Util::Execution.execute(['chown', '-R', owner, destdir])
   end
 
   def pack(sourcedir, destfile)
-    Puppet::Util::Execution.execute("tar cf - #{sourcedir} | gzip -c > #{File.basename(destfile)}")
+    safe_sourcedir = Shellwords.shellescape(sourcedir)
+    safe_destfile = Shellwords.shellescape(File.basename(destfile))
+
+    Puppet::Util::Execution.execute("tar cf - #{safe_sourcedir} | gzip -c > #{safe_destfile}")
   end
 end

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

@@ -1,7 +1,19 @@
+# frozen_string_literal: true
+
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
-      Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
+      # puppet doesn't have a hard dependency on minitar, so we
+      # can't be certain which version is installed. If it's 0.9
+      # or above then we can prevent minitar from fsync'ing each
+      # extracted file and directory, otherwise fallback to the
+      # old behavior
+      args = [reader, destdir, find_valid_files(reader)]
+      spec = Gem::Specification.find_by_name('minitar')
+      if spec && spec.version >= Gem::Version.new('0.9')
+        args << { :fsync => false }
+      end
+      Archive::Tar::Minitar.unpack(*args) do |action, name, stats|
         case action
         when :dir
           validate_entry(destdir, name)
@@ -32,9 +44,9 @@ class Puppet::ModuleTool::Tar::Mini
 
   private
 
-  EXECUTABLE = 0755
-  NOT_EXECUTABLE = 0644
-  USER_EXECUTE = 0100
+  EXECUTABLE = 0o755
+  NOT_EXECUTABLE = 0o644
+  USER_EXECUTE = 0o100
 
   def set_dir_mode!(stats)
     if stats.key?(:mode)
@@ -83,7 +95,7 @@ class Puppet::ModuleTool::Tar::Mini
   def find_valid_files(tarfile)
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
-      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).cover?(flag.to_i)
         entry.full_name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"
@@ -97,7 +109,7 @@ class Puppet::ModuleTool::Tar::Mini
       raise Puppet::ModuleTool::Errors::InvalidPathInPackageError, :entry_path => path, :directory => destdir
     end
 
-    path = File.expand_path File.join(destdir, path)
+    path = Pathname.new(File.join(destdir, path)).cleanpath.to_path
 
     if path !~ /\A#{Regexp.escape destdir}/
       raise Puppet::ModuleTool::Errors::InvalidPathInPackageError, :entry_path => path, :directory => destdir

data/lib/puppet/module_tool/tar.rb

@@ -1,17 +1,19 @@
-require 'puppet/module_tool'
-require 'puppet/util'
+# frozen_string_literal: true
+
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/util'
 
 module Puppet::ModuleTool::Tar
-  require 'puppet/module_tool/tar/gnu'
-  require 'puppet/module_tool/tar/mini'
+  require_relative 'tar/gnu'
+  require_relative 'tar/mini'
 
   def self.instance
     if Puppet.features.minitar? && Puppet.features.zlib?
       Mini.new
-    elsif Puppet::Util.which('tar') && ! Puppet::Util::Platform.windows?
+    elsif Puppet::Util.which('tar') && !Puppet::Util::Platform.windows?
       Gnu.new
     else
-      #TRANSLATORS "tar" is a program name and should not be translated
+      # TRANSLATORS "tar" is a program name and should not be translated
       raise RuntimeError, _('No suitable tar implementation found')
     end
   end