rspec-core 2.0.0.beta.11 → 2.0.0.beta.12

data/Rakefile

@@ -28,10 +28,6 @@ begin
 #{"*"*50}
 
   Thank you for installing #{gem.summary}
-
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec" (without --pre).
   
 #{"*"*50}
 EOM

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.11
+2.0.0.beta.12

data/features/command_line/example_name_option.feature

@@ -29,7 +29,7 @@ Feature: example name option
     When I run "rspec . --example nothing_like_this"
     Then I should see "0 examples, 0 failures"
 
-  Scenario: all matches
+  Scenario: match on one word
     When I run "rspec . --example example"
     Then I should see "4 examples, 0 failures"
 
@@ -37,10 +37,14 @@ Feature: example name option
     When I run "rspec . --example 'first example'"
     Then I should see "2 examples, 0 failures"
 
-  Scenario: one match in one file
+  Scenario: one match in one file using just the example name
     When I run "rspec . --example 'first example in first group'"
     Then I should see "1 example, 0 failures"
 
+  Scenario: one match in one file using the example name and the group name
+    When I run "rspec . --example 'first group first example in first group'"
+    Then I should see "1 example, 0 failures"
+
   Scenario: one match in one file using regexp
     When I run "rspec . --example 'first .* first example'"
     Then I should see "1 example, 0 failures"

data/features/configuration/options_file.feature

@@ -41,15 +41,14 @@ Feature: spec/spec.opts
     When I run "rspec ./spec/example_spec.rb"
     Then I should see "1 example, 0 failures"
 
-@wip            
-  Scenario: formatter set in both (.rspec wins)
+  Scenario: formatter set in both (RSpec.configure wins)
     Given a file named ".rspec" with:
       """
-      --format documentation
+      --format progress
       """
     And a file named "spec/spec_helper.rb" with:
       """
-      RSpec.configure {|c| c.formatter = 'progress'}
+      RSpec.configure {|c| c.formatter = 'documentation'}
       """
     And a file named "spec/example_spec.rb" with:
       """

data/features/hooks/before_and_after_hooks.feature

@@ -197,6 +197,36 @@ Feature: before and after hooks
     Then I should see "1 example, 0 failures"
     Then I should see matching /outer before all\n.outer after all\n\n\n\nFinished/
 
+  Scenario: nested examples have access to state set in outer before(:all)
+    Given a file named "before_all_spec.rb" with:
+      """
+      describe "something" do
+        before :all do
+          @value = 123
+        end
+
+        describe "nested" do
+          it "access state set in before(:all)" do
+            @value.should eq(123)
+          end
+
+          describe "nested more deeply" do
+            it "access state set in before(:all)" do
+              @value.should eq(123)
+            end
+          end
+        end
+
+        describe "nested in parallel" do
+          it "access state set in before(:all)" do
+            @value.should == 123
+          end
+        end
+      end
+      """
+    When I run "rspec before_all_spec.rb"
+    Then I should see "3 examples, 0 failures"
+
   Scenario: before/after all blocks have access to state
     Given a file named "before_and_after_all_spec.rb" with:
       """

data/features/hooks/halt.feature

@@ -1,10 +1,9 @@
 Feature: halt
   
-  In an example, before hook, after hook, or around hook, you can
-  halt the current example, group, or suite based on arbitrary
-  criteria.
+  In an example, before or after hook, you can halt the current example, group,
+  or suite based on arbitrary criteria.
 
-  @wip
+@wip
   Scenario: halt group on failure
     Given a directory named "spec"
     And a file named "spec/example_spec.rb" with:

data/lib/rspec/core/command_line.rb

@@ -3,6 +3,7 @@ module RSpec
     class CommandLine
       def initialize(argv)
         @options = RSpec::Core::ConfigurationOptions.new(argv)
+        @options.parse_options
         @options.configure(configuration)
         configuration.require_files_to_run
         configuration.configure_mock_framework

data/lib/rspec/core/configuration.rb

@@ -120,10 +120,30 @@ module RSpec
         backtrace_clean_patterns.clear
       end
 
