rspec-core 2.0.0.beta.5 → 2.0.0.beta.6

data/.rspec

@@ -0,0 +1 @@
+-Ispec

data/README.markdown

@@ -63,6 +63,18 @@ Use the documentation formatter to see the resulting spec:
     Finished in 0.000379 seconds
     1 example, 0 failures
 
+## Configuration
+
+You can define runtime configuration options in four places. They
+are loaded and processed in this order:
+
+* ~/.rspec
+* .rspec
+* RSpec.configure
+* command line
+
+Run `rspec --help` to see supported configuration options.
+
 #### Also see
 
 * [http://github.com/rspec/rspec](http://github.com/rspec/rspec)

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.5
+2.0.0.beta.6

data/features/command_line/example_name_option.feature

@@ -2,9 +2,9 @@ Feature: example name option
 
   Use the --example (or -e) option to filter the examples to be run by name.
 
-  The submitted argument is compiled to a Ruby Regexp, and matched against the
-  full description of the example, which is the concatenation of descriptions
-  of the group (including any nested groups) and the example.
+  The argument is compiled to a Ruby Regexp, and matched against the full
+  description of the example, which is the concatenation of descriptions of the
+  group (including any nested groups) and the example.
 
   This allows you to run a single uniquely named example, all examples with
   similar names, all the example in a uniquely named group, etc, etc.

data/features/command_line/line_number_appended_to_path.feature

@@ -7,33 +7,53 @@ Feature: line number appended to file path
   Background:
     Given a file named "example_spec.rb" with:
       """
-      describe "a group" do
+      describe "outer group" do
 
-        it "has a first example" do
+        it "first example in outer group" do
 
         end
         
-        it "has a second example" do
+        it "second example in outer group" do
 
         end
+
+        describe "nested group" do
+          
+          it "example in nested group" do
+
+          end
         
+        end
+
       end
       """
 
-  Scenario: two examples - both examples from the group declaration
+@wip
+  Scenario: nested groups - outer group on declaration line
     When I run "rspec example_spec.rb:1 --format doc"
-    Then I should see "2 examples, 0 failures"
-    And I should see "has a second example"
-    And I should see "has a first example"
+    Then I should see "3 examples, 0 failures"
+    And I should see "second example in outer group"
+    And I should see "first example in outer group"
+    And I should see "example in nested group"
+
+@wip
+  Scenario: nested groups - inner group on declaration line
+    When I run "rspec example_spec.rb:11 --format doc"
+    Then I should see "3 examples, 0 failures"
+    And I should see "example in nested group"
+    And I should not see "second example in outer group"
+    And I should not see "first example in outer group"
 
   Scenario: two examples - first example on declaration line
     When I run "rspec example_spec.rb:3 --format doc"
     Then I should see "1 example, 0 failures"
-    And I should see "has a first example"
-    But the stdout should not contain "has a second example"
+    And I should see "first example in outer group"
+    But I should not see "second example in outer group"
+    And I should not see "example in nested group"
 
   Scenario: two examples - second example on declaration line
     When I run "rspec example_spec.rb:7 --format doc"
     Then I should see "1 example, 0 failures"
-    And I should see "has a second example"
-    But the stdout should not contain "has a first example"
+    And I should see "second example in outer group"
+    But I should not see "first example in outer group"
+    And I should not see "example in nested group"

data/features/configuration/{spec_opts.feature → options_file.feature}

@@ -7,18 +7,11 @@ Feature: spec/spec.opts
   Options declared in spec/spec.opts will override configuration
   set up in Rspec.configure blocks.
 
-  Background:
-    Given a directory named "spec"
-
   Scenario: color set in Rspec.configure
-    Given a file named "spec/spec_helper.rb" with:
+    Given a file named "spec/example_spec.rb" with:
       """
-      require "rspec/expectations"
       Rspec.configure {|c| c.color_enabled = true }
-      """
-    And a file named "spec/example_spec.rb" with:
-      """
-      require "spec_helper"
+
       describe "color_enabled" do
         context "when set with Rspec.configure" do
           it "is true" do
@@ -30,15 +23,13 @@ Feature: spec/spec.opts
     When I run "rspec spec/example_spec.rb"
     Then I should see "1 example, 0 failures"
             
-  Scenario: color set in spec/spec.opts
-    Given a file named "spec/spec.opts" with:
+  Scenario: color set in .rspec
+    Given a file named ".rspec" with:
       """
       --color
       """
     And a file named "spec/example_spec.rb" with:
       """
-      require "rspec/expectations"
-
       describe "color_enabled" do
         context "when set with Rspec.configure" do
           it "is true" do
@@ -49,16 +40,15 @@ 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 (spec.opts wins)
-    Given a file named "spec/spec.opts" with:
+
+@wip            
+  Scenario: formatter set in both (.rspec wins)
+    Given a file named ".rspec" with:
       """
-      --formatter documentation
+      --format documentation
       """
     And a file named "spec/spec_helper.rb" with:
       """
-      require "rspec/expectations"
       Rspec.configure {|c| c.formatter = 'progress'}
       """
     And a file named "spec/example_spec.rb" with:

data/features/support/env.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << File.expand_path("../../../../rspec-expectations/lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../../rspec-expectations/lib", __FILE__)
 require 'rspec/expectations'
 require 'aruba'
 

data/lib/rspec/core.rb

@@ -1,15 +1,19 @@
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
-require 'rspec/core/mocking/with_absolutely_nothing'
+
+require 'rspec/core/hooks'
+require 'rspec/core/subject'
+require 'rspec/core/let'
+require 'rspec/core/metadata'
+
 require 'rspec/core/around_proxy'
 require 'rspec/core/world'
 require 'rspec/core/configuration'
-require 'rspec/core/command_line_options'
+require 'rspec/core/configuration_options'
 require 'rspec/core/runner'
 require 'rspec/core/example'
 require 'rspec/core/kernel_extensions'
 require 'rspec/core/shared_example_group'
-require 'rspec/core/example_group_subject'
 require 'rspec/core/example_group'
 require 'rspec/core/formatters'
 require 'rspec/core/backward_compatibility'
@@ -29,7 +33,7 @@ module Rspec
 
     def self.configure
       Rspec.deprecate('Rspec::Core.configure', 'Rspec.configure', '2.0.0')
-      yield configuration if block_given?
+      yield Rspec.configuration if block_given?
     end
 
     def self.world

data/lib/rspec/core/configuration.rb

@@ -92,6 +92,10 @@ module Rspec
         @options[:backtrace_clean_patterns].clear
       end
 
+      def libs=(libs)
+        libs.map {|lib| $LOAD_PATH.unshift lib}
+      end
+
       def debug=(bool)
         return unless bool
         begin
@@ -184,19 +188,14 @@ EOM
         @run_all_when_everything_filtered
       end
 
-      # Where does output go? For now $stdout
       def output
         $stdout
       end
 
-      def puts(msg='')
+      def puts(msg="")
         output.puts(msg)    
       end
 
-      def parse_command_line_args(args)
-        @command_line_options = Rspec::Core::CommandLineOptions.parse(args)
-      end
-
       def include(mod, options={})
         @include_or_extend_modules << [:include, mod, options]
       end
@@ -230,6 +229,10 @@ EOM
         Rspec::Core::ExampleGroup.send(:include, Rspec::Core::MockFrameworkAdapter)
       end
 
+      def require_files_to_run
+        files_to_run.map {|f| require f }
+      end
+
     end
   end
 end

data/lib/rspec/core/configuration_options.rb

@@ -0,0 +1,137 @@
+require 'optparse'
+# http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
+
+module Rspec
+  module Core
+
+    class ConfigurationOptions
+      LOCAL_OPTIONS_FILE  = ".rspec"
+      GLOBAL_OPTIONS_FILE = File.join(File.expand_path("~"), ".rspec")
+      
+      attr_reader :args, :options
+      
+      def initialize(args)
+        @args = args
+        @options = {}
+      end
+      
+      def apply_to(config)
+        merged_options.each do |key, value|
+          config.send("#{key}=", value)
+        end
+      end
+
+      def parse_command_line_options
+        @options = Parser.parse!(@args)
+        @options[:files_or_directories_to_run] = @args
+        @options
+      end
+
+    private
+
+      def merged_options
+        [global_options, local_options, command_line_options].inject({}) do |merged, options|
+          merged.merge(options)
+        end
+      end
+
+      def command_line_options
+        parse_command_line_options
+      end
+
+      class Parser
+        def self.parse!(args)
+          new.parse!(args)
+        end
+
+        class << self
+          alias_method :parse, :parse!
+        end
+
+        def parse!(args)
+          options = {}
+          parser(options).parse!(args)
+          options
+        end
+
+        alias_method :parse, :parse!
+
+        def parser(options)
+          OptionParser.new do |parser|
+            parser.banner = "Usage: rspec [options] [files or directories]"
+
+            parser.on('-b', '--backtrace', 'Enable full backtrace') do |o|
+              options[:full_backtrace] = true
+            end
+
+            parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output') do |o|
+              options[:color_enabled] = o
+            end
+            
+            parser.on('-d', '--debug', 'Enable debugging') do |o|
+              options[:debug] = true
+            end
+
+            parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
+                    "(PATTERN is compiled into a Ruby regular expression)") do |o|
+              options[:full_description] = /#{o}/
+            end
+
+            parser.on('-f', '--formatter FORMATTER', 'Choose a formatter',
+                    '  [p]rogress (default - dots)',
+                    '  [d]ocumentation (group and example names)') do |o|
+              options[:formatter] = o
+            end
+
+            parser.on_tail('-h', '--help', "You're looking at it.") do 
+              puts parser
+              exit
+            end
+
+            parser.on('-I DIRECTORY', 'specify $LOAD_PATH directory (may be used more than once)') do |dir|
+              options[:libs] ||= []
+              options[:libs] << dir
+            end
+
+            parser.on('-l', '--line_number LINE', 'Specify the line number of a single example to run') do |o|
+              options[:line_number] = o
+            end
+
+            parser.on('-o', '--options PATH', 'Read configuration options from a file path.  (Defaults to spec/spec.parser)') do |o|
+              options[:options_file] = o || local_options_file
+            end
+            
+            parser.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
+              options[:profile_examples] = o
+            end
+          end
+        end
+      end
+
+      def global_options
+        parse_options_file(GLOBAL_OPTIONS_FILE)
+      end
+
+      def local_options
+        parse_options_file(local_options_file)
+      end
+      
+      def parse_options_file(path)
+        Parser.parse(args_from_options_file(path))
+      end
+
+      def args_from_options_file(path)
+        return [] unless File.exist?(path)
+        File.readlines(path).map {|l| l.split}.flatten
+      end
+
+      def local_options_file
+        return @options.delete(:options_file) if @options[:options_file]
+        return LOCAL_OPTIONS_FILE if File.exist?(LOCAL_OPTIONS_FILE)
+        Rspec.deprecate("spec/spec.opts", ".rspec or ~/.rspec", "2.0.0") if File.exist?("spec/spec.opts")
+        "spec/spec.opts"
+      end
+
+    end
+  end
+end

