Code smell: Line modifiers are preferred to one-line blocks.

* Replaced 6 occurances of (while .*?) *do$ with

  The do is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          while line = f.gets do
      becomes:
          while line = f.gets
      The code:
          while line = shadow.gets do
      becomes:
          while line = shadow.gets
      The code:
          while wrapper = zeros.pop do
      becomes:
          while wrapper = zeros.pop

* Replaced 19 occurances of ((if|unless) .*?) *then$ with

  The then is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
      becomes:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
      The code:
          unless defined?(@spec_command) then
      becomes:
          unless defined?(@spec_command)
      The code:
          if c == ?\n then
      becomes:
          if c == ?\n

* Replaced 758 occurances of

      ((?:if|unless|while|until) .*)
          (.*)
      end

  with

  The one-line form is preferable provided:

      * The condition is not used to assign a variable
      * The body line is not already modified
      * The resulting line is not too long

  3 Examples:

      The code:
          if Puppet.features.libshadow?
              has_feature :manages_passwords
          end
      becomes:
          has_feature :manages_passwords if Puppet.features.libshadow?
      The code:
          unless (defined?(@current_pool) and @current_pool)
              @current_pool = process_zpool_data(get_pool_data)
          end
      becomes:
          @current_pool = process_zpool_data(get_pool_data) unless (defined?(@current_pool) and @current_pool)
      The code:
          if Puppet[:trace]
              puts detail.backtrace
          end
      becomes:
          puts detail.backtrace if Puppet[:trace]

5 files changed, 6 insertions, 18 deletions

diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb
index 8e55f742a..c17b83f96 100644
--- a/lib/puppet/file_serving/base.rb
+++ b/lib/puppet/file_serving/base.rb
@@ -69,9 +69,7 @@ class Puppet::FileServing::Base
 
     # Stat our file, using the appropriate link-sensitive method.
     def stat
-        unless defined?(@stat_method)
-            @stat_method = self.links == :manage ? :lstat : :stat
-        end
+        @stat_method = self.links == :manage ? :lstat : :stat unless defined?(@stat_method)
         File.send(@stat_method, full_path())
     end
 
diff --git a/lib/puppet/file_serving/configuration.rb b/lib/puppet/file_serving/configuration.rb
index 69b1f9329..5f958eb1d 100644
--- a/lib/puppet/file_serving/configuration.rb
+++ b/lib/puppet/file_serving/configuration.rb
@@ -109,9 +109,7 @@ class Puppet::FileServing::Configuration
 
         @parser ||= Puppet::FileServing::Configuration::Parser.new(config)
 
-        if check and ! @parser.changed?
-            return
-        end
+        return if check and ! @parser.changed?
 
         # Don't assign the mounts hash until we're sure the parsing succeeded.
         begin
diff --git a/lib/puppet/file_serving/configuration/parser.rb b/lib/puppet/file_serving/configuration/parser.rb
index f40a554e3..79fb0314d 100644
--- a/lib/puppet/file_serving/configuration/parser.rb
+++ b/lib/puppet/file_serving/configuration/parser.rb
@@ -87,9 +87,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile
 
     # Create a new mount.
     def newmount(name)
-        if @mounts.include?(name)
-            raise ArgumentError, "#{@mounts[name]} is already mounted at #{name}", @count, file
-        end
+        raise ArgumentError, "#{@mounts[name]} is already mounted at #{name}", @count, file if @mounts.include?(name)
         case name
         when "modules"
             mount = Mount::Modules.new(name)
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb
index 4155685d6..dbfe46631 100644
--- a/lib/puppet/file_serving/fileset.rb
+++ b/lib/puppet/file_serving/fileset.rb
@@ -158,9 +158,7 @@ class Puppet::FileServing::Fileset
     public
     # Stat a given file, using the links-appropriate method.
     def stat(path)
-        unless defined?(@stat_method)
-            @stat_method = self.links == :manage ? :lstat : :stat
-        end
+        @stat_method = self.links == :manage ? :lstat : :stat unless defined?(@stat_method)
 
         begin
             return File.send(@stat_method, path)
diff --git a/lib/puppet/file_serving/mount/file.rb b/lib/puppet/file_serving/mount/file.rb
index c876cc2c0..89d8c0587 100644
--- a/lib/puppet/file_serving/mount/file.rb
+++ b/lib/puppet/file_serving/mount/file.rb
@@ -55,12 +55,8 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
             # Mark that we're expandable.
             @expandable = true
         else
-            unless FileTest.directory?(path)
-                raise ArgumentError, "#{path} does not exist or is not a directory"
-            end
-            unless FileTest.readable?(path)
-                raise ArgumentError, "#{path} is not readable"
-            end
+            raise ArgumentError, "#{path} does not exist or is not a directory" unless FileTest.directory?(path)
+            raise ArgumentError, "#{path} is not readable" unless FileTest.readable?(path)
             @expandable = false
         end
         @path = path