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|

6 files changed, 157 insertions, 161 deletions

diff --git a/spec/unit/network/authstore_spec.rb b/spec/unit/network/authstore_spec.rb
index 58eb92693..e3f819479 100644
--- a/spec/unit/network/authstore_spec.rb
+++ b/spec/unit/network/authstore_spec.rb
@@ -67,7 +67,7 @@ describe Puppet::Network::AuthStore::Declaration do
                     @declaration.should_not be_match('www.testsite.org',other.join('.'))
                 end
             end
-        }    
+        }
     }
 
     describe "when the pattern is a numeric IP with a back reference" do
@@ -93,56 +93,56 @@ describe Puppet::Network::AuthStore::Declaration do
         "3ffe:b00::1::a",
         "1:2:3::4:5::7:8",
         "12345::6:7:8",
-        "1::5:400.2.3.4", 
-        "1::5:260.2.3.4", 
-        "1::5:256.2.3.4", 
-        "1::5:1.256.3.4", 
-        "1::5:1.2.256.4", 
-        "1::5:1.2.3.256", 
-        "1::5:300.2.3.4", 
-        "1::5:1.300.3.4", 
-        "1::5:1.2.300.4", 
-        "1::5:1.2.3.300", 
-        "1::5:900.2.3.4", 
-        "1::5:1.900.3.4", 
-        "1::5:1.2.900.4", 
-        "1::5:1.2.3.900", 
-        "1::5:300.300.300.300", 
-        "1::5:3000.30.30.30", 
-        "1::400.2.3.4", 
-        "1::260.2.3.4", 
-        "1::256.2.3.4", 
-        "1::1.256.3.4", 
-        "1::1.2.256.4", 
-        "1::1.2.3.256", 
-        "1::300.2.3.4", 
-        "1::1.300.3.4", 
-        "1::1.2.300.4", 
-        "1::1.2.3.300", 
-        "1::900.2.3.4", 
-        "1::1.900.3.4", 
-        "1::1.2.900.4", 
-        "1::1.2.3.900", 
-        "1::300.300.300.300", 
-        "1::3000.30.30.30", 
-        "::400.2.3.4", 
-        "::260.2.3.4", 
-        "::256.2.3.4", 
-        "::1.256.3.4", 
-        "::1.2.256.4", 
-        "::1.2.3.256", 
-        "::300.2.3.4", 
-        "::1.300.3.4", 
-        "::1.2.300.4", 
-        "::1.2.3.300", 
-        "::900.2.3.4", 
-        "::1.900.3.4", 
-        "::1.2.900.4", 
-        "::1.2.3.900", 
-        "::300.300.300.300", 
-        "::3000.30.30.30", 
-        "2001:DB8:0:0:8:800:200C:417A:221", # unicast, full 
-        "FF01::101::2" # multicast, compressed 
+        "1::5:400.2.3.4",
+        "1::5:260.2.3.4",
+        "1::5:256.2.3.4",
+        "1::5:1.256.3.4",
+        "1::5:1.2.256.4",
+        "1::5:1.2.3.256",
+        "1::5:300.2.3.4",
+        "1::5:1.300.3.4",
+        "1::5:1.2.300.4",
+        "1::5:1.2.3.300",
+        "1::5:900.2.3.4",
+        "1::5:1.900.3.4",
+        "1::5:1.2.900.4",
+        "1::5:1.2.3.900",
+        "1::5:300.300.300.300",
+        "1::5:3000.30.30.30",
+        "1::400.2.3.4",
+        "1::260.2.3.4",
+        "1::256.2.3.4",
+        "1::1.256.3.4",
+        "1::1.2.256.4",
+        "1::1.2.3.256",
+        "1::300.2.3.4",
+        "1::1.300.3.4",
+        "1::1.2.300.4",
+        "1::1.2.3.300",
+        "1::900.2.3.4",
+        "1::1.900.3.4",
+        "1::1.2.900.4",
+        "1::1.2.3.900",
+        "1::300.300.300.300",
+        "1::3000.30.30.30",
+        "::400.2.3.4",
+        "::260.2.3.4",
+        "::256.2.3.4",
+        "::1.256.3.4",
+        "::1.2.256.4",
+        "::1.2.3.256",
+        "::300.2.3.4",
+        "::1.300.3.4",
+        "::1.2.300.4",
+        "::1.2.3.300",
+        "::900.2.3.4",
+        "::1.900.3.4",
+        "::1.2.900.4",
+        "::1.2.3.900",
+        "::300.300.300.300",
+        "::3000.30.30.30",
+        "2001:DB8:0:0:8:800:200C:417A:221", # unicast, full
+        "FF01::101::2" # multicast, compressed
     ].each { |invalid_ip|
         describe "when the pattern is an invalid IPv6 address such as #{invalid_ip}" do
             it "should raise an exception" do
@@ -152,97 +152,97 @@ describe Puppet::Network::AuthStore::Declaration do
     }
 
     [
-        "1.2.3.4", 
-        "2001:0000:1234:0000:0000:C1C0:ABCD:0876", 
-        "3ffe:0b00:0000:0000:0001:0000:0000:000a", 
-        "FF02:0000:0000:0000:0000:0000:0000:0001", 
-        "0000:0000:0000:0000:0000:0000:0000:0001", 
-        "0000:0000:0000:0000:0000:0000:0000:0000", 
-        "::ffff:192.168.1.26", 
-        "2::10", 
-        "ff02::1", 
-        "fe80::", 
-        "2002::", 
-        "2001:db8::", 
-        "2001:0db8:1234::", 
-        "::ffff:0:0", 
-        "::1", 
-        "::ffff:192.168.1.1", 
-        "1:2:3:4:5:6:7:8", 
-        "1:2:3:4:5:6::8", 
-        "1:2:3:4:5::8", 
-        "1:2:3:4::8", 
-        "1:2:3::8", 
-        "1:2::8", 
-        "1::8", 
-        "1::2:3:4:5:6:7", 
-        "1::2:3:4:5:6", 
-        "1::2:3:4:5", 
-        "1::2:3:4", 
-        "1::2:3", 
-        "1::8", 
-        "::2:3:4:5:6:7:8", 
-        "::2:3:4:5:6:7", 
-        "::2:3:4:5:6", 
-        "::2:3:4:5", 
-        "::2:3:4", 
-        "::2:3", 
-        "::8", 
-        "1:2:3:4:5:6::", 
-        "1:2:3:4:5::", 
-        "1:2:3:4::", 
-        "1:2:3::", 
-        "1:2::", 
-        "1::", 
-        "1:2:3:4:5::7:8", 
-        "1:2:3:4::7:8", 
-        "1:2:3::7:8", 
-        "1:2::7:8", 
-        "1::7:8", 
-        "1:2:3:4:5:6:1.2.3.4", 
-        "1:2:3:4:5::1.2.3.4", 
-        "1:2:3:4::1.2.3.4", 
-        "1:2:3::1.2.3.4", 
-        "1:2::1.2.3.4", 
-        "1::1.2.3.4", 
-        "1:2:3:4::5:1.2.3.4", 
-        "1:2:3::5:1.2.3.4", 
-        "1:2::5:1.2.3.4", 
-        "1::5:1.2.3.4", 
-        "1::5:11.22.33.44", 
-        "fe80::217:f2ff:254.7.237.98", 
-        "fe80::217:f2ff:fe07:ed62", 
-        "2001:DB8:0:0:8:800:200C:417A", # unicast, full 
-        "FF01:0:0:0:0:0:0:101", # multicast, full 
-        "0:0:0:0:0:0:0:1", # loopback, full 
-        "0:0:0:0:0:0:0:0", # unspecified, full 
-        "2001:DB8::8:800:200C:417A", # unicast, compressed 
-        "FF01::101", # multicast, compressed 
-        "::1", # loopback, compressed, non-routable 
-        "::", # unspecified, compressed, non-routable 
-        "0:0:0:0:0:0:13.1.68.3", # IPv4-compatible IPv6 address, full, deprecated 
-        "0:0:0:0:0:FFFF:129.144.52.38", # IPv4-mapped IPv6 address, full 
-        "::13.1.68.3", # IPv4-compatible IPv6 address, compressed, deprecated 
-        "::FFFF:129.144.52.38", # IPv4-mapped IPv6 address, compressed 
-        "2001:0DB8:0000:CD30:0000:0000:0000:0000/60", # full, with prefix 
-        "2001:0DB8::CD30:0:0:0:0/60", # compressed, with prefix 
-        "2001:0DB8:0:CD30::/60", # compressed, with prefix #2 
-        "::/128", # compressed, unspecified address type, non-routable 
-        "::1/128", # compressed, loopback address type, non-routable 
-        "FF00::/8", # compressed, multicast address type 
-        "FE80::/10", # compressed, link-local unicast, non-routable 
-        "FEC0::/10", # compressed, site-local unicast, deprecated 
-        "127.0.0.1", # standard IPv4, loopback, non-routable 
-        "0.0.0.0", # standard IPv4, unspecified, non-routable 
-        "255.255.255.255", # standard IPv4 
-        "fe80:0000:0000:0000:0204:61ff:fe9d:f156", 
-        "fe80:0:0:0:204:61ff:fe9d:f156", 
-        "fe80::204:61ff:fe9d:f156", 
-        "fe80:0000:0000:0000:0204:61ff:254.157.241.086", 
-        "fe80:0:0:0:204:61ff:254.157.241.86", 
-        "fe80::204:61ff:254.157.241.86", 
-        "::1", 
-        "fe80::", 
+        "1.2.3.4",
+        "2001:0000:1234:0000:0000:C1C0:ABCD:0876",
+        "3ffe:0b00:0000:0000:0001:0000:0000:000a",
+        "FF02:0000:0000:0000:0000:0000:0000:0001",
+        "0000:0000:0000:0000:0000:0000:0000:0001",
+        "0000:0000:0000:0000:0000:0000:0000:0000",
+        "::ffff:192.168.1.26",
+        "2::10",
+        "ff02::1",
+        "fe80::",
+        "2002::",
+        "2001:db8::",
+        "2001:0db8:1234::",
+        "::ffff:0:0",
+        "::1",
+        "::ffff:192.168.1.1",
+        "1:2:3:4:5:6:7:8",
+        "1:2:3:4:5:6::8",
+        "1:2:3:4:5::8",
+        "1:2:3:4::8",
+        "1:2:3::8",
+        "1:2::8",
+        "1::8",
+        "1::2:3:4:5:6:7",
+        "1::2:3:4:5:6",
+        "1::2:3:4:5",
+        "1::2:3:4",
+        "1::2:3",
+        "1::8",
+        "::2:3:4:5:6:7:8",
+        "::2:3:4:5:6:7",
+        "::2:3:4:5:6",
+        "::2:3:4:5",
+        "::2:3:4",
+        "::2:3",
+        "::8",
+        "1:2:3:4:5:6::",
+        "1:2:3:4:5::",
+        "1:2:3:4::",
+        "1:2:3::",
+        "1:2::",
+        "1::",
+        "1:2:3:4:5::7:8",
+        "1:2:3:4::7:8",
+        "1:2:3::7:8",
+        "1:2::7:8",
+        "1::7:8",
+        "1:2:3:4:5:6:1.2.3.4",
+        "1:2:3:4:5::1.2.3.4",
+        "1:2:3:4::1.2.3.4",
+        "1:2:3::1.2.3.4",
+        "1:2::1.2.3.4",
+        "1::1.2.3.4",
+        "1:2:3:4::5:1.2.3.4",
+        "1:2:3::5:1.2.3.4",
+        "1:2::5:1.2.3.4",
+        "1::5:1.2.3.4",
+        "1::5:11.22.33.44",
+        "fe80::217:f2ff:254.7.237.98",
+        "fe80::217:f2ff:fe07:ed62",
+        "2001:DB8:0:0:8:800:200C:417A", # unicast, full
+        "FF01:0:0:0:0:0:0:101", # multicast, full
+        "0:0:0:0:0:0:0:1", # loopback, full
+        "0:0:0:0:0:0:0:0", # unspecified, full
+        "2001:DB8::8:800:200C:417A", # unicast, compressed
+        "FF01::101", # multicast, compressed
+        "::1", # loopback, compressed, non-routable
+        "::", # unspecified, compressed, non-routable
+        "0:0:0:0:0:0:13.1.68.3", # IPv4-compatible IPv6 address, full, deprecated
+        "0:0:0:0:0:FFFF:129.144.52.38", # IPv4-mapped IPv6 address, full
+        "::13.1.68.3", # IPv4-compatible IPv6 address, compressed, deprecated
+        "::FFFF:129.144.52.38", # IPv4-mapped IPv6 address, compressed
+        "2001:0DB8:0000:CD30:0000:0000:0000:0000/60", # full, with prefix
+        "2001:0DB8::CD30:0:0:0:0/60", # compressed, with prefix
+        "2001:0DB8:0:CD30::/60", # compressed, with prefix #2
+        "::/128", # compressed, unspecified address type, non-routable
+        "::1/128", # compressed, loopback address type, non-routable
+        "FF00::/8", # compressed, multicast address type
+        "FE80::/10", # compressed, link-local unicast, non-routable
+        "FEC0::/10", # compressed, site-local unicast, deprecated
+        "127.0.0.1", # standard IPv4, loopback, non-routable
+        "0.0.0.0", # standard IPv4, unspecified, non-routable
+        "255.255.255.255", # standard IPv4
+        "fe80:0000:0000:0000:0204:61ff:fe9d:f156",
+        "fe80:0:0:0:204:61ff:fe9d:f156",
+        "fe80::204:61ff:fe9d:f156",
+        "fe80:0000:0000:0000:0204:61ff:254.157.241.086",
+        "fe80:0:0:0:204:61ff:254.157.241.86",
+        "fe80::204:61ff:254.157.241.86",
+        "::1",
+        "fe80::",
         "fe80::1"
     ].each { |ip|
         describe "when the pattern is a valid IP such as #{ip}" do
diff --git a/spec/unit/network/format_handler_spec.rb b/spec/unit/network/format_handler_spec.rb
index 622f7e5a1..13a9b8300 100755
--- a/spec/unit/network/format_handler_spec.rb
+++ b/spec/unit/network/format_handler_spec.rb
@@ -61,7 +61,7 @@ describe Puppet::Network::FormatHandler do
         describe "that is supported" do
             before do
                 Puppet.settings.expects(:value).with(:preferred_serialization_format).returns :one
-            end    
+            end
             it "should return the preferred serialization format first" do
                 FormatTester.supported_formats.should == [:one, :two]
             end
diff --git a/spec/unit/network/formats_spec.rb b/spec/unit/network/formats_spec.rb
index fd78ebf52..0811d61ce 100755
--- a/spec/unit/network/formats_spec.rb
+++ b/spec/unit/network/formats_spec.rb
@@ -141,7 +141,7 @@ describe "Puppet Network Format" do
             end
 
             it "use_zlib? should return false" do
-                @yaml.use_zlib?.should == false  
+                @yaml.use_zlib?.should == false
             end
 
             it "should refuse to encode" do
diff --git a/spec/unit/network/handler/fileserver_spec.rb b/spec/unit/network/handler/fileserver_spec.rb
index fbb5c8ae2..35da33278 100644
--- a/spec/unit/network/handler/fileserver_spec.rb
+++ b/spec/unit/network/handler/fileserver_spec.rb
@@ -64,15 +64,13 @@ describe Puppet::Network::Handler::FileServer do
     it "should list the contents of a nested directory" do
         create_nested_file()
         list = @mount.list("/", true, false)
-        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] ,
-                                ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
+        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] , ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
     end
 
     it "should list the contents of a directory ignoring files that match" do
         create_nested_file()
         list = @mount.list("/", true, "*File")
