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]

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index 7428f266c..42f2ea01c 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -18,13 +18,9 @@ Puppet::Type.type(:service).provide :base do
     # Get the process ID for a running process. Requires the 'pattern'
     # parameter.
     def getpid
-        unless @resource[:pattern]
-            @resource.fail "Either stop/status commands or a pattern must be specified"
-        end
+        @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
         ps = Facter["ps"].value
-        unless ps and ps != ""
-            @resource.fail "You must upgrade Facter to a version that includes 'ps'"
-        end
+        @resource.fail "You must upgrade Facter to a version that includes 'ps'" unless ps and ps != ""
         regex = Regexp.new(@resource[:pattern])
         self.debug "Executing '#{ps}'"
         IO.popen(ps) { |table|