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, 5 insertions, 5 deletions

diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 351a1ae81..ee17d7ddc 100644
--- a/lib/puppet/util/settings/file_setting.rb
+++ b/lib/puppet/util/settings/file_setting.rb
@@ -23,7 +23,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
     end
 
     def group
-        return unless defined?(@group) && @group
+        return unless @group
         @settings[:group]
     end
 
@@ -36,7 +36,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
     end
 
     def owner
-        return unless defined?(@owner) && @owner
+        return unless @owner
         return "root" if @owner == "root" or ! use_service_user?
         @settings[:user]
     end
diff --git a/lib/puppet/util/settings/setting.rb b/lib/puppet/util/settings/setting.rb
index ba7e4b526..a14dcf050 100644
--- a/lib/puppet/util/settings/setting.rb
+++ b/lib/puppet/util/settings/setting.rb
@@ -50,11 +50,11 @@ class Puppet::Util::Settings::Setting
     end
 
     def iscreated?
-        defined?(@iscreated) && @iscreated
+        @iscreated
     end
 
     def set?
-        !!(defined?(@value) and ! @value.nil?)
+        !!(!@value.nil?)
     end
 
     # short name for the celement
@@ -68,7 +68,7 @@ class Puppet::Util::Settings::Setting
         str = @desc.gsub(/^/, "# ") + "\n"
 
         # Add in a statement about the default.
-        str += "# The default value is '#{@default}'.\n" if defined?(@default) and @default
+        str += "# The default value is '#{@default}'.\n" if @default
 
         # If the value has not been overridden, then print it out commented
         # and unconverted, so it's clear that that's the default and how it