+      def color_enabled=(bool)
+        return unless bool
+        settings[:color_enabled] = true
+        if bool && Config::CONFIG['host_os'] =~ /mswin|mingw/
+          orig_output_stream = settings[:output_stream]
+          begin
+            require 'Win32/Console/ANSI'
+          rescue LoadError
+            warn "You must 'gem install win32console' to use colour on Windows"
+            settings[:color_enabled] = false
+          ensure
+            settings[:output_stream] = orig_output_stream
+          end
+        end
+      end
+
       def libs=(libs)
         libs.map {|lib| $LOAD_PATH.unshift lib}
       end
 
+      def requires=(paths)
+        paths.map {|path| require path}
+      end
+
       def debug=(bool)
         return unless bool
         begin
@@ -151,13 +171,17 @@ EOM
       end
       
       def formatter=(formatter_to_use)
-        formatter_class = case formatter_to_use.to_s
-        when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
-          RSpec::Core::Formatters::DocumentationFormatter
-        when 'progress' 
-          RSpec::Core::Formatters::ProgressFormatter
-        else 
-          raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?."
+        if formatter_to_use.is_a?(Class)
+          formatter_class = formatter_to_use
+        else
+          formatter_class = case formatter_to_use.to_s
+          when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
+            RSpec::Core::Formatters::DocumentationFormatter
+          when 'progress' 
+            RSpec::Core::Formatters::ProgressFormatter
+          else 
+            raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?."
+          end
         end
         self.formatter_class = formatter_class
       end
@@ -189,10 +213,16 @@ EOM
         RSpec::Core::ExampleGroup.alias_example_to(new_name, extra_options)
       end
 
-      def filter_run(options={})
+      def filter_run_including(options={})
         self.filter = options unless filter and filter[:line_number] || filter[:full_description]
       end
 
+      alias_method :filter_run, :filter_run_including
+
+      def filter_run_excluding(options={})
+        self.exclusion_filter = options
+      end
+
       def include(mod, filters={})
         include_or_extend_modules << [:include, mod, filters]
       end

data/lib/rspec/core/configuration_options.rb

@@ -12,37 +12,47 @@ module RSpec
       
       def initialize(args)
         @args = args
-        @options = parse_options
       end
 
       def configure(config)
-        options.each do |key, value|
-          config.send("#{key}=", value) rescue nil
+        sorted_keys.each do |key|
+          config.send("#{key}=", options[key])
         end
       end
 
+      def sorted_keys
+        options.keys.sort{|a,b| a.to_s <=> b.to_s}
+      end
+
       def drb_argv
         argv = []
         argv << "--color"    if options[:color_enabled]
         argv << "--profile"   if options[:profile_examples]
         argv << "--backtrace" if options[:full_backtrace]
-        argv << "--formatter"    << options[:formatter]               if options[:formatter]
+        argv << "--format"       << options[:formatter]               if options[:formatter]
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
         argv << "--options_file" << options[:options_file]            if options[:options_file]
         argv << "--example"      << options[:full_description].source if options[:full_description]
         argv + options[:files_or_directories_to_run]
       end
 
-    private
-
       def parse_options
-        command_line_options = parse_command_line_options
-        local_options        = parse_local_options(command_line_options)
-        global_options       = parse_global_options
+        @options = begin
+                     command_line_options = parse_command_line_options
+                     local_options        = parse_local_options(command_line_options)
+                     global_options       = parse_global_options
+                     env_options          = parse_env_options
 
-        [global_options, local_options, command_line_options].inject do |merged, options|
-          merged.merge(options)
-        end
+                     [global_options, local_options, command_line_options, env_options].inject do |merged, options|
+                       merged.merge(options)
+                     end
+                   end
+      end
+
+    private
+
+      def parse_env_options
+        ENV["SPEC_OPTS"] ? Parser.parse!(ENV["SPEC_OPTS"].split) : {}
       end
 
       def parse_command_line_options

data/lib/rspec/core/drb_command_line.rb

@@ -3,6 +3,7 @@ module RSpec
     class DRbCommandLine
       def initialize(argv)
         @options = RSpec::Core::ConfigurationOptions.new(argv)
