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

1 files changed, 129 insertions, 129 deletions

diff --git a/spec/unit/file_serving/configuration/parser_spec.rb b/spec/unit/file_serving/configuration/parser_spec.rb
index 6faf81b4c..36e721885 100755
--- a/spec/unit/file_serving/configuration/parser_spec.rb
+++ b/spec/unit/file_serving/configuration/parser_spec.rb
@@ -5,177 +5,177 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/file_serving/configuration/parser'
 
 describe Puppet::FileServing::Configuration::Parser do
-    it "should subclass the LoadedFile class" do
-        Puppet::FileServing::Configuration::Parser.superclass.should equal(Puppet::Util::LoadedFile)
-    end
+  it "should subclass the LoadedFile class" do
+    Puppet::FileServing::Configuration::Parser.superclass.should equal(Puppet::Util::LoadedFile)
+  end
 end
 
 
 module FSConfigurationParserTesting
-    def mock_file_content(content)
-        # We want an array, but we actually want our carriage returns on all of it.
-        lines = content.split("\n").collect { |l| l + "\n" }
-        @filehandle.stubs(:each).multiple_yields(*lines)
-    end
+  def mock_file_content(content)
+    # We want an array, but we actually want our carriage returns on all of it.
+    lines = content.split("\n").collect { |l| l + "\n" }
+    @filehandle.stubs(:each).multiple_yields(*lines)
+  end
 end
 
 describe Puppet::FileServing::Configuration::Parser do
-    before :each do
-        @path = "/my/config.conf"
-        FileTest.stubs(:exists?).with(@path).returns(true)
-        FileTest.stubs(:readable?).with(@path).returns(true)
-        @filehandle = mock 'filehandle'
-        File.expects(:open).with(@path).yields(@filehandle)
-        @parser = Puppet::FileServing::Configuration::Parser.new(@path)
-    end
-
-    describe Puppet::FileServing::Configuration::Parser, " when parsing" do
-        include FSConfigurationParserTesting
-
-        it "should allow comments" do
-            @filehandle.expects(:each).yields("# this is a comment\n")
-            proc { @parser.parse }.should_not raise_error
-        end
-
-        it "should allow blank lines" do
-            @filehandle.expects(:each).yields("\n")
-            proc { @parser.parse }.should_not raise_error
-        end
+  before :each do
+    @path = "/my/config.conf"
+    FileTest.stubs(:exists?).with(@path).returns(true)
+    FileTest.stubs(:readable?).with(@path).returns(true)
+    @filehandle = mock 'filehandle'
+    File.expects(:open).with(@path).yields(@filehandle)
+    @parser = Puppet::FileServing::Configuration::Parser.new(@path)
+  end
+
+  describe Puppet::FileServing::Configuration::Parser, " when parsing" do
+    include FSConfigurationParserTesting
+
+    it "should allow comments" do
+      @filehandle.expects(:each).yields("# this is a comment\n")
+      proc { @parser.parse }.should_not raise_error
+    end
 
-        it "should create a new mount for each section in the configuration" do
-            mount1 = mock 'one', :validate => true
-            mount2 = mock 'two', :validate => true
-            Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
-            Puppet::FileServing::Mount::File.expects(:new).with("two").returns(mount2)
-            mock_file_content "[one]\n[two]\n"
-            @parser.parse
-        end
+    it "should allow blank lines" do
+      @filehandle.expects(:each).yields("\n")
+      proc { @parser.parse }.should_not raise_error
+    end
 
-        # This test is almost the exact same as the previous one.
-        it "should return a hash of the created mounts" do
-            mount1 = mock 'one', :validate => true
-            mount2 = mock 'two', :validate => true
-            Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
-            Puppet::FileServing::Mount::File.expects(:new).with("two").returns(mount2)
-            mock_file_content "[one]\n[two]\n"
+    it "should create a new mount for each section in the configuration" do
+      mount1 = mock 'one', :validate => true
+      mount2 = mock 'two', :validate => true
+      Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
+      Puppet::FileServing::Mount::File.expects(:new).with("two").returns(mount2)
+      mock_file_content "[one]\n[two]\n"
+      @parser.parse
+    end
 
