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, 130 insertions, 130 deletions

diff --git a/spec/unit/application/queue_spec.rb b/spec/unit/application/queue_spec.rb
index 9f5b6c28c..87c96dfff 100755
--- a/spec/unit/application/queue_spec.rb
+++ b/spec/unit/application/queue_spec.rb
@@ -5,182 +5,182 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'puppet/application/queue'
 
 describe Puppet::Application::Queue do
-    before :each do
-        @queue = Puppet::Application[:queue]
-        @queue.stubs(:puts)
-        @daemon = stub_everything 'daemon', :daemonize => nil
-        Puppet::Util::Log.stubs(:newdestination)
-        Puppet::Util::Log.stubs(:level=)
+  before :each do
+    @queue = Puppet::Application[:queue]
+    @queue.stubs(:puts)
+    @daemon = stub_everything 'daemon', :daemonize => nil
+    Puppet::Util::Log.stubs(:newdestination)
+    Puppet::Util::Log.stubs(:level=)
 
-        Puppet::Resource::Catalog.stubs(:terminus_class=)
-    end
+    Puppet::Resource::Catalog.stubs(:terminus_class=)
+  end
 
-    it "should ask Puppet::Application to parse Puppet configuration file" do
-        @queue.should_parse_config?.should be_true
-    end
+  it "should ask Puppet::Application to parse Puppet configuration file" do
+    @queue.should_parse_config?.should be_true
+  end
 
-    it "should declare a main command" do
-        @queue.should respond_to(:main)
-    end
+  it "should declare a main command" do
+    @queue.should respond_to(:main)
+  end
 
-    it "should declare a preinit block" do
-        @queue.should respond_to(:preinit)
-    end
+  it "should declare a preinit block" do
+    @queue.should respond_to(:preinit)
+  end
 
-    describe "in preinit" do
-        before :each do
-            @queue.stubs(:trap)
-        end
+  describe "in preinit" do
+    before :each do
+      @queue.stubs(:trap)
+    end
 
-        it "should catch INT" do
-            @queue.expects(:trap).with { |arg,block| arg == :INT }
+    it "should catch INT" do
+      @queue.expects(:trap).with { |arg,block| arg == :INT }
 
-            @queue.preinit
-        end
+      @queue.preinit
+    end
 
-        it "should init :verbose to false" do
-            @queue.preinit
+    it "should init :verbose to false" do
+      @queue.preinit
 
-            @queue.options[:verbose].should be_false
-        end
+      @queue.options[:verbose].should be_false
+    end
 
-        it "should init :debug to false" do
-            @queue.preinit
+    it "should init :debug to false" do
+      @queue.preinit
 
-            @queue.options[:debug].should be_false
-        end
+      @queue.options[:debug].should be_false
+    end
 
-        it "should create a Daemon instance and copy ARGV to it" do
-            ARGV.expects(:dup).returns "eh"
-            daemon = mock("daemon")
-            daemon.expects(:argv=).with("eh")
-            Puppet::Daemon.expects(:new).returns daemon
-            @queue.preinit
-        end
+    it "should create a Daemon instance and copy ARGV to it" do
+      ARGV.expects(:dup).returns "eh"
+      daemon = mock("daemon")
+      daemon.expects(:argv=).with("eh")
+      Puppet::Daemon.expects(:new).returns daemon
+      @queue.preinit
     end
+  end
 
-    describe "when handling options" do
+  describe "when handling options" do
 
-        [:debug, :verbose].each do |option|
-            it "should declare handle_#{option} method" do
-                @queue.should respond_to("handle_#{option}".to_sym)
-            end
+    [:debug, :verbose].each do |option|
+      it "should declare handle_#{option} method" do
+        @queue.should respond_to("handle_#{option}".to_sym)
+      end
 
-            it "should store argument value when calling handle_#{option}" do
-                @queue.options.expects(:[]=).with(option, 'arg')
-                @queue.send("handle_#{option}".to_sym, 'arg')
-            end
-        end
+      it "should store argument value when calling handle_#{option}" do
+        @queue.options.expects(:[]=).with(option, 'arg')
+        @queue.send("handle_#{option}".to_sym, 'arg')
+      end
     end
+  end
 
-    describe "during setup" do
-        before :each do
-            @queue.options.stubs(:[])
-            @queue.daemon.stubs(:daemonize)
-            Puppet.stubs(:info)
-            Puppet.features.stubs(:stomp?).returns true
-            Puppet::Resource::Catalog.stubs(:terminus_class=)
-            Puppet.stubs(:settraps)
-            Puppet.settings.stubs(:print_config?)
-            Puppet.settings.stubs(:print_config)
-        end
+  describe "during setup" do
+    before :each do
+      @queue.options.stubs(:[])
+      @queue.daemon.stubs(:daemonize)
+      Puppet.stubs(:info)
+      Puppet.features.stubs(:stomp?).returns true
+      Puppet::Resource::Catalog.stubs(:terminus_class=)
+      Puppet.stubs(:settraps)
+      Puppet.settings.stubs(:print_config?)
+      Puppet.settings.stubs(:print_config)
+    end
 
-        it "should fail if the stomp feature is missing" do
-            Puppet.features.expects(:stomp?).returns false
-            lambda { @queue.setup }.should raise_error(ArgumentError)
-        end
+    it "should fail if the stomp feature is missing" do
+      Puppet.features.expects(:stomp?).returns false
+      lambda { @queue.setup }.should raise_error(ArgumentError)
+    end
 