+        @options.parse_options
       end
 
       def drb_port

data/lib/rspec/core/example_group.rb

@@ -65,13 +65,17 @@ module RSpec
       end
 
       def self.examples
-        @_examples ||= []
+        @examples ||= []
       end
 
       def self.filtered_examples
         world.filtered_examples[self]
       end
 
+      def self.descendant_filtered_examples
+        filtered_examples + children.collect{|c| c.descendant_filtered_examples}
+      end
+
       def self.metadata
         @metadata 
       end
@@ -111,8 +115,8 @@ module RSpec
         @children ||= []
       end
 
-      def self.descendents
-        [self] + children.collect {|c| c.descendents}.flatten
+      def self.descendants
+        [self] + children.collect {|c| c.descendants}.flatten
       end
 
       def self.ancestors
@@ -132,14 +136,12 @@ module RSpec
       end
 
       def self.eval_before_alls(running_example)
-        return if filtered_examples.empty?
+        return if descendant_filtered_examples.empty?
         superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
         world.run_hook(:before, :all, self, running_example)
 
-        ancestors.reverse.each do |ancestor|
-          until ancestor.before_alls.empty?
-            running_example.instance_eval &ancestor.before_alls.shift
-          end
+        until before_alls.empty?
+          running_example.instance_eval &before_alls.shift
         end
         running_example.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
@@ -155,7 +157,7 @@ module RSpec
       end
 
       def self.eval_after_alls(running_example)
-        return if filtered_examples.empty?
+        return if descendant_filtered_examples.empty?
         before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
         ancestors.each do |ancestor|
           until ancestor.after_alls.empty?
@@ -171,8 +173,8 @@ module RSpec
         begin
           eval_before_alls(example_group_instance)
           result_for_this_group = run_examples(example_group_instance, reporter)
-          results_for_descendents = children.map {|child| child.run(reporter)}
-          result_for_this_group && (children.empty? ? true : results_for_descendents)
+          results_for_descendants = children.map {|child| child.run(reporter)}
+          result_for_this_group && (children.empty? ? true : results_for_descendants)
         ensure
           eval_after_alls(example_group_instance)
         end

data/lib/rspec/core/hooks.rb

@@ -42,6 +42,7 @@ module RSpec
       end
 
       def around(type=:each, &block)
+        RSpec::deprecate("around", "before and after")
         around_blocks[type] << block
       end
     end

data/lib/rspec/core/option_parser.rb

@@ -9,6 +9,10 @@ module RSpec::Core
     end
 
     def parse!(args)
+      if args.include?("--formatter")
+        args[args.index("--formatter")] = "--format"
+        RSpec.deprecate("the --formatter option", "-f or --format")
+      end
       options = {}
       parser(options).parse!(args)
       options
@@ -37,9 +41,10 @@ module RSpec::Core
           options[:full_description] = /#{o}/
         end
 
-        parser.on('-f', '--formatter FORMATTER', 'Choose a formatter',
+        parser.on('-f', '--format FORMATTER', 'Choose a formatter',
                 '  [p]rogress (default - dots)',
-                '  [d]ocumentation (group and example names)') do |o|
+                '  [d]ocumentation (group and example names)',
+                '  custom formatter class name') do |o|
           options[:formatter] = o
         end
 
@@ -57,7 +62,7 @@ module RSpec::Core
           options[:line_number] = o
         end
 
-        parser.on('-o', '--options PATH', 'Read configuration options from a file path.  (Defaults to spec/spec.parser)') do |o|
+        parser.on('-o', '--options PATH', 'Read configuration options from a file path.  (Defaults to .rspec)') do |o|
           options[:options_file] = o || local_options_file
         end
         
@@ -65,6 +70,11 @@ module RSpec::Core
           options[:profile_examples] = o
         end
 
+        parser.on('-r', '--require PATH', 'Require a file') do |path|
+          options[:requires] ||= []
+          options[:requires] << path
+        end
+
         parser.on('-v', '--version', 'Show version') do
           puts RSpec::Core::Version::STRING
           exit

