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?

3 files changed, 3 insertions, 3 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 22e7a3b37..46d557341 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -251,7 +251,7 @@ module PuppetTest
     end
 
     def tmpdir
-        unless defined?(@tmpdir) and @tmpdir
+        unless @tmpdir
             @tmpdir = case Facter["operatingsystem"].value
                 when "Darwin"; "/private/tmp"
                 when "SunOS"; "/var/tmp"
diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index 1165773fd..3935322e6 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -12,7 +12,7 @@ module PuppetTest::ParserTesting
         attr_writer :evaluate
 
         def evaluated?
-            defined?(@evaluated) and @evaluated
+            @evaluated
         end
 
         def evaluate(*args)
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index fd5dcd199..26cf7b1e8 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -27,7 +27,7 @@ class TestUser < Test::Unit::TestCase
         end
 
         def exists?
-            if defined?(@ensure) and @ensure == :present
+            if @ensure == :present
                 true
             else
                 false