First pass at DLS methods

3 files changed, 65 insertions, 2 deletions

diff --git a/chef.gemspec b/chef.gemspec
index 427657f678..16d11d39e5 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -41,9 +41,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.1.0"
 
   # rspec_junit_formatter 0.2.0 drops ruby 1.8.7 support
-  s.add_development_dependency "rspec_junit_formatter", "~> 0.1.0"
+  s.add_development_dependency "rspec_junit_formatter", "~> 0.2.0"
 
-  %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.14.0" }
+  %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 3.1" }
 
   s.bindir       = "bin"
   # chef-service-manager is a windows only executable.
diff --git a/lib/chef/dsl/audit.rb b/lib/chef/dsl/audit.rb
new file mode 100644
index 0000000000..a90f7f66e0
--- /dev/null
+++ b/lib/chef/dsl/audit.rb
@@ -0,0 +1,61 @@
+#
+# Author:: Tyler Ball (<tball@getchef.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'rspec/core'
+
+class Chef
+  module DSL
+    module Audit
+
+      # List of `controls` example groups to be executed
+      @example_groups = nil
+
+      # Adds the control_group and block (containing controls to execute) to the runner's list of pending examples
+      def control_group(group_name, &group_block)
+        puts "entered group named #{group_name}"
+        @example_groups = []
+
+        if group_block
+          yield
+        end
+
+        # TODO add the @example_groups list to the runner for later execution
+        p @example_groups
+
+        # Reset this to nil so we can tell if a `controls` message is sent outside a `control_group` block
+        # Prevents defining then un-defining the `controls` singleton method
+        @example_groups = nil
+      end
+
+      def controls(*args, &control_block)
+        if @example_groups.nil?
+          raise "Cannot define a `controls` unless inside a `control_group`"
+        end
+
+        example_name = args[0]
+        puts "entered control block named #{example_name}"
+        # TODO is this the correct way to define one?
+        # https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/example_group.rb#L197
+        # https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/example_group.rb#L323
+        @example_groups << ::RSpec::Core::ExampleGroup.describe(args, &control_block)
+      end
+
+    end
+  end
+end
+
+
diff --git a/lib/chef/recipe.rb b/lib/chef/recipe.rb
index de72a8d0c4..b4046e4f16 100644
--- a/lib/chef/recipe.rb
+++ b/lib/chef/recipe.rb
@@ -24,6 +24,7 @@ require 'chef/dsl/platform_introspection'
 require 'chef/dsl/include_recipe'
 require 'chef/dsl/registry_helper'
 require 'chef/dsl/reboot_pending'
+require 'chef/dsl/audit'
 
 require 'chef/mixin/from_file'
 
@@ -40,6 +41,7 @@ class Chef
     include Chef::DSL::Recipe
     include Chef::DSL::RegistryHelper
     include Chef::DSL::RebootPending
+    include Chef::DSL::Audit
 
     include Chef::Mixin::FromFile
     include Chef::Mixin::Deprecation