data/lib/rspec/core/example_group.rb

@@ -1,13 +1,8 @@
-require 'rspec/core/hooks'
-require 'rspec/core/example_group_subject'
-require 'rspec/core/let'
-require 'rspec/core/metadata'
-
 module Rspec
   module Core
     class ExampleGroup
       extend  Hooks
-      include ExampleGroupSubject
+      include Subject
       include Let
 
       attr_accessor :running_example
@@ -31,10 +26,10 @@ module Rspec
       def self.alias_example_to(new_alias, extra_options={})
         new_alias = <<-END_RUBY
                       def self.#{new_alias}(desc=nil, options={}, &block)
-                        updated_options = options.update(:caller => caller)
-                        updated_options.update(:pending => true) unless block
-                        updated_options.update(#{extra_options.inspect})
-                        examples << Rspec::Core::Example.new(self, desc, updated_options, block)
+                        options.update(:pending => true) unless block
+                        options.update(:caller => caller)
+                        options.update(#{extra_options.inspect})
+                        examples << Rspec::Core::Example.new(self, desc, options, block)
                       end
                     END_RUBY
         module_eval(new_alias, __FILE__, __LINE__)

data/lib/rspec/core/formatters/base_formatter.rb

@@ -1,7 +1,5 @@
 module Rspec
-
   module Core
-
     module Formatters
 
       class BaseFormatter
@@ -15,20 +13,8 @@ module Rspec
           @example_group = nil
         end
 
-        def configuration
-          Rspec.configuration
-        end
-
         def output
-          Rspec.configuration.output
-        end
-
-        def profile_examples?
-          Rspec.configuration.profile_examples
-        end
-
-        def color_enabled?
-          configuration.color_enabled?
+          configuration.output
         end
 
         def pending_examples
@@ -39,6 +25,21 @@ module Rspec
           @failed_examples ||= ::Rspec::Core.world.find(examples, :positive, :execution_result => { :status => 'failed' })
         end
 
+        def report(count)
+          sync_output do
+            start(count)
+            # TODO - spec that we still dump even when there's
+            # an exception
+            begin
+              yield self
+            ensure
+              stop
+              dump(@duration)
+              close
+            end
+          end
+        end
+
         # This method is invoked before any examples are run, right after
         # they have all been collected. This can be useful for special
         # formatters that need to provide progress on feedback (graphical ones)
@@ -46,9 +47,14 @@ module Rspec
         # This method will only be invoked once, and the next one to be invoked
         # is #add_example_group
         def start(example_count)
+          @start = Time.now
           @example_count = example_count
         end
 
+        def stop
+          @duration = Time.now - @start
+        end
+
         def example_finished(example)
           examples << example
         end
@@ -60,8 +66,13 @@ module Rspec
         def add_example_group(example_group)
           @example_group = example_group
         end
-        
-        alias_method :add_example_group, :add_example_group
+
+        def dump(duration)
+          start_dump(duration)
+          dump_failures
+          dump_summary
+          dump_pending
+        end
 
         # This method is invoked after all of the examples have executed. The next method
         # to be invoked after this one is #dump_failure (once for each failed example),
@@ -95,7 +106,11 @@ module Rspec
           cleansed.empty? ? backtrace : cleansed
         end
 
-        protected
+      protected
+
+        def configuration
+          Rspec.configuration
+        end
 
         def backtrace_line(line)
           return nil if configuration.cleaned_from_backtrace?(line)
@@ -119,9 +134,29 @@ module Rspec
           end
         end
 
+        def sync_output
+          begin
+            old_sync, output.sync = output.sync, true if output_supports_sync
+            yield
+          ensure
+            output.sync = old_sync if output_supports_sync
+          end
+        end
+
+        def output_supports_sync
+          output.respond_to?(:sync=)
+        end
+
+        def profile_examples?
+          configuration.profile_examples
+        end
+
+        def color_enabled?
+          configuration.color_enabled?
+        end
+
       end
 
     end
   end
-
 end

data/lib/rspec/core/metadata.rb

@@ -77,6 +77,12 @@ EOM
         update(options)
       end
 
+      def all_apply?(filters)
+        filters.all? do |filter_on, filter|
+          apply_condition(filter_on, filter)
+        end
+      end
+
       def apply_condition(filter_on, filter, metadata=nil)
         metadata ||= self
         case filter
@@ -97,12 +103,6 @@ EOM
         end
       end
 
-      def all_apply?(filters)
-        filters.all? do |filter_on, filter|
-          apply_condition(filter_on, filter)
-        end
-      end
-
     private
 
       def superclass_metadata

data/lib/rspec/core/runner.rb

@@ -1,6 +1,5 @@
 module Rspec
   module Core
-
     class Runner
 
       def self.installed_at_exit?
@@ -21,47 +20,42 @@ module Rspec
         configuration.formatter
       end
 
-      def require_all_files(configuration)
-        configuration.files_to_run.map {|f| require f }
+      def run(args = [])
+        configure(args)
+        
+        reporter.report(example_count) do |reporter|
+          example_groups.run_all(reporter)
+        end
+        
+        example_groups.success?
       end
       
-      def run(args = [])
-        Rspec::Core::CommandLineOptions.parse(args).apply(configuration)
-
-        require_all_files(configuration)
+    private
 
+      def configure(args)
+        Rspec::Core::ConfigurationOptions.new(args).apply_to(configuration)
+        configuration.require_files_to_run
         configuration.configure_mock_framework
-        
-        total_examples_to_run = Rspec::Core.world.total_examples_to_run
-
-        old_sync, reporter.output.sync = reporter.output.sync, true if reporter.output.respond_to?(:sync=)
-
-        suite_success = true
+      end
 
-        reporter_supports_sync = reporter.output.respond_to?(:sync=)
-        old_sync, reporter.output.sync = reporter.output.sync, true if reporter_supports_sync
+      def example_count
+        Rspec::Core.world.total_examples_to_run
+      end
 
-        reporter.start(total_examples_to_run) # start the clock
-        start = Time.now
+      def example_groups
+        Rspec::Core.world.example_groups_to_run.extend(ExampleGroups)
+      end
 
-        Rspec::Core.world.example_groups_to_run.each do |example_group|
-          suite_success &= example_group.run(reporter)
+      module ExampleGroups
+        def run_all(reporter)
+          @success = self.inject(true) {|success, group| success &= group.run(reporter)}
         end
 
-        reporter.start_dump(Time.now - start)
-
-        reporter.dump_failures
-        reporter.dump_summary
-        reporter.dump_pending
-        reporter.close
-
-        reporter.output.sync = old_sync if reporter_supports_sync
-
-        suite_success
+        def success?
+          @success ||= false
+        end
       end
       
-
     end
-
   end
 end

data/lib/rspec/core/shared_example_group.rb

@@ -26,7 +26,7 @@ module Rspec
 
       alias :shared_examples_for :share_examples_for
 
-      private
+    private
 
       def ensure_shared_example_group_name_not_taken(name)
         if Rspec::Core.world.shared_example_groups.has_key?(name)

data/lib/rspec/core/{example_group_subject.rb → subject.rb}

@@ -1,6 +1,6 @@
 module Rspec
   module Core
-    module ExampleGroupSubject
+    module Subject
       
       def self.included(kls)
         kls.extend   ClassMethods

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.5"
+  s.version = "2.0.0.beta.6"
 
   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-04-04}
+  s.date = %q{2010-04-12}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
      ".treasure_map.rb",
      "License.txt",
      "README.markdown",
@@ -80,7 +81,7 @@ Gem::Specification.new do |s|
      "features/command_line/example_name_option.feature",
      "features/command_line/line_number_appended_to_path.feature",
      "features/command_line/line_number_option.feature",
-     "features/configuration/spec_opts.feature",
+     "features/configuration/options_file.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
      "features/formatters/custom_formatter.feature",
@@ -101,12 +102,11 @@ Gem::Specification.new do |s|
      "lib/rspec/core.rb",
      "lib/rspec/core/around_proxy.rb",
      "lib/rspec/core/backward_compatibility.rb",
-     "lib/rspec/core/command_line_options.rb",
      "lib/rspec/core/configuration.rb",
+     "lib/rspec/core/configuration_options.rb",
      "lib/rspec/core/deprecation.rb",
      "lib/rspec/core/example.rb",
      "lib/rspec/core/example_group.rb",
-     "lib/rspec/core/example_group_subject.rb",
      "lib/rspec/core/formatters.rb",
      "lib/rspec/core/formatters/base_formatter.rb",
      "lib/rspec/core/formatters/base_text_formatter.rb",
@@ -127,17 +127,16 @@ Gem::Specification.new do |s|
      "lib/rspec/core/ruby_project.rb",
      "lib/rspec/core/runner.rb",
      "lib/rspec/core/shared_example_group.rb",
-     "lib/rspec/core/shared_example_group_kernel_extensions.rb",
+     "lib/rspec/core/subject.rb",
      "lib/rspec/core/version.rb",
      "lib/rspec/core/world.rb",
      "rspec-core.gemspec",
      "script/console",
      "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
-     "spec/rspec/core/command_line_options_spec.rb",
+     "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
-     "spec/rspec/core/example_group_subject_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
      "spec/rspec/core/formatters/base_text_formatter_spec.rb",
@@ -156,6 +155,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
      "spec/rspec/core/shared_example_group_spec.rb",
+     "spec/rspec/core/subject_spec.rb",
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
@@ -166,7 +166,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.5
+  Thank you for installing rspec-core-2.0.0.beta.6
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -178,14 +178,13 @@ 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.5}
+  s.summary = %q{rspec-core-2.0.0.beta.6}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
-     "spec/rspec/core/command_line_options_spec.rb",
+     "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
-     "spec/rspec/core/example_group_subject_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
      "spec/rspec/core/formatters/base_text_formatter_spec.rb",