data/lib/rspec/core/world.rb

@@ -37,7 +37,7 @@ module RSpec
       end
 
       def example_count
-        example_groups.collect {|g| g.descendents}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
+        example_groups.collect {|g| g.descendants}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
       end
 
       def apply_inclusion_filters(examples, conditions={})

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.11"
+  s.version = "2.0.0.beta.12"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-06-14}
   s.description = %q{RSpec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
      "features/example_groups/nested_groups.feature",
      "features/filtering/inclusion_filters.feature",
      "features/formatters/custom_formatter.feature",
-     "features/hooks/around_hook.feature",
      "features/hooks/before_and_after_hooks.feature",
      "features/hooks/described_class.feature",
      "features/hooks/halt.feature",
@@ -107,9 +106,11 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/helpers_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
+     "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
+     "spec/rspec/core/option_parser_spec.rb",
      "spec/rspec/core/pending_example_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
@@ -130,11 +131,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.11
-
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec" (without --pre).
+  Thank you for installing rspec-core-2.0.0.beta.12
   
 **************************************************
 }
@@ -142,7 +139,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.11}
+  s.summary = %q{rspec-core-2.0.0.beta.12}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -157,9 +154,11 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/helpers_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
+     "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
+     "spec/rspec/core/option_parser_spec.rb",
      "spec/rspec/core/pending_example_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
@@ -182,19 +181,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/configuration_options_spec.rb

@@ -5,13 +5,25 @@ require 'ostruct'
 describe RSpec::Core::ConfigurationOptions do
   
   def config_options_object(*args)
-    RSpec::Core::ConfigurationOptions.new(args)
+    coo = RSpec::Core::ConfigurationOptions.new(args)
+    coo.parse_options
+    coo
   end
 
   def options_from_args(*args)
     config_options_object(*args).options
   end
 
+  describe "#configure" do
+    it "sends libs before requires" do
+      opts = config_options_object(*%w[--require a/path -I a/lib])
+      config = double("config").as_null_object
+      config.should_receive(:libs=).ordered
+      config.should_receive(:requires=).ordered
+      opts.configure(config)
+    end
+  end
+
   describe 'color_enabled' do
     example "-c, --colour, or --color are parsed as true" do
       options_from_args('-c').should include(:color_enabled => true)
@@ -33,12 +45,25 @@ describe RSpec::Core::ConfigurationOptions do
     end
   end
 
-  describe  'formatter' do
-    example '-f or --formatter with an argument should parse' do
-      options_from_args('--formatter', 'd').should include(:formatter => 'd')
+  describe '--require' do
+    example "--requires files" do
+      options_from_args('--require', 'a/path').should include(:requires => ['a/path'])
+    end
+    example "--require can be used more than once" do
+      options_from_args('--require', 'path/1', '--require', 'path/2').should include(:requires => ['path/1','path/2'])
+    end
+  end
+
+  describe  'format' do
+    example '-f or --format with an argument should parse' do
+      options_from_args('--format', 'd').should include(:formatter => 'd')
       options_from_args('-f', 'd').should include(:formatter => 'd')
       options_from_args('-fd').should include(:formatter => 'd')
     end
+
+    example "-f/--format can accept a class name" do
+      options_from_args('-fSome::Formatter::Class').should include(:formatter => 'Some::Formatter::Class')
+    end
   end
 
   describe 'profile_examples' do
@@ -155,8 +180,8 @@ describe RSpec::Core::ConfigurationOptions do
     
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
-        config_options_object(*%w[ --drb --color --formatter s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern ])
       end
     end
 
@@ -164,8 +189,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         File.stub(:readlines) { %w[ --drb --color ] }
-        config_options_object(*%w[ --formatter s --line_number 1 --example pattern --profile --backtrace ]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --format s --line_number 1 --example pattern --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern ])
       end
     end
 
@@ -173,8 +198,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         File.stub(:readlines) { %w[ --drb --color ] }
-        config_options_object(*%w[ --drb --formatter s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern ])
       end
     end
 
