Add omitted config options.

1 files changed, 92 insertions, 13 deletions

diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index a150336569..a290dd6607 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -32,28 +32,39 @@ class Chef
       def run
         setup
         register_controls
-        runner = RSpec::Core::Runner.new(nil)
-        runner.run_specs(RSpec.world.ordered_example_groups)
+        do_run
       end
 
       private
+      # Prepare to run audits:
+      #  - Require files
+      #  - Configure RSpec
+      #  - Configure Specinfra/Serverspec
       def setup
         require_deps
-        set_streams
-        add_formatters
-        disable_should_syntax
+        configure_rspec
         configure_specinfra
-        add_example_group_methods
-      end
-
-      def register_controls
-        run_context.controls.each do |name, group|
-          ctl_grp = RSpec::Core::ExampleGroup.__controls__(*group[:args], &group[:block])
-          RSpec.world.register(ctl_grp)
-        end
       end
 
+      # RSpec uses a global configuration object, RSpec.configuration. We found
+      # there was interference between the configuration for audit-mode and
+      # the configuration for our own spec tests in these cases:
+      #   1. Specinfra and Serverspec modify RSpec.configuration when loading.
+      #   2. Setting output/error streams.
+      #   3. Adding formatters.
+      #   4. Defining example group aliases.
+      #
+      # Moreover, Serverspec loads its DSL methods into the global namespace,
+      # which causes conflicts with the Chef namespace for resources and packages.
+      #
+      # We wait until we're in the audit-phase of the chef-client run to load
+      # these files. This helps with the namespacing problems we saw, and
+      # prevents Specinfra and Serverspec from modifying the RSpec configuration
+      # used by our spec tests.
       def require_deps
+        # TODO: We need to figure out a way to give audits its own configuration
+        # object. This involves finding a way to load these files w/o them adding
+        # to the configuration object used by our spec tests.
         require 'rspec'
         require 'rspec/its'
         require 'specinfra'
@@ -64,17 +75,49 @@ class Chef
         require 'chef/audit/rspec_formatter'
       end
 
+      # Configure RSpec just the way we like it:
+      #   - Set location of error and output streams
+      #   - Add custom audit-mode formatters
+      #   - Explicitly disable :should syntax
+      #   - Set :color option according to chef config
+      #   - Disable exposure of global DSL
+      def configure_rspec
+        set_streams
+        add_formatters
+        disable_should_syntax
+
+        RSpec.configure do |c|
+          c.color = Chef::Config[:color]
+          c.expose_dsl_globally = false
+        end
+      end
+
+      # Set the error and output streams which audit-mode will use to report
+      # human-readable audit information.
+      #
+      # This should always be called before #add_formatters. RSpec won't allow
+      # the output stream to be changed for a formatter once the formatter has
+      # been added.
       def set_streams
+        # TODO: Do some testing to ensure these will output/output properly to
+        # a file.
         RSpec.configuration.output_stream = Chef::Config[:log_location]
         RSpec.configuration.error_stream = Chef::Config[:log_location]
       end
 
+      # Add formatters which we use to
+      #   1. Output human-readable data to the output stream,
+      #   2. Collect JSON data to send back to the analytics server.
       def add_formatters
         RSpec.configuration.add_formatter(Chef::Audit::AuditEventProxy)
         RSpec.configuration.add_formatter(Chef::Audit::RspecFormatter)
         Chef::Audit::AuditEventProxy.events = run_context.events
       end
 
+      # Audit-mode uses RSpec 3. :should syntax is deprecated by default in
+      # RSpec 3, so we explicitly disable it here.
+      #
+      # This can be removed once :should is removed from RSpec.
       def disable_should_syntax
         RSpec.configure do |config|
           config.expect_with :rspec do |c|
@@ -83,15 +126,51 @@ class Chef
         end
       end
 
+      # Set up the backend for Specinfra/Serverspec.
       def configure_specinfra
+        # TODO: We may need to be clever and adjust this based on operating
+        # system, or make it configurable. E.g., there is a PowerShell backend,
+        # as well as an SSH backend.
         Specinfra.configuration.backend = :exec
       end
 
+      # Iterates through the controls registered to this run_context, builds an
+      # example group (RSpec::Core::ExampleGroup) object per controls, and
+      # registers the group with the RSpec.world.
+      #
+      # We could just store an array of example groups and not use RSpec.world,
+      # but it may be useful later if we decide to apply our own ordering scheme
+      # or use example group filters.
+      def register_controls
+        add_example_group_methods
+        run_context.controls.each do |name, group|
+          ctl_grp = RSpec::Core::ExampleGroup.__controls__(*group[:args], &group[:block])
+          RSpec.world.register(ctl_grp)
+        end
+      end
+
+      # Add example group method aliases to RSpec.
+      #
+      # __controls__: Used internally to create example groups from the controls
+      #               saved in the run_context.
+      #      control: Used within the context of a controls block, like RSpec's
+      #               describe or context.
       def add_example_group_methods
         RSpec::Core::ExampleGroup.define_example_group_method :__controls__
         RSpec::Core::ExampleGroup.define_example_group_method :control
       end
 
+      # Run the audits!
+      def do_run
+        # RSpec::Core::Runner wants to be initialized with an
+        # RSpec::Core::ConfigurationOptions object, which is used to process
+        # command line configuration arguments. We directly fiddle with the
+        # internal RSpec configuration object, so we give nil here and let
+        # RSpec pick up its own configuration and world.
+        runner = RSpec::Core::Runner.new(nil)
+        runner.run_specs(RSpec.world.ordered_example_groups)
+      end
+
     end
   end
 end