@@ -204,6 +203,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
      "spec/rspec/core/shared_example_group_spec.rb",
+     "spec/rspec/core/subject_spec.rb",
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
@@ -216,19 +216,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.5"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.6"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
       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.5"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.6"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
       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.5"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.6"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/{command_line_options_spec.rb → configuration_options_spec.rb}

@@ -1,29 +1,34 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Rspec::Core::CommandLineOptions do
+describe Rspec::Core::ConfigurationOptions do
   
   def options_from_args(*args)
-    Rspec::Core::CommandLineOptions.new(args).parse.options
+    Rspec::Core::ConfigurationOptions.new(args).parse_command_line_options
   end
 
   describe 'color_enabled' do
-    example "-c, --colour, or --color should be parsed as true" do
+    example "-c, --colour, or --color are parsed as true" do
       options_from_args('-c').should include(:color_enabled => true)
       options_from_args('--color').should include(:color_enabled => true)
       options_from_args('--colour').should include(:color_enabled => true)
     end
 
-    example "--no-color should be parsed as false" do
+    example "--no-color is parsed as false" do
       options_from_args('--no-color').should include(:color_enabled => false)
     end
   end
 
-  describe  'formatter' do
-    example '-f or --formatter with no arguments should be parsed as nil' do
-      options_from_args('--formatter').should include(:formatter => nil)
+  describe 'load path additions' do
+    example "-I parses like it does w/ ruby command" do
+      options_from_args('-I', 'a_dir').should include(:libs => ['a_dir'])
+    end
+    example "-I can be used more than once" do
+      options_from_args('-I', 'dir_1', '-I', 'dir_2').should include(:libs => ['dir_1','dir_2'])
     end