@@ -182,8 +207,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb and --options" do
         File.stub(:exist?) { true }
         File.stub(:readlines) { %w[ --drb --color ] }
-        config_options_object(*%w[ --drb --formatter s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern ])
       end
     end
   end
@@ -193,19 +218,21 @@ describe RSpec::Core::ConfigurationOptions do
 
     it "loads automatically" do
       File.stub(:exist?) { true }
-      File.stub(:readlines) { ["--formatter", "doc"] }
+      File.stub(:readlines) { ["--format", "doc"] }
 
-      cli_options = RSpec::Core::ConfigurationOptions.new([])
-      cli_options.configure(config)
+      config_options = RSpec::Core::ConfigurationOptions.new([])
+      config_options.parse_options
+      config_options.configure(config)
       config.formatter.should == 'doc'
     end
     
     it "allows options on one line" do
       File.stub(:exist?) { true }
-      File.stub(:readlines) { ["--formatter doc"] }
+      File.stub(:readlines) { ["--format doc"] }
 
-      cli_options = RSpec::Core::ConfigurationOptions.new([])
-      cli_options.configure(config)
+      config_options = RSpec::Core::ConfigurationOptions.new([])
+      config_options.parse_options
+      config_options.configure(config)
       config.formatter.should == 'doc'
     end
     
@@ -214,16 +241,17 @@ describe RSpec::Core::ConfigurationOptions do
       File.stub(:readlines) do |path|
         case path
         when ".rspec"
-          ["--formatter", "documentation"] 
+          ["--format", "documentation"] 
         when /\.rspec/
           ["--line", "37"]
         else
           raise "Unexpected path: #{path}"
         end
       end
-      cli_options = RSpec::Core::ConfigurationOptions.new(["--no-color"])
+      config_options = RSpec::Core::ConfigurationOptions.new(["--no-color"])
+      config_options.parse_options
 
-      cli_options.configure(config)
+      config_options.configure(config)
 
       config.formatter.should == "documentation"
       config.line_number.should == "37"
@@ -235,28 +263,51 @@ describe RSpec::Core::ConfigurationOptions do
       File.stub(:readlines) do |path|
         case path
         when ".rspec"
-          ["--formatter", "local"] 
+          ["--format", "local"] 
         when /\.rspec/
-          ["--formatter", "global"] 
+          ["--format", "global"] 
         else
           raise "Unexpected path: #{path}"
         end
       end
-      cli_options = RSpec::Core::ConfigurationOptions.new([])
+      config_options = RSpec::Core::ConfigurationOptions.new([])
+      config_options.parse_options
 
-      cli_options.configure(config)
+      config_options.configure(config)
 
       config.formatter.should == "local"
     end
 
     it "prefers CLI options over file options" do
-      config_options = RSpec::Core::ConfigurationOptions.new(['--formatter', 'progress'])
+      config_options = RSpec::Core::ConfigurationOptions.new(['--format', 'progress'])
       config_options.stub(:parse_options_file).and_return(:formatter => 'documentation')
 
+      config_options.parse_options
       config_options.configure(config)
 
       config.formatter.should == 'progress'
     end
+
+    context "with SPEC_OPTS" do
+      before do
+        @orig_spec_opts = ENV["SPEC_OPTS"]
+      end
+
+      after do
+        ENV["SPEC_OPTS"] = @orig_spec_opts
+      end
+
+      it "prefers SPEC_OPTS options over file options" do
+        config = OpenStruct.new
+        ENV["SPEC_OPTS"] = "--format documentation"
+        config_options = RSpec::Core::ConfigurationOptions.new(['--format', 'progress'])
+
+        config_options.parse_options
+        config_options.configure(config)
+
+        config.formatter.should == 'documentation'
+      end
+    end
   end
 end
 

data/spec/rspec/core/configuration_spec.rb

@@ -181,6 +181,55 @@ module RSpec::Core
         config.run_all_when_everything_filtered?.should == true
       end
     end