-            result = @parser.parse
-            result["one"].should equal(mount1)
-            result["two"].should equal(mount2)
-        end
+    # This test is almost the exact same as the previous one.
+    it "should return a hash of the created mounts" do
+      mount1 = mock 'one', :validate => true
+      mount2 = mock 'two', :validate => true
+      Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
+      Puppet::FileServing::Mount::File.expects(:new).with("two").returns(mount2)
+      mock_file_content "[one]\n[two]\n"
+
+      result = @parser.parse
+      result["one"].should equal(mount1)
+      result["two"].should equal(mount2)
+    end
 
-        it "should only allow mount names that are alphanumeric plus dashes" do
-            mock_file_content "[a*b]\n"
-            proc { @parser.parse }.should raise_error(ArgumentError)
-        end
+    it "should only allow mount names that are alphanumeric plus dashes" do
+      mock_file_content "[a*b]\n"
+      proc { @parser.parse }.should raise_error(ArgumentError)
+    end
 
-        it "should fail if the value for path/allow/deny starts with an equals sign" do
-            mock_file_content "[one]\npath = /testing"
-            proc { @parser.parse }.should raise_error(ArgumentError)
-        end
+    it "should fail if the value for path/allow/deny starts with an equals sign" do
+      mock_file_content "[one]\npath = /testing"
+      proc { @parser.parse }.should raise_error(ArgumentError)
+    end
 
-        it "should validate each created mount" do
-            mount1 = mock 'one'
-            Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
-            mock_file_content "[one]\n"
+    it "should validate each created mount" do
+      mount1 = mock 'one'
+      Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
+      mock_file_content "[one]\n"
 
-            mount1.expects(:validate)
+      mount1.expects(:validate)
 
-            @parser.parse
-        end
+      @parser.parse
+    end
 
-        it "should fail if any mount does not pass validation" do
-            mount1 = mock 'one'
-            Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
-            mock_file_content "[one]\n"
+    it "should fail if any mount does not pass validation" do
+      mount1 = mock 'one'
+      Puppet::FileServing::Mount::File.expects(:new).with("one").returns(mount1)
+      mock_file_content "[one]\n"
 
-            mount1.expects(:validate).raises RuntimeError
+      mount1.expects(:validate).raises RuntimeError
 
-            lambda { @parser.parse }.should raise_error(RuntimeError)
-        end
+      lambda { @parser.parse }.should raise_error(RuntimeError)
     end
+  end
 
-    describe Puppet::FileServing::Configuration::Parser, " when parsing mount attributes" do
-        include FSConfigurationParserTesting
+  describe Puppet::FileServing::Configuration::Parser, " when parsing mount attributes" do
+    include FSConfigurationParserTesting
 
-        before do
-            @mount = stub 'testmount', :name => "one", :validate => true
-            Puppet::FileServing::Mount::File.expects(:new).with("one").returns(@mount)
-            @parser.stubs(:add_modules_mount)
-        end
+    before do
+      @mount = stub 'testmount', :name => "one", :validate => true
+      Puppet::FileServing::Mount::File.expects(:new).with("one").returns(@mount)
+      @parser.stubs(:add_modules_mount)
+    end
 
-        it "should set the mount path to the path attribute from that section" do
-            mock_file_content "[one]\npath /some/path\n"
+    it "should set the mount path to the path attribute from that section" do
+      mock_file_content "[one]\npath /some/path\n"
 
-            @mount.expects(:path=).with("/some/path")
-            @parser.parse
-        end
+      @mount.expects(:path=).with("/some/path")
+      @parser.parse
+    end
 
-        it "should tell the mount to allow any allow values from the section" do
-            mock_file_content "[one]\nallow something\n"
+    it "should tell the mount to allow any allow values from the section" do
+      mock_file_content "[one]\nallow something\n"
 