+  end
 
+  describe  'formatter' do
     example '-f or --formatter with an argument should parse' do
       options_from_args('--formatter', 'd').should include(:formatter => 'd')
       options_from_args('-f', 'd').should include(:formatter => 'd')
@@ -52,50 +57,10 @@ describe Rspec::Core::CommandLineOptions do
     end
   end
 
-  describe "options" do
+  describe "options file" do
     it "is parsed from --options or -o" do
-      options_from_args('--options', 'spec/spec.opts').should include(:options_file => "spec/spec.opts")
-      options_from_args('-o', 'foo/spec.opts').should include(:options_file => "foo/spec.opts")
-    end
-
-    it "defaults to spec/spec.opts when you don't give it a file path" do
-      options_from_args('-o').should include(:options_file => "spec/spec.opts")
-      options_from_args('--options').should include(:options_file => "spec/spec.opts")
-    end
-
-    it "loads automatically" do
-      cli_options = Rspec::Core::CommandLineOptions.new([]).parse
-      File.stub(:exist?) { true }
-      File.stub(:readlines) { ["--formatter", "doc"] }
-      config = OpenStruct.new
-      cli_options.apply(config)
-      config.formatter.should == 'doc'
-    end
-
-    it "allows options on one line" do
-      cli_options = Rspec::Core::CommandLineOptions.new([]).parse
-      File.stub(:exist?) { true }
-      File.stub(:readlines) { ["--formatter doc"] }
-      config = OpenStruct.new
-      cli_options.apply(config)
-      config.formatter.should == 'doc'
-    end
-    
-    it "merges options from the CLI and file options gracefully" do
-      cli_options = Rspec::Core::CommandLineOptions.new(['--formatter', 'progress', '--options', 'spec/spec.opts']).parse
-      cli_options.stub!(:parse_spec_file_contents).and_return(:full_backtrace => true)
-      config = OpenStruct.new
-      cli_options.apply(config)
-      config.full_backtrace.should == true
-      config.formatter.should == 'progress'
-    end
-
-    it "CLI options trump file options" do
-      cli_options = Rspec::Core::CommandLineOptions.new(['--formatter', 'progress', '--options', 'spec/spec.opts']).parse
-      cli_options.stub!(:parse_spec_file_contents).and_return(:formatter => 'documentation')
-      config = OpenStruct.new
-      cli_options.apply(config)
-      config.formatter.should == 'progress'
+      options_from_args("--options", "custom/path").should include(:options_file => "custom/path")
+      options_from_args("-o", "custom/path").should include(:options_file => "custom/path")
     end
   end
 