+
+    describe 'color_enabled=' do
+      context "given true" do
+        context "on windows" do
+          before do
+            @original_host  = Config::CONFIG['host_os']
+            Config::CONFIG['host_os'] = 'mswin'
+            config.stub(:require)
+            config.stub(:warn)
+          end
+
+          after do
+            Config::CONFIG['host_os'] = @original_host
+          end
+
+          context "with win32console available" do
+            it "requires win32console" do
+              config.should_receive(:require).
+                with("Win32/Console/ANSI")
+              config.color_enabled = true
+            end
+
+            it "leaves output stream intact" do
+              config.output_stream = $stdout
+              config.stub(:require) do |what|
+                config.output_stream = 'foo' if what =~ /Win32/
+              end
+              config.color_enabled = true
+              config.output_stream.should eq($stdout)
+            end
+          end
+
+          context "with win32console NOT available" do
+            it "warns to install win32console" do
+              config.stub(:require) { raise LoadError }
+              config.should_receive(:warn).
+                with /You must 'gem install win32console'/
+              config.color_enabled = true
+            end
+
+            it "sets color_enabled to false" do
+              config.stub(:require) { raise LoadError }
+              config.color_enabled = true
+              config.color_enabled.should be_false
+            end
+          end
+        end
+      end
+    end
     
     describe 'formatter=' do
 
@@ -190,6 +239,12 @@ module RSpec::Core
         config.formatter = 'documentation'
         config.formatter.should be_an_instance_of(Formatters::DocumentationFormatter)
       end
+
+      it "sets a formatter based on its class" do
+        formatter_class = Class.new(Formatters::BaseTextFormatter)
+        config.formatter = formatter_class
+        config.formatter.should be_an_instance_of(formatter_class)
+      end
       
       it "raises ArgumentError if formatter is unknown" do
         lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
@@ -197,6 +252,20 @@ module RSpec::Core
       
     end
 
+    describe "#filter_run" do
+      it "sets the filter" do
+        config.filter_run :focus => true
+        config.filter.should eq({:focus => true})
+      end
+    end
+
+    describe "#filter_run_excluding" do
+      it "sets the filter" do
+        config.filter_run_excluding :slow => true
+        config.exclusion_filter.should eq({:slow => true})
+      end
+    end
+
     describe "line_number=" do
       it "sets the line number" do
         config.line_number = '37'
@@ -260,6 +329,13 @@ module RSpec::Core
       end
     end
 
+    describe "requires=" do
+      it "requires paths" do
+        config.should_receive(:require).with("a/path")
+        config.requires = ["a/path"]
+      end
+    end
+
     describe "#add_setting" do
       describe "with no modifiers" do
         context "with no additional options" do

data/spec/rspec/core/example_group_spec.rb

@@ -29,15 +29,15 @@ module RSpec::Core
         examples_run.should have(1).example
       end
 
-      describe "descendents" do
-        it "returns self + all descendents" do
+      describe "descendants" do
+        it "returns self + all descendants" do
           group = ExampleGroup.describe("parent") do
             describe("child") do
               describe("grandchild 1") {}
               describe("grandchild 2") {}
             end
           end
-          group.descendents.size.should == 4
+          group.descendants.size.should == 4
         end
       end
     end
@@ -249,12 +249,6 @@ module RSpec::Core
         end.to_not raise_error
       end
 
-      it "exposes the around each blocks at after_alls" do
-        group = ExampleGroup.describe
-        group.around(:each) { 'foo' }
-        group.should have(1).around_eachs
-      end
-
       it "treats an error in before(:each) as a failure" do
         group = ExampleGroup.describe
         group.before(:each) { raise "error in before each" }
@@ -426,22 +420,6 @@ module RSpec::Core
       end
     end
 
-    describe "#around" do
-      around(:each) do |example|
-        SelfObserver.new
-        example.run
-        SelfObserver.cache.clear
-      end
-
-      it "has 1 SelfObserver (1)" do
-        SelfObserver.cache.length.should == 1
-      end
-
-      it "has 1 SelfObserver (2)" do
-        SelfObserver.cache.length.should == 1
-      end
-    end
-
     describe "#its" do
       its(:class) { should == RSpec::Core::ExampleGroup }
       it "does not interfere between examples" do