-            @mount.expects(:info)
-            @mount.expects(:allow).with("something")
-            @parser.parse
-        end
+      @mount.expects(:info)
+      @mount.expects(:allow).with("something")
+      @parser.parse
+    end
 
-        it "should tell the mount to deny any deny values from the section" do
-            mock_file_content "[one]\ndeny something\n"
+    it "should tell the mount to deny any deny values from the section" do
+      mock_file_content "[one]\ndeny something\n"
 
-            @mount.expects(:info)
-            @mount.expects(:deny).with("something")
-            @parser.parse
-        end
+      @mount.expects(:info)
+      @mount.expects(:deny).with("something")
+      @parser.parse
+    end
 
-        it "should fail on any attributes other than path, allow, and deny" do
-            mock_file_content "[one]\ndo something\n"
+    it "should fail on any attributes other than path, allow, and deny" do
+      mock_file_content "[one]\ndo something\n"
 
-            proc { @parser.parse }.should raise_error(ArgumentError)
-        end
+      proc { @parser.parse }.should raise_error(ArgumentError)
     end
+  end
 
-    describe Puppet::FileServing::Configuration::Parser, " when parsing the modules mount" do
-        include FSConfigurationParserTesting
+  describe Puppet::FileServing::Configuration::Parser, " when parsing the modules mount" do
+    include FSConfigurationParserTesting
 
-        before do
-            @mount = stub 'modulesmount', :name => "modules", :validate => true
-        end
+    before do
+      @mount = stub 'modulesmount', :name => "modules", :validate => true
+    end
 
-        it "should create an instance of the Modules Mount class" do
-            mock_file_content "[modules]\n"
+    it "should create an instance of the Modules Mount class" do
+      mock_file_content "[modules]\n"
 
-            Puppet::FileServing::Mount::Modules.expects(:new).with("modules").returns @mount
-            @parser.parse
-        end
+      Puppet::FileServing::Mount::Modules.expects(:new).with("modules").returns @mount
+      @parser.parse
+    end
 
-        it "should warn if a path is set" do
-            mock_file_content "[modules]\npath /some/path\n"
-            Puppet::FileServing::Mount::Modules.expects(:new).with("modules").returns(@mount)
+    it "should warn if a path is set" do
+      mock_file_content "[modules]\npath /some/path\n"
+      Puppet::FileServing::Mount::Modules.expects(:new).with("modules").returns(@mount)
 
-            Puppet.expects(:warning)
-            @parser.parse
-        end
+      Puppet.expects(:warning)
+      @parser.parse
     end
+  end
 
-    describe Puppet::FileServing::Configuration::Parser, " when parsing the plugins mount" do
-        include FSConfigurationParserTesting
+  describe Puppet::FileServing::Configuration::Parser, " when parsing the plugins mount" do
+    include FSConfigurationParserTesting
 
-        before do
-            @mount = stub 'pluginsmount', :name => "plugins", :validate => true
-        end
+    before do
+      @mount = stub 'pluginsmount', :name => "plugins", :validate => true
+    end
 
-        it "should create an instance of the Plugins Mount class" do
-            mock_file_content "[plugins]\n"
+    it "should create an instance of the Plugins Mount class" do
+      mock_file_content "[plugins]\n"
 
-            Puppet::FileServing::Mount::Plugins.expects(:new).with("plugins").returns @mount
-            @parser.parse
-        end
+      Puppet::FileServing::Mount::Plugins.expects(:new).with("plugins").returns @mount
+      @parser.parse
+    end
 
-        it "should warn if a path is set" do
-            mock_file_content "[plugins]\npath /some/path\n"
+    it "should warn if a path is set" do
+      mock_file_content "[plugins]\npath /some/path\n"
 
-            Puppet.expects(:warning)
-            @parser.parse
-        end
+      Puppet.expects(:warning)
+      @parser.parse
     end
+  end
 end