-        list.sort.should == [   ["/", "directory"] ,
-                                ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
+        list.sort.should == [   ["/", "directory"] , ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
     end
 
     it "should list the contents of a directory ignoring directories that match" do
@@ -102,15 +100,13 @@ describe Puppet::Network::Handler::FileServer do
     it "should list the base directory and files and nested directory to a depth of two" do
         create_nested_file()
         list = @mount.list("/", 2, false)
-        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] ,
-                                ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
+        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] , ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
     end
 
     it "should list the base directory and files and nested directory to a depth greater than the directory structure" do
         create_nested_file()
         list = @mount.list("/", 42, false)
-        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] ,
-                                ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
+        list.sort.should == [   ["/aFile", "file"], ["/", "directory"] , ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
     end
 
     it "should list a valid symbolic link as a file when recursing base dir" do
@@ -156,7 +152,7 @@ describe Puppet::Network::Handler::FileServer do
 
         it "should list a file within a directory when given the file path with recursion" do
             @mount.list("facter/fact.rb", true, "false").should == [["/", "file"], ["/", "file"]]
-         end
+        end
 
         it "should return a merged view of all plugins for all modules" do
             list = @mount.list("facter",true,false)
diff --git a/spec/unit/network/rest_authconfig_spec.rb b/spec/unit/network/rest_authconfig_spec.rb
index fe17d5626..2d41c3e5b 100755
--- a/spec/unit/network/rest_authconfig_spec.rb
+++ b/spec/unit/network/rest_authconfig_spec.rb
@@ -32,7 +32,7 @@ describe Puppet::Network::RestAuthConfig do
         @authconfig.rights = @acl
 
         @request = stub 'request', :indirection_name => "path", :key => "to/resource", :ip => "127.0.0.1",
-                                   :node => "me", :method => :save, :environment => :env, :authenticated => true
+            :node => "me", :method => :save, :environment => :env, :authenticated => true
     end
 
     it "should use the puppet default rest authorization file" do
@@ -115,7 +115,7 @@ describe Puppet::Network::RestAuthConfig do
 
     describe "when adding default ACLs" do
 
-       DEFAULT_ACL.each do |acl|
+        DEFAULT_ACL.each do |acl|
             it "should create a default right for #{acl[:acl]}" do
                 @authconfig.stubs(:mk_acl)
                 @authconfig.expects(:mk_acl).with(acl)
diff --git a/spec/unit/network/server_spec.rb b/spec/unit/network/server_spec.rb
index 2aeb99a8b..d981a7586 100755
--- a/spec/unit/network/server_spec.rb
+++ b/spec/unit/network/server_spec.rb
@@ -471,11 +471,11 @@ describe Puppet::Network::Server do
         end
 
         it "should pass the listening address to the HTTP server" do
-           @server.stubs(:http_server).returns(@mock_http_server)
-           @mock_http_server.expects(:listen).with do |args|
-               args[:address] == '127.0.0.1'
-           end
-           @server.listen
+            @server.stubs(:http_server).returns(@mock_http_server)
+            @mock_http_server.expects(:listen).with do |args|
+                args[:address] == '127.0.0.1'
+            end
+            @server.listen
         end
 
         it "should pass the listening port to the HTTP server" do
@@ -505,7 +505,7 @@ describe Puppet::Network::Server do
         it "should pass a list of protocols to the HTTP server" do
             @server.stubs(:http_server).returns(@mock_http_server)
             @mock_http_server.expects(:listen).with do |args|
-               args[:protocols] == [ :rest, :xmlrpc ]
+                args[:protocols] == [ :rest, :xmlrpc ]
             end
             @server.listen
         end