data/spec/rspec/core/hooks_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+module RSpec::Core
+  describe Hooks do
+    describe "#around" do
+      it "is deprecated" do
+        RSpec.should_receive(:deprecate)
+        subject = Object.new.extend(Hooks)
+        subject.around(:each) {}
+      end
+    end
+  end
+end

data/spec/rspec/core/option_parser_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+module RSpec::Core
+  describe OptionParser do
+    before do
+      RSpec.stub(:deprecate)
+    end
+    
+    it "deprecates the --formatter option" do
+      RSpec.should_receive(:deprecate)
+      Parser.parse!(%w[--formatter doc])      
+    end
+    
+    it "converts --formatter to --format" do
+      options = Parser.parse!(%w[--formatter doc])
+      options.should eq( {:formatter=>"doc"} )
+    end
+  end
+end

data/spec/rspec/core/runner_spec.rb

@@ -24,6 +24,7 @@ module RSpec::Core
           @err = @out = StringIO.new
 
           @options = RSpec::Core::ConfigurationOptions.new(%w[--drb --drb-port 8181 --color])
+          @options.parse_options
           RSpec::Core::ConfigurationOptions.stub(:new) { @options }
           
           @drb_proxy = double(RSpec::Core::DRbCommandLine, :run => true)

data/spec/spec_helper.rb

@@ -52,9 +52,11 @@ Spork.prefork do
 
   RSpec.configure do |c|
     c.color_enabled = !in_editor?
-    c.exclusion_filter = { :ruby => lambda {|version|
+    c.filter_run :focus => true
+    c.run_all_when_everything_filtered = true
+    c.filter_run_excluding :ruby => lambda {|version|
       !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-    }}
+    }
     c.before(:each) do
       @real_world = RSpec.world
       RSpec.instance_variable_set(:@world, RSpec::Core::World.new)

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 11
-  version: 2.0.0.beta.11
+  - 12
+  version: 2.0.0.beta.12
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -04:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 11
-        version: 2.0.0.beta.11
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 11
-        version: 2.0.0.beta.11
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,6 @@ files:
 - features/example_groups/nested_groups.feature
 - features/filtering/inclusion_filters.feature
 - features/formatters/custom_formatter.feature
-- features/hooks/around_hook.feature
 - features/hooks/before_and_after_hooks.feature
 - features/hooks/described_class.feature
 - features/hooks/halt.feature
@@ -180,9 +179,11 @@ files:
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
+- spec/rspec/core/hooks_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/let_spec.rb
 - spec/rspec/core/metadata_spec.rb
+- spec/rspec/core/option_parser_spec.rb
 - spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb
@@ -206,11 +207,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.11
-  
-    This is beta software. If you are looking
-    for a supported production release, please
-    "gem install rspec" (without --pre).
+    Thank you for installing rspec-core-2.0.0.beta.12
     
   **************************************************
 
@@ -240,7 +237,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.11
+summary: rspec-core-2.0.0.beta.12
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
@@ -255,9 +252,11 @@ test_files:
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
+- spec/rspec/core/hooks_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/let_spec.rb
 - spec/rspec/core/metadata_spec.rb
+- spec/rspec/core/option_parser_spec.rb
 - spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb

data/features/hooks/around_hook.feature

@@ -1,36 +0,0 @@
-Feature: around hook
-
-  Scenario: define around(:each) block in example group
-    Given a file named "around_each_in_example_group_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      class Thing
-        def self.cache
-          @cache ||= []
-        end
-
-        def initialize
-          self.class.cache << self
-        end
-      end
-
-      describe Thing do
-        around(:each) do |example|
-          Thing.new
-          example.run
-          Thing.cache.clear
-        end
-
-        it "has 1 Thing (1)" do
-          Thing.cache.length.should == 1
-        end
-
-        it "has 1 Thing (2)" do
-          Thing.cache.length.should == 1
-        end
-      end
-      """
-    When I run "rspec ./around_each_in_example_group_spec.rb"
-    Then the stderr should not contain "NoMethodError"
-    Then I should see "2 examples, 0 failures"