3 files changed, 9 insertions, 13 deletions
diff --git a/lib/puppet/util/settings/boolean_setting.rb b/lib/puppet/util/settings/boolean_setting.rb
index cc2704c4e..aa365fd8e 100644
--- a/lib/puppet/util/settings/boolean_setting.rb
+++ b/lib/puppet/util/settings/boolean_setting.rb
@@ -5,11 +5,9 @@ class Puppet::Util::Settings::BooleanSetting < Puppet::Util::Settings::Setting
     # get the arguments in getopt format
     def getopt_args
         if short
-            [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT],
-             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+            [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT], ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
         else
-            [["--#{name}", GetoptLong::NO_ARGUMENT],
-             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+            [["--#{name}", GetoptLong::NO_ARGUMENT], ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
         end
     end
 
@@ -26,8 +24,7 @@ class Puppet::Util::Settings::BooleanSetting < Puppet::Util::Settings::Setting
         when true, "true"; return true
         when false, "false"; return false
         else
-            raise ArgumentError, "Invalid value '%s' for %s" %
-                [value.inspect, @name]
+            raise ArgumentError, "Invalid value '%s' for %s" % [value.inspect, @name]
         end
     end
 end
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 6f0f315eb..815bdcf52 100644
--- a/lib/puppet/util/settings/file_setting.rb
+++ b/lib/puppet/util/settings/file_setting.rb
@@ -16,7 +16,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
 
     def group=(value)
         unless AllowedGroups.include?(value)
-            identifying_fields = [desc,name,default].compact.join(': ') 
+            identifying_fields = [desc,name,default].compact.join(': ')
             raise SettingError, "Internal error: The :group setting for %s must be 'service', not '%s'" % [identifying_fields,value]
         end
         @group = value
@@ -29,7 +29,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
 
     def owner=(value)
         unless AllowedOwners.include?(value)
-            identifying_fields = [desc,name,default].compact.join(': ') 
+            identifying_fields = [desc,name,default].compact.join(': ')
             raise SettingError, "Internal error: The :owner setting for %s must be either 'root' or 'service', not '%s'" % [identifying_fields,value]
         end
         @owner = value
@@ -115,8 +115,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
             name = $1
             unless @settings.include?(name)
                 raise ArgumentError,
-                    "Settings parameter '%s' is undefined" %
-                    name
+                    "Settings parameter '%s' is undefined" % name
             end
         }
     end
diff --git a/lib/puppet/util/settings/setting.rb b/lib/puppet/util/settings/setting.rb
index e64cfd6c6..489dfd01d 100644
--- a/lib/puppet/util/settings/setting.rb
+++ b/lib/puppet/util/settings/setting.rb
@@ -54,7 +54,7 @@ class Puppet::Util::Settings::Setting
     end
 
     def iscreated?
-        if defined? @iscreated
+        if defined?(@iscreated)
             return @iscreated
         else
             return false
@@ -62,7 +62,7 @@ class Puppet::Util::Settings::Setting
     end
 
     def set?
-        if defined? @value and ! @value.nil?
+        if defined?(@value) and ! @value.nil?
             return true
         else
             return false
@@ -82,7 +82,7 @@ class Puppet::Util::Settings::Setting
         str = @desc.gsub(/^/, "# ") + "\n"
 
         # Add in a statement about the default.
-        if defined? @default and @default
+        if defined?(@default) and @default
             str += "# The default value is '%s'.\n" % @default
         end