-        it "should print puppet config if asked to in Puppet config" do
-            @queue.stubs(:exit)
-            Puppet.settings.stubs(:print_configs?).returns(true)
+    it "should print puppet config if asked to in Puppet config" do
+      @queue.stubs(:exit)
+      Puppet.settings.stubs(:print_configs?).returns(true)
 
-            Puppet.settings.expects(:print_configs)
+      Puppet.settings.expects(:print_configs)
 
-            @queue.setup
-        end
+      @queue.setup
+    end
 
-        it "should exit after printing puppet config if asked to in Puppet config" do
-            Puppet.settings.stubs(:print_configs?).returns(true)
+    it "should exit after printing puppet config if asked to in Puppet config" do
+      Puppet.settings.stubs(:print_configs?).returns(true)
 
-            lambda { @queue.setup }.should raise_error(SystemExit)
-        end
+      lambda { @queue.setup }.should raise_error(SystemExit)
+    end
 
-        it "should call setup_logs" do
-            @queue.expects(:setup_logs)
-            @queue.setup
-        end
+    it "should call setup_logs" do
+      @queue.expects(:setup_logs)
+      @queue.setup
+    end
 
-        describe "when setting up logs" do
-            before :each do
-                Puppet::Util::Log.stubs(:newdestination)
-            end
+    describe "when setting up logs" do
+      before :each do
+        Puppet::Util::Log.stubs(:newdestination)
+      end
 
-            it "should set log level to debug if --debug was passed" do
-                @queue.options.stubs(:[]).with(:debug).returns(true)
+      it "should set log level to debug if --debug was passed" do
+        @queue.options.stubs(:[]).with(:debug).returns(true)
 
-                Puppet::Util::Log.expects(:level=).with(:debug)
+        Puppet::Util::Log.expects(:level=).with(:debug)
 
-                @queue.setup_logs
-            end
+        @queue.setup_logs
+      end
 
-            it "should set log level to info if --verbose was passed" do
-                @queue.options.stubs(:[]).with(:verbose).returns(true)
+      it "should set log level to info if --verbose was passed" do
+        @queue.options.stubs(:[]).with(:verbose).returns(true)
 
-                Puppet::Util::Log.expects(:level=).with(:info)
+        Puppet::Util::Log.expects(:level=).with(:info)
 
-                @queue.setup_logs
-            end
+        @queue.setup_logs
+      end
 
-            [:verbose, :debug].each do |level|
-                it "should set console as the log destination with level #{level}" do
-                    @queue.options.stubs(:[]).with(level).returns(true)
+      [:verbose, :debug].each do |level|
+        it "should set console as the log destination with level #{level}" do
+          @queue.options.stubs(:[]).with(level).returns(true)
 
-                    Puppet::Util::Log.expects(:newdestination).with(:console)
+          Puppet::Util::Log.expects(:newdestination).with(:console)
 
-                    @queue.setup_logs
-                end
-            end
+          @queue.setup_logs
         end
+      end
+    end
 
-        it "should configure the Catalog class to use ActiveRecord" do
-            Puppet::Resource::Catalog.expects(:terminus_class=).with(:active_record)
+    it "should configure the Catalog class to use ActiveRecord" do
+      Puppet::Resource::Catalog.expects(:terminus_class=).with(:active_record)
 
-            @queue.setup
-        end
+      @queue.setup
+    end
 
-        it "should daemonize if needed" do
-            Puppet.expects(:[]).with(:daemonize).returns(true)
+    it "should daemonize if needed" do
+      Puppet.expects(:[]).with(:daemonize).returns(true)
 
-            @queue.daemon.expects(:daemonize)
+      @queue.daemon.expects(:daemonize)
 
-            @queue.setup
-        end
+      @queue.setup
     end
+  end
 
-    describe "when running" do
-        before :each do
-            @queue.stubs(:sleep_forever)
-            Puppet::Resource::Catalog::Queue.stubs(:subscribe)
-            Thread.list.each { |t| t.stubs(:join) }
-        end
+  describe "when running" do
+    before :each do
+      @queue.stubs(:sleep_forever)
+      Puppet::Resource::Catalog::Queue.stubs(:subscribe)
+      Thread.list.each { |t| t.stubs(:join) }
+    end
 
-        it "should subscribe to the queue" do
-            Puppet::Resource::Catalog::Queue.expects(:subscribe)
-            @queue.main
-        end
+    it "should subscribe to the queue" do
+      Puppet::Resource::Catalog::Queue.expects(:subscribe)
+      @queue.main
+    end
 
-        it "should log and save each catalog passed by the queue" do
-            catalog = mock 'catalog', :name => 'eh'
-            catalog.expects(:save)
+    it "should log and save each catalog passed by the queue" do
+      catalog = mock 'catalog', :name => 'eh'
+      catalog.expects(:save)
 
-            Puppet::Resource::Catalog::Queue.expects(:subscribe).yields(catalog)
-            Puppet.expects(:notice).times(2)
-            @queue.main
-        end
+      Puppet::Resource::Catalog::Queue.expects(:subscribe).yields(catalog)
+      Puppet.expects(:notice).times(2)
+      @queue.main
+    end
 
-        it "should join all of the running threads" do
-            Thread.list.each { |t| t.expects(:join) }
-            @queue.main
-        end
+    it "should join all of the running threads" do
+      Thread.list.each { |t| t.expects(:join) }
+      @queue.main
     end
+  end
 end