@@ -128,5 +93,76 @@ describe Rspec::Core::CommandLineOptions do
     end
   end
 
+  describe "options file (override)" do
+    let(:config) { OpenStruct.new }
+
+    it "loads automatically" do
+      File.stub(:exist?) { true }
+      File.stub(:readlines) { ["--formatter", "doc"] }
+
+      cli_options = Rspec::Core::ConfigurationOptions.new([])
+      cli_options.apply_to(config)
+      config.formatter.should == 'doc'
+    end
+    
+    it "allows options on one line" do
+      File.stub(:exist?) { true }
+      File.stub(:readlines) { ["--formatter doc"] }
+
+      cli_options = Rspec::Core::ConfigurationOptions.new([])
+      cli_options.apply_to(config)
+      config.formatter.should == 'doc'
+    end
+    
+    it "merges options from the global and local .rspec and the command line" do
+      File.stub(:exist?){ true }
+      File.stub(:readlines) do |path|
+        case path
+        when ".rspec"
+          ["--formatter", "documentation"] 
+        when /\.rspec/
+          ["--line", "37"]
+        else
+          raise "Unexpected path: #{path}"
+        end
+      end
+      cli_options = Rspec::Core::ConfigurationOptions.new(["--no-color"])
+
+      cli_options.apply_to(config)
+
+      config.formatter.should == "documentation"
+      config.line_number.should == "37"
+      config.color_enabled.should be_false
+    end
+    
+    it "prefers local options over global" do
+      File.stub(:exist?){ true }
+      File.stub(:readlines) do |path|
+        case path
+        when ".rspec"
+          ["--formatter", "local"] 
+        when /\.rspec/
+          ["--formatter", "global"] 
+        else
+          raise "Unexpected path: #{path}"
+        end
+      end
+      cli_options = Rspec::Core::ConfigurationOptions.new([])
+
+      cli_options.apply_to(config)
+
+      config.formatter.should == "local"
+    end
+
+    it "prefers CLI options over file options" do
+      config_options = Rspec::Core::ConfigurationOptions.new(['--formatter', 'progress'])
+      config_options.stub(:parse_options_file).and_return(:formatter => 'documentation')
+
+      config_options.apply_to(config)
+
+      config.formatter.should == 'progress'
+    end
+  end
+
 end
 

