puppet 8.5.0 → 8.6.0

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -40,7 +40,7 @@ module Generators
     def new_markup(str, remove_para = false)
       first = @markup.nil?
       res = old_markup(str, remove_para)
-      if first and not @markup.nil?
+      if first and !@markup.nil?
         @markup.add_special(/\b([a-z]\w+(::\w+)*)/, :CROSSREF)
         # we need to call it again, since we added a rule
         res = old_markup(str, remove_para)
@@ -138,22 +138,22 @@ module Generators
         end
 
         classes.each do |k|
-          @allclasses[k.index_name] = k if !@allclasses.has_key?(k.index_name)
+          @allclasses[k.index_name] = k unless @allclasses.has_key?(k.index_name)
         end
 
         # generate nodes and plugins found
         classes.each do |k|
-          if k.context.is_module?
-            k.context.each_node do |_name, node|
-              nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
-              @nodes << nodes.last
-            end
-            k.context.each_plugin do |plugin|
-              @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
-            end
-            k.context.each_fact do |fact|
-              @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
-            end
+          next unless k.context.is_module?
+
+          k.context.each_node do |_name, node|
+            nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
+            @nodes << nodes.last
+          end
+          k.context.each_plugin do |plugin|
+            @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
+          end
+          k.context.each_fact do |fact|
+            @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
           end
         end
 
@@ -164,11 +164,11 @@ module Generators
       # scan all classes to create the child's references
       @allclasses.values.each do |klass|
         superklass = klass.context.superclass
-        if superklass
-          superklass = AllReferences[superklass]
-          if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
-            superklass.context.add_child(klass.context)
-          end
+        next unless superklass
+
+        superklass = AllReferences[superklass]
+        if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
+          superklass.context.add_child(klass.context)
         end
       end
 
@@ -237,14 +237,13 @@ module Generators
     def gen_class_index
       gen_an_index(@classes, 'All Classes', RDoc::Page::CLASS_INDEX, "fr_class_index.html")
       @allfiles.each do |file|
-        unless file['file'].context.file_relative_name =~ /\.rb$/
+        next if file['file'].context.file_relative_name =~ /\.rb$/
 
-          gen_composite_index(
-            file,
-            RDoc::Page::COMBO_INDEX,
-            "#{MODULE_DIR}/fr_#{file["file"].context.module_name}.html"
-          )
-        end
+        gen_composite_index(
+          file,
+          RDoc::Page::COMBO_INDEX,
+          "#{MODULE_DIR}/fr_#{file['file'].context.module_name}.html"
+        )
       end
     end
 
@@ -274,10 +273,10 @@ module Generators
             res3 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{fact.name})"].path), "name" => CGI.escapeHTML(fact.name) }
           end
         end
-        unless f.plugins.nil?
-          f.plugins.each do |plugin|
-            res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
-          end
+        next if f.plugins.nil?
+
+        f.plugins.each do |plugin|
+          res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
         end
       end
 
@@ -396,14 +395,14 @@ module Generators
       resources = @resources.sort
       resources.each do |r|
         row = {}
-        if r.section == section and r.document_self
-          row["name"] = CGI.escapeHTML(r.name)
-          desc = r.description.strip
-          row["m_desc"]      = desc unless desc.empty?
-          row["aref"]        = r.aref
-          row["params"]      = r.params
-          outer << row
-        end
+        next unless r.section == section and r.document_self
+
+        row["name"] = CGI.escapeHTML(r.name)
+        desc = r.description.strip
+        row["m_desc"]      = desc unless desc.empty?
+        row["aref"]        = r.aref
+        row["params"]      = r.params
+        outer << row
       end
       outer
     end
@@ -419,12 +418,12 @@ module Generators
 
       @context.sections.each do |section|
         secdata = @values["sections"].select { |s| s["secsequence"] == section.sequence }
-        if secdata.size == 1
-          secdata = secdata[0]
+        next unless secdata.size == 1
 
-          rdl = build_resource_detail_list(section)
-          secdata["resource_list"] = rdl unless rdl.empty?
-        end
+        secdata = secdata[0]
+
+        rdl = build_resource_detail_list(section)
+        secdata["resource_list"] = rdl unless rdl.empty?
       end
 
       rl = build_require_list(@context)
