Code smell: Two space indentation

Replaced 106806 occurances of ^( +)(.*$) with

The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people
who learned ruby in the 1900s) uses two-space indentation.

3 Examples:

    The code:
        end

        # Tell getopt which arguments are valid
        def test_get_getopt_args
            element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
            assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")

    becomes:
        end

        # Tell getopt which arguments are valid
        def test_get_getopt_args
          element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
          assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")

    The code:
            assert_equal(str, val)

            assert_instance_of(Float, result)

        end

        # Now test it with a passed object
    becomes:
          assert_equal(str, val)

          assert_instance_of(Float, result)

        end

        # Now test it with a passed object
    The code:
        end

        assert_nothing_raised do
            klass[:Yay] = "boo"
            klass["Cool"] = :yayness
        end

    becomes:
        end

        assert_nothing_raised do
          klass[:Yay] = "boo"
          klass["Cool"] = :yayness
        end

2 files changed, 73 insertions, 73 deletions

diff --git a/spec/integration/node/environment_spec.rb b/spec/integration/node/environment_spec.rb
index 68dfd93a3..8c5153749 100755
--- a/spec/integration/node/environment_spec.rb
+++ b/spec/integration/node/environment_spec.rb
@@ -5,54 +5,54 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'puppet_spec/files'
 
 describe Puppet::Node::Environment do
-    include PuppetSpec::Files
-
-    it "should be able to return each module from its environment with the environment, name, and path set correctly" do
-        base = tmpfile("env_modules")
-        Dir.mkdir(base)
-
-        dirs = []
-        mods = {}
-        %w{1 2}.each do |num|
-            dir = File.join(base, "dir#{num}")
-            dirs << dir
-            Dir.mkdir(dir)
-            mod = "mod#{num}"
-            moddir = File.join(dir, mod)
-            mods[mod] = moddir
-            Dir.mkdir(moddir)
-        end
-
-        environment = Puppet::Node::Environment.new("foo")
-        environment.stubs(:modulepath).returns dirs
-
-        environment.modules.each do |mod|
-            mod.environment.should == environment
-            mod.path.should == mods[mod.name]
-        end
+  include PuppetSpec::Files
+
+  it "should be able to return each module from its environment with the environment, name, and path set correctly" do
+    base = tmpfile("env_modules")
+    Dir.mkdir(base)
+
+    dirs = []
+    mods = {}
+    %w{1 2}.each do |num|
+      dir = File.join(base, "dir#{num}")
+      dirs << dir
+      Dir.mkdir(dir)
+      mod = "mod#{num}"
+      moddir = File.join(dir, mod)
+      mods[mod] = moddir
+      Dir.mkdir(moddir)
     end
 
-    it "should not yield the same module from different module paths" do
-        base = tmpfile("env_modules")
-        Dir.mkdir(base)
-
-        dirs = []
-        mods = {}
-        %w{1 2}.each do |num|
-            dir = File.join(base, "dir#{num}")
-            dirs << dir
-            Dir.mkdir(dir)
-            mod = "mod"
-            moddir = File.join(dir, mod)
-            mods[mod] = moddir
-            Dir.mkdir(moddir)
-        end
-
-        environment = Puppet::Node::Environment.new("foo")
-        environment.stubs(:modulepath).returns dirs
-
-        mods = environment.modules
-        mods.length.should == 1
-        mods[0].path.should == File.join(base, "dir1", "mod")
+    environment = Puppet::Node::Environment.new("foo")
+    environment.stubs(:modulepath).returns dirs
+
+    environment.modules.each do |mod|
+      mod.environment.should == environment
+      mod.path.should == mods[mod.name]
+    end
+  end
+
+  it "should not yield the same module from different module paths" do
+    base = tmpfile("env_modules")
+    Dir.mkdir(base)
+
+    dirs = []
+    mods = {}
+    %w{1 2}.each do |num|
+      dir = File.join(base, "dir#{num}")
+      dirs << dir
+      Dir.mkdir(dir)
+      mod = "mod"
+      moddir = File.join(dir, mod)
+      mods[mod] = moddir
+      Dir.mkdir(moddir)
     end
+
+    environment = Puppet::Node::Environment.new("foo")
+    environment.stubs(:modulepath).returns dirs
+
+    mods = environment.modules
+    mods.length.should == 1
+    mods[0].path.should == File.join(base, "dir1", "mod")
+  end
 end
diff --git a/spec/integration/node/facts_spec.rb b/spec/integration/node/facts_spec.rb
index 0a4d21ed6..4cc2f4c1f 100755
--- a/spec/integration/node/facts_spec.rb
+++ b/spec/integration/node/facts_spec.rb
@@ -6,42 +6,42 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Node::Facts do
-    describe "when using the indirector" do
-        after { Puppet::Util::Cacher.expire }
+  describe "when using the indirector" do
+    after { Puppet::Util::Cacher.expire }
 
-        it "should expire any cached node instances when it is saved" do
-            Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
+    it "should expire any cached node instances when it is saved" do
+      Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
 
-            Puppet::Node::Facts.indirection.terminus(:yaml).should equal(Puppet::Node::Facts.indirection.terminus(:yaml))
-            terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
-            terminus.stubs :save
+      Puppet::Node::Facts.indirection.terminus(:yaml).should equal(Puppet::Node::Facts.indirection.terminus(:yaml))
+      terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
+      terminus.stubs :save
 
-            Puppet::Node.expects(:expire).with("me")
+      Puppet::Node.expects(:expire).with("me")
 
-            facts = Puppet::Node::Facts.new("me")
-            facts.save
-        end
+      facts = Puppet::Node::Facts.new("me")
+      facts.save
+    end
 
-        it "should be able to delegate to the :yaml terminus" do
-            Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
+    it "should be able to delegate to the :yaml terminus" do
+      Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
 
-            # Load now, before we stub the exists? method.
-            terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
+      # Load now, before we stub the exists? method.
+      terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
 
-            terminus.expects(:path).with("me").returns "/my/yaml/file"
-            FileTest.expects(:exist?).with("/my/yaml/file").returns false
+      terminus.expects(:path).with("me").returns "/my/yaml/file"
+      FileTest.expects(:exist?).with("/my/yaml/file").returns false
 
-            Puppet::Node::Facts.find("me").should be_nil
-        end
+      Puppet::Node::Facts.find("me").should be_nil
+    end
 
-        it "should be able to delegate to the :facter terminus" do
-            Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :facter
+    it "should be able to delegate to the :facter terminus" do
+      Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :facter
 
-            Facter.expects(:to_hash).returns "facter_hash"
-            facts = Puppet::Node::Facts.new("me")
-            Puppet::Node::Facts.expects(:new).with("me", "facter_hash").returns facts
+      Facter.expects(:to_hash).returns "facter_hash"
+      facts = Puppet::Node::Facts.new("me")
+      Puppet::Node::Facts.expects(:new).with("me", "facter_hash").returns facts
 
-            Puppet::Node::Facts.find("me").should equal(facts)
-        end
+      Puppet::Node::Facts.find("me").should equal(facts)
     end
+  end
 end