Code smell: Omit needless checks on defined

* Replaced 53 occurances of

      defined\?\((.+?)\) (?:and|&&) \1( |$)

  with

      \1\2

  In code like:

     unless defined? @foo and @foo and bar("baz")

  "defined? @foo and @foo" can safely be replaced with "@foo":

     unless @foo and bar("baz")

  Because:

   * Both evaluate to false/nil when @foo is not defined
   * Both evaluate to @foo when @foo is defined

  3 Examples:

      The code:
          @sync = Sync.new unless defined?(@sync) and @sync
      becomes:
          @sync = Sync.new unless @sync
      The code:
          unless defined?(@content) and @content
      becomes:
          unless @content
      The code:
          raise(ArgumentError, "Already handling indirection for #{@indirection.name}; cannot also handle #{indirection}") if defined?(@indirection) and @indirection
      becomes:
          raise(ArgumentError, "Already handling indirection for #{@indirection.name}; cannot also handle #{indirection}") if @indirection

* Replaced 2 occurances of

      defined\?\((.+?)\) (?:and|&&) ! *\1.nil\?

  with

      !\1.nil?

  In code like:

     while defined? @foo and ! @foo.nil? ...

  "defined? @foo and ! @foo.nil?" can safely be replaced with "! @foo.nil?":

     while ! @foo.nil? ...

  Because:

   * Both evaluate to false/nil when @foo is not defined
   * Both evaluate to "! @foo.nil?" when @foo is defined

  2 Examples:

      The code:
          !!(defined?(@value) and ! @value.nil?)
      becomes:
          !!(!@value.nil?)
      The code:
          self.init unless defined?(@@state) and ! @@state.nil?
      becomes:
          self.init unless !@@state.nil?

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/puppet/util/ldap/generator.rb b/lib/puppet/util/ldap/generator.rb
index fb4915100..2320c203c 100644
--- a/lib/puppet/util/ldap/generator.rb
+++ b/lib/puppet/util/ldap/generator.rb
@@ -30,7 +30,7 @@ class Puppet::Util::Ldap::Generator
     end
 
     def source
-        if defined?(@source) and @source
+        if @source
             @source.to_s
         else
             nil
diff --git a/lib/puppet/util/ldap/manager.rb b/lib/puppet/util/ldap/manager.rb
index b1048a1a3..3e3c54562 100644
--- a/lib/puppet/util/ldap/manager.rb
+++ b/lib/puppet/util/ldap/manager.rb
@@ -46,7 +46,7 @@ class Puppet::Util::Ldap::Manager
     def connect
         raise ArgumentError, "You must pass a block to #connect" unless block_given?
 
-        unless defined?(@connection) and @connection
+        unless @connection
             if Puppet[:ldaptls]
                 ssl = :tls
             elsif Puppet[:ldapssl]