@@ -483,7 +482,7 @@ module Generators
     # which is also its url
     def http_url(full_name, prefix)
       path = full_name.dup
-      path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
+      path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
       File.join(prefix, path.split("::").collect { |p| Digest::MD5.hexdigest(p) }) + ".html"
     end
 
@@ -571,17 +570,17 @@ module Generators
       atts.each do |att|
         next unless att.section == section
 
-        if att.visibility == :public || att.visibility == :protected || @options.show_all
-          entry = {
-            "name" => CGI.escapeHTML(att.name),
-            "rw" => att.rw,
-            "a_desc" => markup(att.comment, true)
-          }
-          unless att.visibility == :public || att.visibility == :protected
-            entry["rw"] << "-"
-          end
-          res << entry
+        next unless att.visibility == :public || att.visibility == :protected || @options.show_all
+
+        entry = {
+          "name" => CGI.escapeHTML(att.name),
+          "rw" => att.rw,
+          "a_desc" => markup(att.comment, true)
+        }
+        unless att.visibility == :public || att.visibility == :protected
+          entry["rw"] << "-"
         end
+        res << entry
       end
       res
     end
@@ -643,7 +642,7 @@ module Generators
     end
 
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
   end
 
@@ -668,13 +667,13 @@ module Generators
       prefix = "&nbsp;&nbsp;::" * level;
 
       context.nodes.sort.each do |node|
-        if node.document_self
-          res <<
-            prefix <<
-            "Node " <<
-            href(url(node.viewer.path), "link", node.full_name) <<
-            "<br />\n"
-        end
+        next unless node.document_self
+
+        res <<
+          prefix <<
+          "Node " <<
+          href(url(node.viewer.path), "link", node.full_name) <<
+          "<br />\n"
       end
       res
     end
@@ -725,7 +724,7 @@ module Generators
     # which is also its url
     def http_url(full_name, prefix)
       path = full_name.dup
-      path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
+      path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
       File.join(prefix, path.split("::")) + ".html"
     end
 
@@ -810,7 +809,7 @@ module Generators
     end
 
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
   end
 
@@ -850,7 +849,7 @@ module Generators
     end
 
     def index_name
-      "#{@context.name}"
+      @context.name.to_s
     end
 
     def params

data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb

@@ -25,7 +25,7 @@ module RDoc
   module Page
     FONTS = "Verdana,Arial,Helvetica,sans-serif"
 