data/spec/rspec/core/configuration_spec.rb

@@ -4,7 +4,7 @@ module Rspec::Core
 
   describe Configuration do
 
-    let(:config) { Configuration.new }
+    let(:config) { subject }
 
     describe "#mock_framework_class" do
       before(:each) do
@@ -237,11 +237,11 @@ module Rspec::Core
       end
     end
 
-
     context "transactional examples" do
       it "defaults to use transactional examples" do
-          config.use_transactional_examples?.should be_true
+        config.use_transactional_examples?.should be_true
       end
+
       describe "#use_transactional_examples=" do
         it "remembers that I don't want transactional exmaples" do
           config.use_transactional_examples = false
@@ -250,6 +250,13 @@ module Rspec::Core
       end
     end
 
+    describe "libs=" do
+      it "adds directories to the LOAD_PATH" do
+        $LOAD_PATH.should_receive(:unshift).with("a/dir")
+        config.libs = ["a/dir"]
+      end
+    end
+
   end
 
 end

data/spec/rspec/core/{example_group_subject_spec.rb → subject_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Rspec::Core
 
-  describe ExampleGroupSubject do
+  describe Subject do
 
     describe "implicit subject" do
       describe "with a class" do

data/spec/ruby_forker.rb

@@ -2,7 +2,7 @@ require 'rbconfig'
 
 module RubyForker
   # Forks a ruby interpreter with same type as ourself.
-  # juby will fork jruby, ruby will fork ruby etc.
+  # jruby will fork jruby, ruby will fork ruby etc.
   def ruby(args, stderr=nil)
     config       = ::Config::CONFIG
     interpreter  = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
@@ -10,4 +10,4 @@ module RubyForker
     cmd << " 2> #{stderr}" unless stderr.nil?
     `#{cmd}`
   end
-end
+end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 5
-  version: 2.0.0.beta.5
+  - 6
+  version: 2.0.0.beta.6
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 -03:00
+date: 2010-04-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 5
-        version: 2.0.0.beta.5
+        - 6
+        version: 2.0.0.beta.6
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 5
-        version: 2.0.0.beta.5
+        - 6
+        version: 2.0.0.beta.6
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - .treasure_map.rb
 - License.txt
 - README.markdown
@@ -153,7 +154,7 @@ files:
 - features/command_line/example_name_option.feature
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
-- features/configuration/spec_opts.feature
+- features/configuration/options_file.feature
 - features/example_groups/describe_aliases.feature
 - features/example_groups/nested_groups.feature
 - features/formatters/custom_formatter.feature
@@ -174,12 +175,11 @@ files:
 - lib/rspec/core.rb
 - lib/rspec/core/around_proxy.rb
 - lib/rspec/core/backward_compatibility.rb
-- lib/rspec/core/command_line_options.rb
 - lib/rspec/core/configuration.rb
+- lib/rspec/core/configuration_options.rb
 - lib/rspec/core/deprecation.rb
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
-- lib/rspec/core/example_group_subject.rb
 - lib/rspec/core/formatters.rb
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
@@ -200,17 +200,16 @@ files:
 - lib/rspec/core/ruby_project.rb
 - lib/rspec/core/runner.rb
 - lib/rspec/core/shared_example_group.rb
-- lib/rspec/core/shared_example_group_kernel_extensions.rb
+- lib/rspec/core/subject.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/world.rb
 - rspec-core.gemspec
 - script/console
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
-- spec/rspec/core/command_line_options_spec.rb
+- spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/example_group_spec.rb
-- spec/rspec/core/example_group_subject_spec.rb
 - spec/rspec/core/example_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
 - spec/rspec/core/formatters/base_text_formatter_spec.rb
@@ -229,6 +228,7 @@ files:
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
+- spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/ruby_forker.rb
@@ -242,7 +242,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.5
+    Thank you for installing rspec-core-2.0.0.beta.6
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -276,14 +276,13 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.5
+summary: rspec-core-2.0.0.beta.6
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
-- spec/rspec/core/command_line_options_spec.rb
+- spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/example_group_spec.rb
-- spec/rspec/core/example_group_subject_spec.rb
 - spec/rspec/core/example_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
 - spec/rspec/core/formatters/base_text_formatter_spec.rb
@@ -302,6 +301,7 @@ test_files:
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
+- spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/ruby_forker.rb

data/lib/rspec/core/command_line_options.rb

@@ -1,93 +0,0 @@
-require 'optparse'
-# http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
-
-module Rspec
-  module Core
-
-    class CommandLineOptions
-      DEFAULT_OPTIONS_FILE = 'spec/spec.opts'
-      
-      attr_reader :args, :options
-      
-      def self.parse(args)
-        new(args).parse
-      end
-
-      def initialize(args)
-        @args = args
-        @options = {}
-      end
-      
-      def parse
-        options[:files_or_directories_to_run] = OptionParser.new do |opts|
-          opts.banner = "Usage: rspec [options] [files or directories]"
-
-          opts.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output') do |o|
-            options[:color_enabled] = o
-          end
-          
-          opts.on('-f', '--formatter [FORMATTER]', 'Choose a formatter',
-                  '  [p]rogress (default - dots)',
-                  '  [d]ocumentation (group and example names)') do |o|
-            options[:formatter] = o
-          end
-
-          opts.on('-l', '--line_number [LINE]', 'Specify the line number of a single example to run') do |o|
-            options[:line_number] = o
-          end
-
-          opts.on('-e', '--example [PATTERN]', "Run examples whose full descriptions match this pattern",
-                  "(PATTERN is compiled into a Ruby regular expression)") do |o|
-            options[:full_description] = /#{o}/
-          end
-
-          opts.on('-o', '--options [PATH]', 'Read configuration options from a file path.  (Defaults to spec/spec.opts)') do |o|
-            options[:options_file] = o || DEFAULT_OPTIONS_FILE
-          end
-
-          opts.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
-            options[:profile_examples] = o
-          end
-
-          opts.on('-b', '--backtrace', 'Enable full backtrace') do |o|
-            options[:full_backtrace] = true
-          end
-
-          opts.on('-d', '--debug', 'Enable debugging') do |o|
-            options[:debug] = true
-          end
-
-          opts.on_tail('-h', '--help', "You're looking at it.") do 
-            puts opts
-            exit
-          end
-        end.parse!(@args)
-
-        self 
-      end
-
-      def apply(config)
-        # 1) option file, cli options, rspec core configure
-        # TODO: Add options_file to configuration
-        # TODO: Store command line options for reference
-        options_file = options.delete(:options_file) || DEFAULT_OPTIONS_FILE
-        merged_options = parse_spec_file_contents(options_file).merge!(options)
-        options.replace merged_options
-        
-        options.each do |key, value|
-          config.send("#{key}=", value)
-        end
-      end
-
-      private
-
-      def parse_spec_file_contents(options_file)
-        return {} unless File.exist?(options_file)
-        spec_file_contents = File.readlines(options_file).map {|l| l.split}.flatten
-        self.class.new(spec_file_contents).parse.options
-      end
-
-    end
-
-  end
-end

data/lib/rspec/core/shared_example_group_kernel_extensions.rb

@@ -1,31 +0,0 @@
-module Rspec
-  module Core
-    module SharedExampleGroupKernelExtensions
-
-      def share_examples_for(name, &block)
-        Rspec::Core.world.shared_example_groups[name] = block
-      end
-
-      def share_as(name, &block)
-        if Object.const_defined?(name)
-          puts "name was defined as #{name.inspect}"
-          raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
-        end
-        
-        mod = Module.new do
-          @shared_block = block
-
-          def self.included(kls)
-            kls.module_eval(&@shared_block)
-          end
-        end
-
-        shared_const = Object.const_set(name, mod)
-        Rspec::Core.world.shared_example_groups[shared_const] = block
-      end
-
-      alias :shared_examples_for :share_examples_for
-
-    end
-  end
-end