Code smell: Inconsistent indentation and related formatting issues

* Replaced 163 occurances of

      defined\? +([@a-zA-Z_.0-9?=]+)

  with

      defined?(\1)

  This makes detecting subsequent patterns easier.

  3 Examples:

      The code:
          if ! defined? @parse_config
      becomes:
          if ! defined?(@parse_config)
      The code:
          return @option_parser if defined? @option_parser
      becomes:
          return @option_parser if defined?(@option_parser)
      The code:
          if defined? @local and @local
      becomes:
          if defined?(@local) and @local

* Eliminate trailing spaces.

  Replaced 428 occurances of ^(.*?) +$ with \1

  1 file was skipped.

      test/ral/providers/host/parsed.rb because 0

* Replace leading tabs with an appropriate number of spaces.

  Replaced 306 occurances of ^(\t+)(.*) with

  Tabs are not consistently expanded in all environments.

* Don't arbitrarily wrap on sprintf (%) operator.

  Replaced 143 occurances of

      (.*['"] *%)
       +(.*)

  with

  Splitting the line does nothing to aid clarity and hinders further refactorings.

  3 Examples:

      The code:
          raise Puppet::Error, "Cannot create %s: basedir %s is a file" %
              [dir, File.join(path)]
      becomes:
          raise Puppet::Error, "Cannot create %s: basedir %s is a file" % [dir, File.join(path)]
      The code:
          Puppet.err "Will not start without authorization file %s" %
              Puppet[:authconfig]
      becomes:
          Puppet.err "Will not start without authorization file %s" % Puppet[:authconfig]
      The code:
          $stderr.puts "Could not find host for PID %s with status %s" %
              [pid, $?.exitstatus]
      becomes:
          $stderr.puts "Could not find host for PID %s with status %s" % [pid, $?.exitstatus]

* Don't break short arrays/parameter list in two.

  Replaced 228 occurances of

      (.*)
       +(.*)

  with

  3 Examples:

      The code:
          puts @format.wrap(type.provider(prov).doc,
                            :indent => 4, :scrub => true)
      becomes:
          puts @format.wrap(type.provider(prov).doc, :indent => 4, :scrub => true)
      The code:
          assert(FileTest.exists?(daily),
              "Did not make daily graph for %s" % type)
      becomes:
          assert(FileTest.exists?(daily), "Did not make daily graph for %s" % type)
      The code:
          assert(prov.target_object(:first).read !~ /^notdisk/,
              "Did not remove thing from disk")
      becomes:
          assert(prov.target_object(:first).read !~ /^notdisk/, "Did not remove thing from disk")

* If arguments must wrap, treat them all equally

  Replaced 510 occurances of

      lines ending in things like ...(foo, or ...(bar(1,3),

  with

      \1
          \2

  3 Examples:

      The code:
          midscope.to_hash(false),
      becomes:
          assert_equal(
      The code:
          botscope.to_hash(true),
      becomes:
          # bottomscope, then checking that we see the right stuff.
      The code:
          :path => link,
      becomes:

* Replaced 4516 occurances of ^( *)(.*) with

  The present code base is supposed to use four-space indentation.  In some places we failed
  to maintain that standard.  These should be fixed regardless of the 2 vs. 4 space question.

  15 Examples:

      The code:

          def run_comp(cmd)
             puts cmd
             results = []
             old_sync = $stdout.sync
             $stdout.sync = true
             line = []
             begin
                open("| #{cmd}", "r") do |f|
                  until f.eof? do
                    c = f.getc
      becomes:

          def run_comp(cmd)
              puts cmd
              results = []
              old_sync = $stdout.sync
              $stdout.sync = true
              line = []
              begin
                  open("| #{cmd}", "r") do |f|
                      until f.eof? do
                          c = f.getc
      The code:
                              s.gsub!(/.{4}/n, '\\\\u\&')
                            }
              string.force_encoding(Encoding::UTF_8)
              string
            rescue Iconv::Failure => e
              raise GeneratorError, "Caught #{e.class}: #{e}"
            end
          else
            def utf8_to_pson(string) # :nodoc:
              string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
              string.gsub!(/(
      becomes:
                                      s.gsub!(/.{4}/n, '\\\\u\&')
                                  }
                  string.force_encoding(Encoding::UTF_8)
                  string
              rescue Iconv::Failure => e
                  raise GeneratorError, "Caught #{e.class}: #{e}"
              end
          else
              def utf8_to_pson(string) # :nodoc:
                  string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
                  string.gsub!(/(
      The code:
              end
          }

          rvalues:      rvalue
                      | rvalues comma rvalue {
              if val[0].instance_of?(AST::ASTArray)
                  result = val[0].push(val[2])
              else
                  result = ast AST::ASTArray, :children => [val[0],val[2]]
              end
          }
      becomes:
              end
          }

          rvalues:      rvalue
              | rvalues comma rvalue {
                  if val[0].instance_of?(AST::ASTArray)
                  result = val[0].push(val[2])
              else
                  result = ast AST::ASTArray, :children => [val[0],val[2]]
              end
          }
      The code:
          #passwdproc = proc { @password }

                      keytext = @key.export(

              OpenSSL::Cipher::DES.new(:EDE3, :CBC),

              @password
          )
          File.open(@keyfile, "w", 0400) { |f|
              f << keytext
          }
      becomes:
          #        passwdproc = proc { @password }

              keytext = @key.export(

                  OpenSSL::Cipher::DES.new(:EDE3, :CBC),

                  @password
                  )
                  File.open(@keyfile, "w", 0400) { |f|
                      f << keytext
                  }
      The code:
          end

          def to_manifest
              "%s { '%s':\n%s\n}" % [self.type.to_s, self.name,
                   @params.collect { |p, v|
                       if v.is_a? Array
                           "    #{p} => [\'#{v.join("','")}\']"
                       else
                           "    #{p} => \'#{v}\'"
                       end
                   }.join(",\n")
      becomes:
          end

          def to_manifest
              "%s { '%s':\n%s\n}" % [self.type.to_s, self.name,
                  @params.collect { |p, v|
                      if v.is_a? Array
                          "    #{p} => [\'#{v.join("','")}\']"
                      else
                          "    #{p} => \'#{v}\'"
                      end
                  }.join(",\n")
      The code:
          via the augeas tool.

           Requires:
             - augeas to be installed (http://www.augeas.net)
             - ruby-augeas bindings

           Sample usage with a string::

              augeas{\"test1\" :
                     context => \"/files/etc/sysconfig/firstboot\",
                     changes => \"set RUN_FIRSTBOOT YES\",
      becomes:
          via the augeas tool.

          Requires:
              - augeas to be installed (http://www.augeas.net)
              - ruby-augeas bindings

          Sample usage with a string::

              augeas{\"test1\" :
                  context => \"/files/etc/sysconfig/firstboot\",
                  changes => \"set RUN_FIRSTBOOT YES\",
      The code:
              names.should_not be_include("root")
          end

          describe "when generating a purgeable resource" do
              it "should be included in the generated resources" do
                  Puppet::Type.type(:host).stubs(:instances).returns [@purgeable_resource]
                  @resources.generate.collect { |r| r.ref }.should include(@purgeable_resource.ref)
              end
          end

          describe "when the instance's do not have an ensure property" do
      becomes:
              names.should_not be_include("root")
          end

          describe "when generating a purgeable resource" do
              it "should be included in the generated resources" do
                  Puppet::Type.type(:host).stubs(:instances).returns [@purgeable_resource]
                  @resources.generate.collect { |r| r.ref }.should include(@purgeable_resource.ref)
              end
          end

          describe "when the instance's do not have an ensure property" do
      The code:
          describe "when the instance's do not have an ensure property" do
              it "should not be included in the generated resources" do
                  @no_ensure_resource = Puppet::Type.type(:exec).new(:name => '/usr/bin/env echo')
                  Puppet::Type.type(:host).stubs(:instances).returns [@no_ensure_resource]
                  @resources.generate.collect { |r| r.ref }.should_not include(@no_ensure_resource.ref)
              end
          end

          describe "when the instance's ensure property does not accept absent" do
              it "should not be included in the generated resources" do
                  @no_absent_resource = Puppet::Type.type(:service).new(:name => 'foobar')
      becomes:
          describe "when the instance's do not have an ensure property" do
              it "should not be included in the generated resources" do
                  @no_ensure_resource = Puppet::Type.type(:exec).new(:name => '/usr/bin/env echo')
                  Puppet::Type.type(:host).stubs(:instances).returns [@no_ensure_resource]
                  @resources.generate.collect { |r| r.ref }.should_not include(@no_ensure_resource.ref)
              end
          end

          describe "when the instance's ensure property does not accept absent" do
              it "should not be included in the generated resources" do
                  @no_absent_resource = Puppet::Type.type(:service).new(:name => 'foobar')
      The code:
          func = nil
          assert_nothing_raised do

                          func = Puppet::Parser::AST::Function.new(

                  :name => "template",
                  :ftype => :rvalue,

                  :arguments => AST::ASTArray.new(
                      :children => [stringobj(template)]
                  )
      becomes:
          func = nil
          assert_nothing_raised do

              func = Puppet::Parser::AST::Function.new(

                  :name => "template",
                  :ftype => :rvalue,

                  :arguments => AST::ASTArray.new(
                      :children => [stringobj(template)]
                  )
      The code:

                  assert(
              @store.allowed?("hostname.madstop.com", "192.168.1.50"),

          "hostname not allowed")

                  assert(
              ! @store.allowed?("name.sub.madstop.com", "192.168.0.50"),

          "subname name allowed")
      becomes:

          assert(
              @store.allowed?("hostname.madstop.com", "192.168.1.50"),

          "hostname not allowed")

              assert(
                  ! @store.allowed?("name.sub.madstop.com", "192.168.0.50"),

          "subname name allowed")
      The code:

          assert_nothing_raised {

                          server = Puppet::Network::Handler.fileserver.new(

                  :Local => true,

                  :Config => false
              )
          }

      becomes:

          assert_nothing_raised {

              server = Puppet::Network::Handler.fileserver.new(

                  :Local => true,

                  :Config => false
              )
          }

      The code:
               'yay',
                                               { :failonfail => false,
                                                 :uid => @user.uid,

                                                 :gid => @user.gid }
                                             ).returns('output')

          output = Puppet::Util::SUIDManager.run_and_capture 'yay',
                                                             @user.uid,
                                                             @user.gid
      becomes:
                  'yay',
                      { :failonfail => false,
                          :uid => @user.uid,

                          :gid => @user.gid }
                              ).returns('output')

          output = Puppet::Util::SUIDManager.run_and_capture 'yay',
              @user.uid,
              @user.gid
      The code:
                      ).times(1)
          pkg.provider.expects(
                          :aptget

                                  ).with(

                          '-y',
                          '-q',
                          'remove',

                          'faff'
      becomes:
                      ).times(1)
          pkg.provider.expects(
              :aptget

                  ).with(

                      '-y',
                      '-q',
                      'remove',

                      'faff'
      The code:
          johnny one two
          billy three four\n"

                  # Just parse and generate, to make sure it's isomorphic.
                  assert_nothing_raised do
                      assert_equal(text, @parser.to_file(@parser.parse(text)),
                          "parsing was not isomorphic")
                  end
              end

              def test_valid_attrs
      becomes:
          johnny one two
          billy three four\n"

          #         Just parse and generate, to make sure it's isomorphic.
          assert_nothing_raised do
              assert_equal(text, @parser.to_file(@parser.parse(text)),
                  "parsing was not isomorphic")
                  end
              end

              def test_valid_attrs
      The code:
                  "testing",
                              :onboolean => [true, "An on bool"],

                              :string => ["a string", "A string arg"]
                              )
          result = []
          should = []
          assert_nothing_raised("Add args failed") do
              @config.addargs(result)
          end
          @config.each do |name, element|
      becomes:
                  "testing",
                      :onboolean => [true, "An on bool"],

                      :string => ["a string", "A string arg"]
                      )
          result = []
          should = []
          assert_nothing_raised("Add args failed") do
              @config.addargs(result)
          end
          @config.each do |name, element|

21 files changed, 338 insertions, 335 deletions

diff --git a/lib/puppet/provider/package/aix.rb b/lib/puppet/provider/package/aix.rb
index 5cccdf376..385d33fac 100644
--- a/lib/puppet/provider/package/aix.rb
+++ b/lib/puppet/provider/package/aix.rb
@@ -43,7 +43,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
                         previous = updates[current[:name]]
 
                         unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
-                            updates[ current[:name] ] = current 
+                            updates[ current[:name] ] = current
                         end
 
                     else
diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb
index 352f8738f..a07b43f07 100644
--- a/lib/puppet/provider/package/appdmg.rb
+++ b/lib/puppet/provider/package/appdmg.rb
@@ -17,7 +17,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     desc "Package management which copies application bundles to a target."
 
     confine :operatingsystem => :darwin
-    
+
     commands :hdiutil => "/usr/bin/hdiutil"
     commands :curl => "/usr/bin/curl"
     commands :ditto => "/usr/bin/ditto"
@@ -40,12 +40,12 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     end
 
     def self.installapp(source, name, orig_source)
-      appname = File.basename(source);
-      ditto "--rsrc", source, "/Applications/#{appname}"
-      File.open("/var/db/.puppet_appdmg_installed_#{name}", "w") do |t|
-          t.print "name: '#{name}'\n"
-          t.print "source: '#{orig_source}'\n"
-      end
+        appname = File.basename(source);
+        ditto "--rsrc", source, "/Applications/#{appname}"
+        File.open("/var/db/.puppet_appdmg_installed_#{name}", "w") do |t|
+            t.print "name: '#{name}'\n"
+            t.print "source: '#{orig_source}'\n"
+        end
     end
 
     def self.installpkgdmg(source, name)
diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb
index 063470fc4..9214d4eb5 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -13,9 +13,12 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
 
     def self.instances
         instance_by_name.collect do |name|
-            self.new(
+
+                        self.new(
+                
                 :name => name,
                 :provider => :apple,
+        
                 :ensure => :installed
             )
         end
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index c43bb4dfc..9ae2a861e 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -19,7 +19,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     # install packages from remote sites.
 
     def checkforcdrom
-        unless defined? @@checkedforcdrom
+        unless defined?(@@checkedforcdrom)
             if FileTest.exists? "/etc/apt/sources.list"
                 if File.read("/etc/apt/sources.list") =~ /^[^#]*cdrom:/
                     @@checkedforcdrom = true
diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb
index 0471fb915..4b3841d88 100644
--- a/lib/puppet/provider/package/aptrpm.rb
+++ b/lib/puppet/provider/package/aptrpm.rb
@@ -12,12 +12,12 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
 
     if command('rpm')
         confine :true => begin
-                rpm('-ql', 'rpm')
-           rescue Puppet::ExecutionFailure
-               false
-           else
-               true
-           end
+            rpm('-ql', 'rpm')
+            rescue Puppet::ExecutionFailure
+                false
+            else
+                true
+            end
     end
 
     # Install a package using 'apt-get'.  This function needs to support
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index fda9e02fb..aaa277944 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -106,13 +106,15 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
         # list out our specific package
         begin
-            output = dpkgquery("-W", "--showformat",
+
+                        output = dpkgquery(
+                "-W", "--showformat",
+        
                 '${Status} ${Package} ${Version}\\n', @resource[:name]
             )
         rescue Puppet::ExecutionFailure
             # dpkg-query exits 1 if the package is not found.
-            return {:ensure => :purged, :status => 'missing',
-                :name => @resource[:name], :error => 'ok'}
+            return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
         end
 
@@ -120,8 +122,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
         if hash[:error] != "ok"
             raise Puppet::Error.new(
-                "Package %s, version %s is in error state: %s" %
-                    [hash[:name], hash[:ensure], hash[:error]]
+                "Package %s, version %s is in error state: %s" % [hash[:name], hash[:ensure], hash[:error]]
             )
         end
 
@@ -144,7 +145,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
                 tmpfile.flush
                 execute([:dpkg, "--set-selections"], :stdinfile => tmpfile.path.to_s)
             }
-        end 
+        end
     end
 
     def unhold
diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb
index 5d9e86313..d859c0e32 100755
--- a/lib/puppet/provider/package/fink.rb
+++ b/lib/puppet/provider/package/fink.rb
@@ -79,6 +79,6 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
 
     def purge
         aptget '-y', '-q', 'remove', '--purge', @resource[:name]
-     end
+    end
 end
 
diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index f4ca35466..79316f80f 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -6,8 +6,8 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
         libraries."
 
     commands :pkginfo => "/usr/sbin/pkg_info",
-             :pkgadd => "/usr/sbin/pkg_add",
-             :pkgdelete => "/usr/sbin/pkg_delete"
+        :pkgadd => "/usr/sbin/pkg_add",
+        :pkgdelete => "/usr/sbin/pkg_delete"
 
     confine :operatingsystem => :freebsd
 
diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb
index 56350fd36..9dca08d5c 100755
--- a/lib/puppet/provider/package/gem.rb
+++ b/lib/puppet/provider/package/gem.rb
@@ -4,9 +4,9 @@ require 'uri'
 # Ruby gems support.
 Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
     desc "Ruby Gem support.  If a URL is passed via ``source``, then that URL is used as the
-         remote gem repository; if a source is present but is not a valid URL, it will be
-         interpreted as the path to a local gem file.  If source is not present at all,
-         the gem will be installed from the default gem repositories."
+        remote gem repository; if a source is present but is not a valid URL, it will be
+        interpreted as the path to a local gem file.  If source is not present at all,
+        the gem will be installed from the default gem repositories."
 
     has_feature :versionable
 
diff --git a/lib/puppet/provider/package/hpux.rb b/lib/puppet/provider/package/hpux.rb
index 0c4fb36f0..76922dc09 100644
--- a/lib/puppet/provider/package/hpux.rb
+++ b/lib/puppet/provider/package/hpux.rb
@@ -7,8 +7,8 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
     desc "HP-UX's packaging system."
 
     commands :swinstall => "/usr/sbin/swinstall",
-             :swlist => "/usr/sbin/swlist",
-             :swremove => "/usr/sbin/swremove"
+        :swlist => "/usr/sbin/swlist",
+        :swremove => "/usr/sbin/swremove"
 
     confine :operatingsystem => "hp-ux"
 
diff --git a/lib/puppet/provider/package/nim.rb b/lib/puppet/provider/package/nim.rb
index 670136e6b..a798f338a 100644
--- a/lib/puppet/provider/package/nim.rb
+++ b/lib/puppet/provider/package/nim.rb
@@ -19,7 +19,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
     def self.srclistcmd(source)
         return [ command(:nimclient), "-o", "showres", "-a", "installp_flags=L", "-a", "resource=#{source}" ]
-    end        
+    end
 
     def install(useversion = true)
         unless source = @resource[:source]
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 1c873fdad..254c9ab61 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -78,24 +78,24 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     end
 
     def get_version
-        begin 
+        begin
             execpipe([command(:pkginfo), " -I ", @resource[:name]]) do |process|
                 # our regex for matching pkg_info output
                 regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/
                 fields = [ :name, :version, :flavor ]
                 master_version = 0
-    
+
                 process.each do |line|
-                    if match = regex.match(line.split()[0]) 
+                    if match = regex.match(line.split()[0])
                         # now we return the first version, unless ensure is latest
                         version = match.captures[1]
                         return version unless @resource[:ensure] == "latest"
-    
+
                         master_version = version unless master_version > version
                     end
                 end
-    
-                return master_version unless master_version == 0 
+
+                return master_version unless master_version == 0
                 raise Puppet::Error, "#{version} is not available for this package"
             end
         rescue Puppet::ExecutionFailure
diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
index 148ef0d62..7d21acb66 100644
--- a/lib/puppet/provider/package/pkg.rb
+++ b/lib/puppet/provider/package/pkg.rb
@@ -66,8 +66,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
             when "installed"
                 version = v
             else
-                Puppet.warn "unknown package state for %s: %s" %
-                            [@resource[:name], v]
+                Puppet.warn "unknown package state for %s: %s" % [@resource[:name], v]
             end
         end
         version
@@ -95,17 +94,14 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
         rescue Puppet::ExecutionFailure
             # pkg returns 1 if the package is not found.
             return {:ensure => :absent, :status => 'missing',
-                    :name => @resource[:name], :error => 'ok'}
+                :name => @resource[:name], :error => 'ok'}
         end
 
-        hash = self.class.parse_line(output) || 
-               {:ensure => :absent, :status => 'missing',
-                :name => @resource[:name], :error => 'ok'}
+        hash = self.class.parse_line(output) ||
+            {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
         if hash[:error] != "ok"
-              raise Puppet::Error.new(
-                    "Package %s, version %s is in error state: %s" %
-                    [hash[:name], hash[:version], hash[:error]])
+            raise Puppet::Error.new( "Package %s, version %s is in error state: %s" % [hash[:name], hash[:version], hash[:error]])
         end
 
         return hash
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb
index 25edc9109..4e9e50802 100644
--- a/lib/puppet/provider/package/pkgdmg.rb
+++ b/lib/puppet/provider/package/pkgdmg.rb
@@ -30,7 +30,7 @@ require 'facter/util/plist'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
     desc "Package management based on Apple's Installer.app and DiskUtility.app.  This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages.  See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail."
-    
+
     confine :operatingsystem => :darwin
     defaultfor :operatingsystem => :darwin
     commands :installer => "/usr/sbin/installer"
@@ -50,21 +50,24 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
 
     def self.instances
         instance_by_name.collect do |name|
+
             new(
+
                 :name => name,
                 :provider => :pkgdmg,
+
                 :ensure => :installed
             )
         end
     end
 
     def self.installpkg(source, name, orig_source)
-      installer "-pkg", source, "-target", "/"
-      # Non-zero exit status will throw an exception.
-      File.open("/var/db/.puppet_pkgdmg_installed_#{name}", "w") do |t|
-          t.print "name: '#{name}'\n"
-          t.print "source: '#{orig_source}'\n"
-      end
+        installer "-pkg", source, "-target", "/"
+        # Non-zero exit status will throw an exception.
+        File.open("/var/db/.puppet_pkgdmg_installed_#{name}", "w") do |t|
+            t.print "name: '#{name}'\n"
+            t.print "source: '#{orig_source}'\n"
+        end
     end
 
     def self.installpkgdmg(source, name)
diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb
index 21696721e..16e065ef8 100755
--- a/lib/puppet/provider/package/ports.rb
+++ b/lib/puppet/provider/package/ports.rb
@@ -2,9 +2,9 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     desc "Support for FreeBSD's ports.  Again, this still mixes packages and ports."
 
     commands :portupgrade => "/usr/local/sbin/portupgrade",
-             :portversion => "/usr/local/sbin/portversion",
-             :portuninstall => "/usr/local/sbin/pkg_deinstall",
-             :portinfo => "/usr/sbin/pkg_info"
+        :portversion => "/usr/local/sbin/portversion",
+        :portuninstall => "/usr/local/sbin/pkg_deinstall",
+        :portinfo => "/usr/sbin/pkg_info"
 
     defaultfor :operatingsystem => :freebsd
 
diff --git a/lib/puppet/provider/package/portupgrade.rb b/lib/puppet/provider/package/portupgrade.rb
index 531cab219..acdcab6f7 100644
--- a/lib/puppet/provider/package/portupgrade.rb
+++ b/lib/puppet/provider/package/portupgrade.rb
@@ -3,248 +3,248 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::Package do
-	include Puppet::Util::Execution
-
-	desc "Support for FreeBSD's ports using the portupgrade ports management software.
-	      Use the port's full origin as the resource name. eg (ports-mgmt/portupgrade)
-	      for the portupgrade port."
-
-	## has_features is usually autodetected based on defs below.
-	# has_features :installable, :uninstallable, :upgradeable
-
-	commands :portupgrade   => "/usr/local/sbin/portupgrade",
-	         :portinstall   => "/usr/local/sbin/portinstall",
-	         :portversion   => "/usr/local/sbin/portversion",
-	         :portuninstall => "/usr/local/sbin/pkg_deinstall",
-	         :portinfo      => "/usr/sbin/pkg_info"
-
-	## Activate this only once approved by someone important.
-	# defaultfor :operatingsystem => :freebsd
-
-	# Remove unwanted environment variables.
-	%w{INTERACTIVE UNAME}.each do |var|
-		if ENV.include?(var)
-			ENV.delete(var)
-		end
-	end	
-
-	######## instances sub command (builds the installed packages list)
-
-	def self.instances
-		Puppet.debug "portupgrade.rb Building packages list from installed ports"
-
-		# regex to match output from pkg_info
-		regex = %r{^(\S+)-([^-\s]+):(\S+)$}
-		# Corresponding field names
-		fields = [:portname, :ensure, :portorigin]
-		# define Temporary hash used, packages array of hashes
-		hash = Hash.new
-		packages = []
-
-		# exec command
-		cmdline = ["-aoQ"]
-		begin
-			output = portinfo(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-			return nil
-		end
-
-		# split output and match it and populate temp hash
-		output.split("\n").each { |data|
-			# reset hash to nil for each line
-			hash.clear
-			if match = regex.match(data)
-				# Output matched regex
-				fields.zip(match.captures) { |field, value|
-					hash[field] = value
-				}
-	
-				# populate the actual :name field from the :portorigin
-				# Set :provider to this object name
-				hash[:name] = hash[:portorigin]
-				hash[:provider] = self.name
-
-				# Add to the full packages listing
-				packages << new(hash)
-
-			else
-				# unrecognised output from pkg_info
-				Puppet.debug "portupgrade.Instances() - unable to match output: %s" % data
-			end
-		}
-
-		# return the packages array of hashes
-		return packages
-
-	end
-
-	######## Installation sub command
-
-	def install
-		Puppet.debug "portupgrade.install() - Installation call on %s" % @resource[:name]
-		# -M: yes, we're a batch, so don't ask any questions
+    include Puppet::Util::Execution
+
+    desc "Support for FreeBSD's ports using the portupgrade ports management software.
+        Use the port's full origin as the resource name. eg (ports-mgmt/portupgrade)
+        for the portupgrade port."
+
+        ## has_features is usually autodetected based on defs below.
+        # has_features :installable, :uninstallable, :upgradeable
+
+        commands :portupgrade   => "/usr/local/sbin/portupgrade",
+            :portinstall   => "/usr/local/sbin/portinstall",
+            :portversion   => "/usr/local/sbin/portversion",
+            :portuninstall => "/usr/local/sbin/pkg_deinstall",
+            :portinfo      => "/usr/sbin/pkg_info"
+
+        ## Activate this only once approved by someone important.
+        # defaultfor :operatingsystem => :freebsd
+
+        # Remove unwanted environment variables.
+        %w{INTERACTIVE UNAME}.each do |var|
+            if ENV.include?(var)
+                ENV.delete(var)
+                end
+        end	
+
+        ######## instances sub command (builds the installed packages list)
+
+        def self.instances
+            Puppet.debug "portupgrade.rb Building packages list from installed ports"
+
+            # regex to match output from pkg_info
+            regex = %r{^(\S+)-([^-\s]+):(\S+)$}
+            # Corresponding field names
+            fields = [:portname, :ensure, :portorigin]
+            # define Temporary hash used, packages array of hashes
+            hash = Hash.new
+            packages = []
+
+            # exec command
+            cmdline = ["-aoQ"]
+            begin
+                output = portinfo(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                    return nil
+                end
+
+                # split output and match it and populate temp hash
+                output.split("\n").each { |data|
+                #         reset hash to nil for each line
+                hash.clear
+                if match = regex.match(data)
+                #                 Output matched regex
+                fields.zip(match.captures) { |field, value|
+                    hash[field] = value
+                        }
+
+                        # populate the actual :name field from the :portorigin
+                        # Set :provider to this object name
+                        hash[:name] = hash[:portorigin]
+                        hash[:provider] = self.name
+
+                        # Add to the full packages listing
+                        packages << new(hash)
+
+                        else
+                        #         unrecognised output from pkg_info
+                        Puppet.debug "portupgrade.Instances() - unable to match output: %s" % data
+                        end
+                }
+
+                # return the packages array of hashes
+                return packages
+
+        end
+
+        ######## Installation sub command
+
+        def install
+            Puppet.debug "portupgrade.install() - Installation call on %s" % @resource[:name]
+            # -M: yes, we're a batch, so don't ask any questions
         	cmdline = ["-M BATCH=yes", @resource[:name]]
 
-		# FIXME: it's possible that portinstall prompts for data so locks up.
-		begin
-			output = portinstall(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-		end
-
-		if output =~ /\*\* No such /
-			raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
-		end
-
-		# No return code required, so do nil to be clean
-		return nil
-	end
-
-	######## Latest subcommand (returns the latest version available, or current version if installed is latest)
-	
-	def latest
-		Puppet.debug "portupgrade.latest() - Latest check called on %s" % @resource[:name]
-		# search for latest version available, or return current version.
-		# cmdline = "portversion -v <portorigin>", returns "<portname> <code> <stuff>"
-		# or "** No matching package found: <portname>"
+        #         FIXME: it's possible that portinstall prompts for data so locks up.
+        begin
+            output = portinstall(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                end
+
+                if output =~ /\*\* No such /
+                    raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
+                end
+
+                # No return code required, so do nil to be clean
+                return nil
+        end
+
+        ######## Latest subcommand (returns the latest version available, or current version if installed is latest)
+
+        def latest
+            Puppet.debug "portupgrade.latest() - Latest check called on %s" % @resource[:name]
+            # search for latest version available, or return current version.
+            # cmdline = "portversion -v <portorigin>", returns "<portname> <code> <stuff>"
+            # or "** No matching package found: <portname>"
         	cmdline = ["-v", @resource[:name]]
 
-		begin
-			output = portversion(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-		end
-
-		# Check: output format.
-		if output =~ /^\S+-([^-\s]+)\s+(\S)\s+(.*)/
-			# $1 = installed version, $2 = comparison, $3 other data
-			# latest installed
-			installedversion = $1
-			comparison = $2
-			otherdata = $3
-	
-			# Only return a new version number when it's clear that there is a new version
-			# all others return the current version so no unexpected 'upgrades' occur.	
-			case comparison
-			when "=", ">"
-				Puppet.debug "portupgrade.latest() - Installed package is latest (%s)" % installedversion
-				return installedversion
-			when "<"
-				# "portpkg-1.7_5  <  needs updating (port has 1.14)"
-				# "portpkg-1.7_5  <  needs updating (port has 1.14) (=> 'newport/pkg')
-				if otherdata =~ /\(port has (\S+)\)/
-					newversion = $1
-					Puppet.debug "portupgrade.latest() - Installed version needs updating to (%s)" % newversion
-					return newversion
-				else
-					Puppet.debug "portupgrade.latest() - Unable to determine new version from (%s)" % otherdata
-					return installedversion
-				end
-			when "?", "!", "#"
-				Puppet.debug "portupgrade.latest() - Comparison Error reported from portversion (%s)" % output
-				return installedversion
-			else
-				Puppet.debug "portupgrade.latest() - Unknown code from portversion output (%s)" % output
-				return installedversion
-			end
-			
-		else
-			# error: output not parsed correctly, error out with nil.
-			# Seriously - this section should never be called in a perfect world.
-			# as verification that the port is installed has already happened in query.
-			if output =~ /^\*\* No matching package /
-				raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
-			else
-				# Any other error (dump output to log)
-				raise Puppet::ExecutionFailure, "Unexpected output from portversion: %s" % output
-			end
-
-			# Just in case we still are running, return nil
-			return nil
-		end
-
-		# At this point normal operation has finished and we shouldn't have been called.
-		# Error out and let the admin deal with it.
-		raise Puppet::Error, "portversion.latest() - fatal error with portversion: %s" % output
-		return nil
-	
-	end
-
-	###### Query subcommand - return a hash of details if exists, or nil if it doesn't.
-	# Used to make sure the package is installed
-
-	def query
-		Puppet.debug "portupgrade.query() - Called on %s" % @resource[:name]
-
-		cmdline = ["-qO", @resource[:name]]
-		begin
-			output = portinfo(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-		end
-
-		# Check: if output isn't in the right format, return nil
-		if output =~ /^(\S+)-([^-\s]+)/
-			# Fill in the details
-			hash = Hash.new
-			hash[:portorigin]	= self.name
-			hash[:portname]		= $1
-			hash[:ensure]		= $2
-	
-			# If more details are required, then we can do another pkg_info query here
-			# and parse out that output and add to the hash
-
-			# return the hash to the caller
-			return hash
-		else
-			Puppet.debug "portupgrade.query() - package (%s) not installed" % @resource[:name]
-			return nil
-		end
-
-	end # def query
-
-	####### Uninstall command 
-
-	def uninstall
-		Puppet.debug "portupgrade.uninstall() - called on %s" % @resource[:name]
-		# Get full package name from port origin to uninstall with
-		cmdline = ["-qO", @resource[:name]]
-		begin
-			output = portinfo(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-		end
-
-		if output =~ /^(\S+)/
-			# output matches, so uninstall it
+            begin
+                output = portversion(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                end
+
+                # Check: output format.
+                if output =~ /^\S+-([^-\s]+)\s+(\S)\s+(.*)/
+                #         $1 = installed version, $2 = comparison, $3 other data
+                # latest installed
+                installedversion = $1
+                comparison = $2
+                otherdata = $3
+
+                # Only return a new version number when it's clear that there is a new version
+                # all others return the current version so no unexpected 'upgrades' occur.	
+                case comparison
+                when "=", ">"
+                    Puppet.debug "portupgrade.latest() - Installed package is latest (%s)" % installedversion
+                    return installedversion
+                        when "<"
+                        #         "portpkg-1.7_5  <  needs updating (port has 1.14)"
+                        # "portpkg-1.7_5  <  needs updating (port has 1.14) (=> 'newport/pkg')
+                        if otherdata =~ /\(port has (\S+)\)/
+                            newversion = $1
+                            Puppet.debug "portupgrade.latest() - Installed version needs updating to (%s)" % newversion
+                            return newversion
+                                else
+                                    Puppet.debug "portupgrade.latest() - Unable to determine new version from (%s)" % otherdata
+                                    return installedversion
+                                end
+                        when "?", "!", "#"
+                            Puppet.debug "portupgrade.latest() - Comparison Error reported from portversion (%s)" % output
+                            return installedversion
+                        else
+                            Puppet.debug "portupgrade.latest() - Unknown code from portversion output (%s)" % output
+                            return installedversion
+                        end
+
+                else
+                #         error: output not parsed correctly, error out with nil.
+                # Seriously - this section should never be called in a perfect world.
+                # as verification that the port is installed has already happened in query.
+                if output =~ /^\*\* No matching package /
+                    raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
+                        else
+                        #         Any other error (dump output to log)
+                        raise Puppet::ExecutionFailure, "Unexpected output from portversion: %s" % output
+                        end
+
+                        # Just in case we still are running, return nil
+                        return nil
+                end
+
+                # At this point normal operation has finished and we shouldn't have been called.
+                # Error out and let the admin deal with it.
+                raise Puppet::Error, "portversion.latest() - fatal error with portversion: %s" % output
+                return nil
+
+        end
+
+        ###### Query subcommand - return a hash of details if exists, or nil if it doesn't.
+        # Used to make sure the package is installed
+
+        def query
+            Puppet.debug "portupgrade.query() - Called on %s" % @resource[:name]
+
+            cmdline = ["-qO", @resource[:name]]
+            begin
+                output = portinfo(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                end
+
+                # Check: if output isn't in the right format, return nil
+                if output =~ /^(\S+)-([^-\s]+)/
+                #         Fill in the details
+                hash = Hash.new
+                hash[:portorigin]	= self.name
+                hash[:portname]		= $1
+                hash[:ensure]		= $2
+
+                # If more details are required, then we can do another pkg_info query here
+                # and parse out that output and add to the hash
+
+                # return the hash to the caller
+                return hash
+                else
+                    Puppet.debug "portupgrade.query() - package (%s) not installed" % @resource[:name]
+                    return nil
+                end
+
+        end # def query
+
+        ####### Uninstall command
+
+        def uninstall
+            Puppet.debug "portupgrade.uninstall() - called on %s" % @resource[:name]
+            # Get full package name from port origin to uninstall with
+            cmdline = ["-qO", @resource[:name]]
+            begin
+                output = portinfo(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                end
+
+                if output =~ /^(\S+)/
+                #         output matches, so uninstall it
         		portuninstall $1
-		end
-
-	end
-
-	######## Update/upgrade command
-
-	def update
-		Puppet.debug "portupgrade.update() - called on (%s)" % @resource[:name]
-
-		cmdline = ["-qO", @resource[:name]]
-		begin
-			output = portinfo(*cmdline)
-		rescue Puppet::ExecutionFailure
-			raise Puppet::Error.new(output)
-		end
-
-		if output =~ /^(\S+)/
-			# output matches, so upgrade the software
-			cmdline = ["-M BATCH=yes", $1]
-			begin
-				output = portupgrade(*cmdline)
-			rescue Puppet::ExecutionFailure
-				raise Puppet::Error.new(output)
-			end
-		end
-	end
+            end
+
+        end
+
+        ######## Update/upgrade command
+
+        def update
+            Puppet.debug "portupgrade.update() - called on (%s)" % @resource[:name]
+
+            cmdline = ["-qO", @resource[:name]]
+            begin
+                output = portinfo(*cmdline)
+                rescue Puppet::ExecutionFailure
+                    raise Puppet::Error.new(output)
+                end
+
+                if output =~ /^(\S+)/
+                #         output matches, so upgrade the software
+                cmdline = ["-M BATCH=yes", $1]
+                begin
+                    output = portupgrade(*cmdline)
+                        rescue Puppet::ExecutionFailure
+                            raise Puppet::Error.new(output)
+                        end
+                end
+        end
 
 ## EOF
 end
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index a9da43fac..6d5adf2ef 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -14,12 +14,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     if command('rpm')
         confine :true => begin
-                rpm('--version')
-           rescue Puppet::ExecutionFailure
-               false
-           else
-               true
-           end
+            rpm('--version')
+            rescue Puppet::ExecutionFailure
+                false
+            else
+                true
+            end
     end
 
     def self.instances
diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb
index 4f8b311ab..f0a1c6ac5 100755
--- a/lib/puppet/provider/package/sun.rb
+++ b/lib/puppet/provider/package/sun.rb
@@ -6,8 +6,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     desc "Sun's packaging system.  Requires that you specify the source for
         the packages you're managing."
     commands :pkginfo => "/usr/bin/pkginfo",
-             :pkgadd => "/usr/sbin/pkgadd",
-             :pkgrm => "/usr/sbin/pkgrm"
+        :pkgadd => "/usr/sbin/pkgadd",
+        :pkgrm => "/usr/sbin/pkgrm"
 
     confine :operatingsystem => :solaris
 
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index 284bbaf42..1de7c6ea5 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -5,7 +5,7 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
     commands :up2date => "/usr/sbin/up2date-nox"
 
     defaultfor :operatingsystem => [:redhat, :oel, :ovm],
-               :lsbdistrelease => ["2.1", "3", "4"]
+        :lsbdistrelease => ["2.1", "3", "4"]
 
     confine    :operatingsystem => [:redhat, :oel, :ovm]
 
diff --git a/lib/puppet/provider/package/urpmi.rb b/lib/puppet/provider/package/urpmi.rb
index a79e96227..05eed42d7 100644
--- a/lib/puppet/provider/package/urpmi.rb
+++ b/lib/puppet/provider/package/urpmi.rb
@@ -4,12 +4,12 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
 
     if command('rpm')
         confine :true => begin
-                rpm('-ql', 'rpm')
-           rescue Puppet::ExecutionFailure
-               false
-           else
-               true
-           end
+            rpm('-ql', 'rpm')
+            rescue Puppet::ExecutionFailure
+                false
+            else
+                true
+            end
     end
 
     defaultfor :operatingsystem => [:mandriva, :mandrake]
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
index 6fdff6997..32ab2c124 100755
--- a/lib/puppet/provider/package/yum.rb
+++ b/lib/puppet/provider/package/yum.rb
@@ -11,12 +11,12 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     if command('rpm')
         confine :true => begin
-                rpm('--version')
-           rescue Puppet::ExecutionFailure
-               false
-           else
-               true
-           end
+            rpm('--version')
+            rescue Puppet::ExecutionFailure
+                false
+            else
+                true
+            end
     end
 
     defaultfor :operatingsystem => [:fedora, :centos, :redhat]
@@ -28,26 +28,26 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         super
         return unless packages.detect { |name, package| package.should(:ensure) == :latest }
 
-         # collect our 'latest' info
-         updates = {}
-         python(YUMHELPER).each_line do |l|
-             l.chomp!
-             next if l.empty?
-             if l[0,4] == "_pkg"
-                 hash = nevra_to_hash(l[5..-1])
-                 [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each  do |n|
-                     updates[n] ||= []
-                     updates[n] << hash
-                 end
-             end
-         end
-
-         # Add our 'latest' info to the providers.
-         packages.each do |name, package|
-             if info = updates[package[:name]]
-                 package.provider.latest_info = info[0]
-             end
-         end
+        # collect our 'latest' info
+        updates = {}
+        python(YUMHELPER).each_line do |l|
+            l.chomp!
+            next if l.empty?
+            if l[0,4] == "_pkg"
+                hash = nevra_to_hash(l[5..-1])
+                [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each  do |n|
+                    updates[n] ||= []
+                    updates[n] << hash
+                end
+            end
+        end
+
+        # Add our 'latest' info to the providers.
+        packages.each do |name, package|
+            if info = updates[package[:name]]
+                package.provider.latest_info = info[0]
+            end
+        end
     end
 
     def install
@@ -104,5 +104,5 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     def purge
         yum "-y", :erase, @resource[:name]
     end
- end
+end