-    STYLE = %{
+    STYLE = %(
 /* Reset */
 html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
 :focus{outline:0;}
@@ -244,17 +244,17 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 .ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
 .ruby-regexp  { color: #ffa07a; background: transparent; }
 .ruby-value   { color: #7fffd4; background: transparent; }
-}
+)
 
     #####################################################################
     ### H E A D E R   T E M P L A T E
     #####################################################################
 
-    XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+    XHTML_PREAMBLE = %(<?xml version="1.0" encoding="%charset%"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-}
+)
 
     HEADER = XHTML_PREAMBLE + %{
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -303,20 +303,20 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     ### C O N T E X T   C O N T E N T   T E M P L A T E
     #####################################################################
 
-    CONTEXT_CONTENT = %{
-}
+    CONTEXT_CONTENT = %(
+)
 
     #####################################################################
     ### F O O T E R   T E M P L A T E
     #####################################################################
-    FOOTER = %{
+    FOOTER = %(
 <div id="validator-badges">
   <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
 </div>
 
 </body>
 </html>
-}
+)
 
     #####################################################################
     ### F I L E   P A G E   H E A D E R   T E M P L A T E
@@ -467,7 +467,7 @@ END:infiles
     ### M E T H O D   L I S T   T E M P L A T E
     #####################################################################
 
-    PLUGIN_LIST = %{
+    PLUGIN_LIST = %(
 
   <div id="contextContent">
 IF:description
@@ -523,7 +523,7 @@ IF:seccomment
 ENDIF:seccomment
 ENDIF:sectitle
 END:sections
-}
+)
 
     METHOD_LIST = %{
 
@@ -844,17 +844,17 @@ END:sections
     ### B O D Y   T E M P L A T E
     #####################################################################
 
-    BODY = HEADER + %{
+    BODY = HEADER + %(
 
 !INCLUDE!  <!-- banner header -->
 
   <div id="bodyContent">
-} + METHOD_LIST + %{
+) + METHOD_LIST + %(
 
   </div>
-} + FOOTER
+) + FOOTER
 
-    BODYINC = HEADER + %{
+    BODYINC = HEADER + %(
 
 !INCLUDE!  <!-- banner header -->
 
@@ -863,13 +863,13 @@ END:sections
 !INCLUDE!
 
   </div>
-} + FOOTER
+) + FOOTER
 
     #####################################################################
     ### S O U R C E   C O D E   T E M P L A T E
     #####################################################################
 
-    SRC_PAGE = XHTML_PREAMBLE + %{
+    SRC_PAGE = XHTML_PREAMBLE + %(
 <html>
 <head>
   <title>%title%</title>
@@ -880,17 +880,17 @@ END:sections
   <pre>%code%</pre>
 </body>
 </html>
-}
+)
 
     #####################################################################
     ### I N D E X   F I L E   T E M P L A T E S
     #####################################################################
 
-    FR_INDEX_BODY = %{
+    FR_INDEX_BODY = %(
 !INCLUDE!
-}
+)
 
-    FILE_INDEX = XHTML_PREAMBLE + %{
+    FILE_INDEX = XHTML_PREAMBLE + %(
 <!--
 
     %list_title%
@@ -914,7 +914,7 @@ END:entries
 </div>
 </body>
 </html>
-}
+)
 
     TOP_INDEX = XHTML_PREAMBLE + %{
 <!--
@@ -1038,7 +1038,7 @@ ENDIF:plugins
 </html>
 }
 
-    INDEX = %{<?xml version="1.0" encoding="%charset%"?>
+    INDEX = %(<?xml version="1.0" encoding="%charset%"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -1061,7 +1061,7 @@ ENDIF:plugins
     <frame src="%initial_page%" name="docwin" />
 </frameset>
 </html>
-}
+)
   end # module Page
 end # class RDoc
 

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -69,9 +69,9 @@ module RDoc::PuppetParserCore
     # find a module
     fullpath = File.expand_path(path)
     Puppet.debug "rdoc: testing #{fullpath}"
-    if fullpath =~ /(.*)\/([^\/]+)\/(?:manifests|plugins|lib)\/.+\.(rb)$/
-      modpath = $1
-      name = $2
+    if fullpath =~ %r{(.*)/([^/]+)/(?:manifests|plugins|lib)/.+\.(rb)$}
+      modpath = ::Regexp.last_match(1)
+      name = ::Regexp.last_match(2)
       Puppet.debug "rdoc: module #{name} into #{modpath} ?"
       environment.modulepath.each do |mp|
         if File.identical?(modpath, mp)
@@ -103,10 +103,10 @@ module RDoc::PuppetParserCore
   def scan_top_level(container, environment)
     # use the module README as documentation for the module
     comment = ""
-    %w{README README.rdoc}.each do |rfile|
+    %w[README README.rdoc].each do |rfile|
       readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
       # module README should be UTF-8, not default system encoding
-      comment = File.open(readme, "r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
+      comment = File.open(readme, "r:UTF-8", &:read) if FileTest.readable?(readme)
     end
     look_for_directives_in(container, comment) unless comment.empty?
 
@@ -138,7 +138,7 @@ module RDoc::PuppetParserCore
   # create documentation for plugins
   def parse_plugins(container)
     Puppet.debug "rdoc: scanning plugin or fact"
-    if @input_file_name =~ /\/facter\/[^\/]+\.rb$/
+    if @input_file_name =~ %r{/facter/[^/]+\.rb$}
       parse_fact(container)
     else
       parse_puppet_plugin(container)
@@ -155,16 +155,16 @@ module RDoc::PuppetParserCore
         # fetch comments
         case line
         when /^[ \t]*# ?(.*)$/
-          comments += $1 + "\n"
+          comments += ::Regexp.last_match(1) + "\n"
         when /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
-          current_fact = RDoc::Fact.new($1, {})
+          current_fact = RDoc::Fact.new(::Regexp.last_match(1), {})
           look_for_directives_in(container, comments) unless comments.empty?
           current_fact.comment = comments
           parsed_facts << current_fact
           comments = ""
           Puppet.debug "rdoc: found custom fact #{current_fact.name}"
         when /^[ \t]*confine[ \t]*:(.*?)[ \t]*=>[ \t]*(.*)$/
-          current_fact.confine = { :type => $1, :value => $2 } unless current_fact.nil?
+          current_fact.confine = { :type => ::Regexp.last_match(1), :value => ::Regexp.last_match(2) } unless current_fact.nil?
         else # unknown line type
           comments = ""
         end
@@ -187,9 +187,9 @@ module RDoc::PuppetParserCore
         # fetch comments
         case line
         when /^[ \t]*# ?(.*)$/
-          comments += $1 + "\n"
+          comments += ::Regexp.last_match(1) + "\n"
         when /^[ \t]*(?:Puppet::Parser::Functions::)?newfunction[ \t]*\([ \t]*:(.*?)[ \t]*,[ \t]*:type[ \t]*=>[ \t]*(:rvalue|:lvalue)/
-          current_plugin = RDoc::Plugin.new($1, "function")
+          current_plugin = RDoc::Plugin.new(::Regexp.last_match(1), "function")
           look_for_directives_in(container, comments) unless comments.empty?
           current_plugin.comment = comments
           current_plugin.record_location(@top_level)
@@ -197,7 +197,7 @@ module RDoc::PuppetParserCore
           comments = ""
           Puppet.debug "rdoc: found new function plugins #{current_plugin.name}"
         when /^[ \t]*Puppet::Type.newtype[ \t]*\([ \t]*:(.*?)\)/
-          current_plugin = RDoc::Plugin.new($1, "type")
+          current_plugin = RDoc::Plugin.new(::Regexp.last_match(1), "type")
           look_for_directives_in(container, comments) unless comments.empty?
           current_plugin.comment = comments
           current_plugin.record_location(@top_level)

data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../../puppet/util/rdoc/parser/puppet_parser_core.rb'
+require_relative '../../../../puppet/util/rdoc/parser/puppet_parser_core'
 
 module RDoc
   PUPPET_RDOC_VERSION = 2

data/lib/puppet/util/rdoc/parser.rb

@@ -11,4 +11,4 @@ require_relative '../../../puppet/util/rdoc/code_objects'
 require 'rdoc/token_stream'
 require 'rdoc/markup/pre_process'
 require 'rdoc/parser'
-require_relative 'parser/puppet_parser_rdoc2.rb'
+require_relative 'parser/puppet_parser_rdoc2'

data/lib/puppet/util/reference.rb

@@ -13,11 +13,11 @@ class Puppet::Util::Reference
   instance_load(:reference, 'puppet/reference')
 
   def self.modes
-    %w{pdf text}
+    %w[pdf text]
   end
 
   def self.newreference(name, options = {}, &block)
-    ref = self.new(name, **options, &block)
+    ref = new(name, **options, &block)
     instance_hash(:reference)[name.intern] = ref
 
     ref
@@ -37,13 +37,17 @@ class Puppet::Util::Reference
     rst2latex = which('rst2latex') || which('rst2latex.py') ||
                 raise(_("Could not find rst2latex"))
 
-    cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
+    cmd = %(#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex)
     Puppet::Util.replace_file("/tmp/puppetdoc.txt") { |f| f.puts text }
     # There used to be an attempt to use secure_open / replace_file to secure
     # the target, too, but that did nothing: the race was still here.  We can
     # get exactly the same benefit from running this effort:
-    Puppet::FileSystem.unlink('/tmp/puppetdoc.tex') rescue nil
-    output = %x{#{cmd}}
+    begin
+      Puppet::FileSystem.unlink('/tmp/puppetdoc.tex')
+    rescue
+      nil
+    end
+    output = %x(#{cmd})
     unless $CHILD_STATUS == 0
       $stderr.puts _("rst2latex failed")
       $stderr.puts output
@@ -53,7 +57,7 @@ class Puppet::Util::Reference
 
     # Now convert to pdf
     Dir.chdir("/tmp") do
-      %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
+      %x(texi2pdf puppetdoc.tex >/dev/null 2>/dev/null)
     end
   end
 
@@ -67,14 +71,14 @@ class Puppet::Util::Reference
 
   def doc
     if defined?(@doc)
-      return "#{@name} - #{@doc}"
+      "#{@name} - #{@doc}"
     else
-      return @title
+      @title
     end
   end
 
   def dynamic?
-    self.dynamic
+    dynamic
   end
 
   def initialize(name, title: nil, depth: nil, dynamic: nil, doc: nil, &block)

data/lib/puppet/util/retry_action.rb

@@ -15,7 +15,7 @@ module Puppet::Util::RetryAction
   def self.retry_action(options = {})
     # Retry actions for a specified amount of time. This method will allow the final
     # retry to complete even if that extends beyond the timeout period.
-    if !block_given?
+    unless block_given?
       raise RetryException::NoBlockGiven
     end
 

data/lib/puppet/util/rpm_compare.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'English'
 module Puppet::Util::RpmCompare
-  ARCH_LIST = %w(
+  ARCH_LIST = %w[
     noarch i386 i686 ppc ppc64 armv3l armv4b armv4l armv4tl armv5tel
     armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
-  ).freeze
+  ].freeze
 
   ARCH_REGEX = Regexp.new(ARCH_LIST.join('|\.'))
 
@@ -52,14 +53,14 @@ module Puppet::Util::RpmCompare
       # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
       if str1 =~ /^[0-9]+/
         if str1 =~ /^[0-9]+/
-          segment1 = $~.to_s
-          str1 = $~.post_match
+          segment1 = $LAST_MATCH_INFO.to_s
+          str1 = $LAST_MATCH_INFO.post_match
         else
           segment1 = ''
         end
         if str2 =~ /^[0-9]+/
-          segment2 = $~.to_s
-          str2 = $~.post_match
+          segment2 = $LAST_MATCH_INFO.to_s
+          str2 = $LAST_MATCH_INFO.post_match
         else
           segment2 = ''
         end
@@ -67,14 +68,14 @@ module Puppet::Util::RpmCompare
       # else grab the chunk of continuous alphas from each string (which may be '')
       else
         if str1 =~ /^[A-Za-z]+/
-          segment1 = $~.to_s
-          str1 = $~.post_match
+          segment1 = $LAST_MATCH_INFO.to_s
+          str1 = $LAST_MATCH_INFO.post_match
         else
           segment1 = ''
         end
         if str2 =~ /^[A-Za-z]+/
-          segment2 = $~.to_s
-          str2 = $~.post_match
+          segment2 = $LAST_MATCH_INFO.to_s
+          str2 = $LAST_MATCH_INFO.post_match
         else
           segment2 = ''
         end
@@ -141,7 +142,7 @@ module Puppet::Util::RpmCompare
       version = full_version
       release = nil
     end
-    return { :epoch => epoch, :version => version, :release => release, :arch => architecture }
+    { :epoch => epoch, :version => version, :release => release, :arch => architecture }
   end
 
   # this method is a native implementation of the
@@ -149,10 +150,10 @@ module Puppet::Util::RpmCompare
   # found in python/header-py.c, as used by rpm.
   def compare_values(s1, s2)
     return 0 if s1.nil? && s2.nil?
-    return 1 if (not s1.nil?) && s2.nil?
-    return -1 if s1.nil? && (not s2.nil?)
+    return 1 if !s1.nil? && s2.nil?
+    return -1 if s1.nil? && !s2.nil?
 
-    return rpmvercmp(s1, s2)
+    rpmvercmp(s1, s2)
   end
 
   # how rpm compares two package versions:
@@ -173,7 +174,7 @@ module Puppet::Util::RpmCompare
     should_hash = rpm_parse_evr(should)
     is_hash = rpm_parse_evr(is)
 
-    if !should_hash[:epoch].nil?
+    unless should_hash[:epoch].nil?
       rc = compare_values(should_hash[:epoch], is_hash[:epoch])
       return rc unless rc == 0
     end
@@ -190,8 +191,6 @@ module Puppet::Util::RpmCompare
     # This should NOT be triggered if we're trying to ensure latest.
     return 0 if should_hash[:release].nil?
 
-    rc = compare_values(should_hash[:release], is_hash[:release])
-
-    return rc
+    compare_values(should_hash[:release], is_hash[:release])
   end
 end

data/lib/puppet/util/rubygems.rb

@@ -16,7 +16,7 @@ module Puppet::Util::RubyGems
         # rubygems installs. So when Bundler is around we have to act
         # as though rubygems is not, e.g. we shouldn't be able to load
         # a gem that Bundler doesn't want us to see.
-        defined? ::Gem and not defined? ::Bundler
+        defined? ::Gem and !defined? ::Bundler
       end
 
       # @api private