rspec-core 2.6.4 → 2.7.0.rc1

data/lib/rspec/core/option_parser.rb

@@ -73,8 +73,8 @@ module RSpec::Core
           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
+        parser.on('-l', '--line_number LINE', 'Specify the line number of an example to run.  May be specified multiple times.') do |o|
+          (options[:line_numbers] ||= []) << o
         end
 
         parser.on('-O', '--options PATH', 'Specify the path to an options file') do |path|
@@ -85,7 +85,7 @@ module RSpec::Core
           options[:profile_examples] = o
         end
 
-        parser.on('-P', '--pattern PATTERN', 'Load files those matching this pattern. Default is "spec/**/*_spec.rb"') do |o|
+        parser.on('-P', '--pattern PATTERN', 'Load files matching this pattern. Default is "spec/**/*_spec.rb"') do |o|
           options[:pattern] = o
         end
 
@@ -99,8 +99,8 @@ module RSpec::Core
           exit
         end
 
-        parser.on('-X', '--drb', 'Run examples via DRb') do |o|
-          options[:drb] = true
+        parser.on('-X', '--[no-]drb', 'Run examples via DRb') do |o|
+          options[:drb] = o
         end
 
         parser.on('--configure COMMAND', 'Generate configuration files') do |cmd|
@@ -132,6 +132,11 @@ module RSpec::Core
         parser.on('--tty', 'Used internally by rspec when sending commands to other processes') do |o|
           options[:tty] = true
         end
+
+        parser.on('--default_path PATH', 'Set the default path where RSpec looks for examples.',
+                                         'Can be a path to a file or a directory') do |path|
+          options[:default_path] = path
+        end
       end
     end
   end

data/lib/rspec/core/pending.rb

@@ -24,7 +24,8 @@ module RSpec
                        example.example_group_instance.instance_eval { verify_mocks_for_rspec }
                      end
             example.metadata[:pending] = false
-          rescue Exception
+          rescue Exception => e
+            example.execution_result[:exception] = e
           ensure
             teardown_mocks_for_rspec
           end

data/lib/rspec/core/rake_task.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rspec/core'
 require 'rspec/core/deprecation'
 require 'rake'
@@ -8,6 +6,7 @@ require 'rake/tasklib'
 module RSpec
   module Core
     class RakeTask < ::Rake::TaskLib
+      include ::Rake::DSL if defined?(::Rake::DSL)
 
       # Name of task.
       #
@@ -21,19 +20,29 @@ module RSpec
       #   'spec/**/*_spec.rb'
       attr_accessor :pattern
 
+      # Deprecated and has no effect. The rake task now checks
+      # ENV['BUNDLE_GEMFILE'] instead.
+      #
       # By default, if there is a Gemfile, the generated command will include
       # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, and
       # not add 'bundle exec' to the command.
       #
       # default:
       #   false
-      attr_accessor :skip_bundler
+      def skip_bundler=(*)
+        RSpec.deprecate("RSpec::Core::RakeTask#skip_bundler=", 'ENV["BUNDLE_GEMFILE"]')
+      end
 
-      # Name of Gemfile to use
+      # Deprecated and has no effect. The rake task now checks
+      # ENV['BUNDLE_GEMFILE'] instead.
+      #
+      # Name of Gemfile to use.
       #
       # default:
       #   Gemfile
-      attr_accessor :gemfile
+      def gemfile=(*)
+        RSpec.deprecate("RSpec::Core::RakeTask#gemfile=", 'ENV["BUNDLE_GEMFILE"]')
+      end
 
       # Deprecated. Use ruby_opts="-w" instead.
       #
@@ -115,15 +124,14 @@ module RSpec
       def initialize(*args)
         @name = args.shift || :spec
         @pattern, @rcov_path, @rcov_opts, @ruby_opts, @rspec_opts = nil, nil, nil, nil, nil
-        @warning, @rcov, @skip_bundler = false, false, false
+        @warning, @rcov = false, false
         @verbose, @fail_on_error = true, true
-        @gemfile = 'Gemfile'
 
         yield self if block_given?
 
         @rcov_path  ||= 'rcov'
         @rspec_path ||= 'rspec'
-        @pattern    ||= './spec/**/*_spec.rb'
+        @pattern    ||= './spec{,/*/**}/*_spec.rb'
 
         desc("Run RSpec code examples") unless ::Rake.application.last_comment
 
@@ -133,11 +141,12 @@ module RSpec
               puts "No examples matching #{pattern} could be found"
             else
               begin
-                ruby(spec_command)
+                puts spec_command if verbose
+                success = system(spec_command)
               rescue
                 puts failure_message if failure_message
-                raise("ruby #{spec_command} failed") if fail_on_error
               end
+              raise("ruby #{spec_command} failed") if fail_on_error unless success
             end
           end
         end
@@ -155,13 +164,15 @@ module RSpec
 
       def spec_command
         @spec_command ||= begin
-                            cmd_parts = [ruby_opts]
+                            cmd_parts = []
+                            cmd_parts << "bundle exec" if bundler?
+                            cmd_parts << RUBY
+                            cmd_parts << ruby_opts
                             cmd_parts << "-w" if warning?
                             cmd_parts << "-S"
-                            cmd_parts << "bundle exec" if gemfile? unless skip_bundler
                             cmd_parts << runner
                             if rcov
-                              cmd_parts << ["-Ispec#{File::PATH_SEPARATOR}lib", rcov_opts]
+                              cmd_parts << ["-Ispec:lib", rcov_opts]
                             else
                               cmd_parts << rspec_opts
                             end
@@ -187,8 +198,8 @@ module RSpec
         lambda {|s| s == ""}
       end
 
-      def gemfile?
-        File.exist?(gemfile)
+      def bundler?
+        ENV["BUNDLE_GEMFILE"] if ENV["BUNDLE_GEMFILE"] unless ENV["BUNDLE_GEMFILE"] == ""
       end
 
     end

data/lib/rspec/core/reporter.rb

@@ -3,7 +3,7 @@ module RSpec::Core
     def initialize(*formatters)
       @formatters = formatters
       @example_count = @failure_count = @pending_count = 0
-      @duration = @start = nil
+      @duration = nil
     end
 
     def report(count)
@@ -30,7 +30,6 @@ module RSpec::Core
     alias_method :abort, :finish
 
     def start(expected_example_count)
-      @start = Time.now
       notify :start, expected_example_count
     end
 
@@ -66,7 +65,7 @@ module RSpec::Core
     end
 
     def stop
-      @duration = Time.now - @start if @start
+      @duration = Time.now - $rspec_start_time
       notify :stop
     end
 

data/lib/rspec/core/runner.rb

@@ -7,8 +7,8 @@ module RSpec
       # Register an at_exit hook that runs the suite.
       def self.autorun
         return if autorun_disabled? || installed_at_exit? || running_in_drb?
+        at_exit { exit run(ARGV, $stderr, $stdout).to_i }
         @installed_at_exit = true
-        at_exit { exit(run(ARGV, $stderr, $stdout).to_i) }
       end
       AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
 

data/lib/rspec/core/shared_example_group.rb

@@ -3,10 +3,10 @@ module RSpec
     module SharedExampleGroup
 
       def shared_context(*args, &block)
-        if String === args.first || Symbol === args.first
-          name = args.shift
-          ensure_shared_example_group_name_not_taken(name)
-          RSpec.world.shared_example_groups[name] = block
+        if [String, Symbol, Module].any? {|cls| cls === args.first }
+          object = args.shift
+          ensure_shared_example_group_name_not_taken(object)
+          RSpec.world.shared_example_groups[object] = block
         end
 
         unless args.empty?

data/lib/rspec/core/subject.rb

@@ -75,14 +75,14 @@ module RSpec
         #
         #   # This ...
         #   describe Array do
-        #     its(:size) { should == 0 }
+        #     its(:size) { should eq(0) }
         #   end
         #
         #   # ... generates the same runtime structure as this:
         #   describe Array do
         #     describe "size" do
-        #       it "should == 0" do
-        #         subject.size.should == 0
+        #       it "should eq(0)" do
+        #         subject.size.should eq(0)
         #       end
         #     end
         #   end
@@ -98,7 +98,7 @@ module RSpec
         #       end
         #     end
         #
-        #     its("phone_numbers.first") { should == "555-1212" }
+        #     its("phone_numbers.first") { should eq("555-1212") }
         #   end
         #
         # When the subject is a +Hash+, you can refer to the Hash keys by
@@ -110,12 +110,12 @@ module RSpec
         #         'admin' => :all_permissions }
         #     end
         #
-        #     its([:max_users]) { should == 3 }
-        #     its(['admin']) { should == :all_permissions }
+        #     its([:max_users]) { should eq(3) }
+        #     its(['admin']) { should eq(:all_permissions) }
         #
         #     # You can still access to its regular methods this way:
         #     its(:keys) { should include(:max_users) }
-        #     its(:count) { should == 2 }
+        #     its(:count) { should eq(2) }
         #   end
         def its(attribute, &block)
           describe(attribute) do

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.4'
+      STRING = '2.7.0.rc1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -70,14 +70,14 @@ module RSpec
         example_groups.collect {|g| g.descendants}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
       end
 
-      def apply_inclusion_filters(examples, conditions={})
-        examples.select(&apply?(:any?, conditions))
+      def apply_inclusion_filters(examples, filters)
+        filters.empty? ? examples : examples.select {|e| e.metadata.any_apply?(filters)}
       end
 
       alias_method :find, :apply_inclusion_filters
 
-      def apply_exclusion_filters(examples, conditions={})
-        examples.reject(&apply?(:any?, conditions))
+      def apply_exclusion_filters(examples, filters)
+        filters.empty? ? examples : examples.reject {|e| e.metadata.any_apply?(filters)}
       end
 
       def preceding_declaration_line(filter_line)
@@ -139,10 +139,6 @@ module RSpec
 
     private
 
-      def apply?(predicate, filter)
-        lambda {|example| filter.empty? || example.metadata.apply?(predicate, filter)}
-      end
-
       def declaration_line_numbers
         @line_numbers ||= example_groups.inject([]) do |lines, g|
           lines + g.declaration_line_numbers

data/spec/autotest/discover_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "autotest/discover.rb" do
-  context "with /.rspec present" do
+  context "with ./.rspec present" do
     it "adds 'rspec2' to the list of discoveries" do
       File.stub(:exist?).with("./.rspec") { true }
       Autotest.should_receive(:add_discovery)
@@ -9,7 +9,7 @@ describe "autotest/discover.rb" do
     end
   end
 
-  context "with /.rspec absent" do
+  context "with ./.rspec absent" do
     it "does not add 'rspec2' to the list of discoveries" do
       File.stub(:exist?) { false }
       Autotest.should_not_receive(:add_discovery)

data/spec/autotest/failed_results_re_spec.rb

@@ -1,37 +1,45 @@
 require "spec_helper"
 
 describe "failed_results_re for autotest" do
-  let(:output) { StringIO.new }
-  let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
-  let(:example_output) do
-    group = RSpec::Core::ExampleGroup.describe("group name")
-    group.example("example name") { "this".should eq("that") }
-    group.run(formatter)
-    formatter.dump_failures
-    output.string
+  def run_example
+    group = RSpec::Core::ExampleGroup.describe("group")
+    example = group.example("example") { yield }
+    io = StringIO.new
+    formatter = RSpec::Core::Formatters::BaseTextFormatter.new(io)
+    reporter = RSpec::Core::Reporter.new(formatter)
+
+    group.run(reporter)
+    reporter.report(1) {}
+    io.string
   end
 
-  context "output does not have color enabled" do
-    before do
-      RSpec.configuration.stub(:color_enabled?) { false }
+  shared_examples "autotest failed_results_re" do
+    it "matches a failure" do
+      output = run_example { fail }
+      output.should match(Autotest::Rspec2.new.failed_results_re)
+      output.should include(__FILE__.sub(File.expand_path('.'),'.'))
     end
 
-    it "matches a failure" do
-      re = Autotest::Rspec2.new.failed_results_re
-      example_output.should =~ re
-      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
+    it "does not match when there are no failures" do
+      output = run_example { } # pass
+      output.should_not match(Autotest::Rspec2.new.failed_results_re)
+      output.should_not include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 
-  context "output has color enabled" do
+  context "with color enabled" do
     before do
-      RSpec.configuration.stub(:color_enabled?) { true }
+      RSpec.configuration.stub(:color_enabled? => true)
     end
 
-    it "matches a failure" do
-      re = Autotest::Rspec2.new.failed_results_re
-      example_output.should =~ re
-      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
+    include_examples "autotest failed_results_re"
+  end
+
+  context "with color disabled " do
+    before do
+      RSpec.configuration.stub(:color_enabled? => false)
     end
+
+    include_examples "autotest failed_results_re"
   end
 end

data/spec/autotest/rspec_spec.rb

@@ -86,14 +86,14 @@ describe Autotest::Rspec2 do
     let(:spec_file)    { "spec/autotest/some_spec.rb" }
 
     it "returns no failures if no failures were given in the output" do
-      rspec_autotest.consolidate_failures([[]]).should == {}
+      rspec_autotest.consolidate_failures([[]]).should eq({})
     end
 
     it "returns a hash with the spec filename => spec name for each failure or error" do
       failures = [ [ "false should be false", spec_file ] ]
-      rspec_autotest.consolidate_failures(failures).should == {
+      rspec_autotest.consolidate_failures(failures).should eq({
         spec_file => ["false should be false"]
-      }
+      })
     end
 
     context "when subject file appears before the spec file in the backtrace" do

data/spec/rspec/core/command_line_spec.rb

@@ -11,12 +11,6 @@ module RSpec::Core
       let(:out)    { StringIO.new }
       let(:err)    { StringIO.new }
 
-      def config_options(argv=[])
-        options = RSpec::Core::ConfigurationOptions.new(argv)
-        options.parse_options
-        options
-      end
-
       def command_line(args)
         RSpec::Core::CommandLine.new(config_options(args))
       end
@@ -156,6 +150,7 @@ module RSpec::Core
 
       before do
         config.stub(:run_hook)
+        config.stub(:files_to_run) { [] }
       end
 
       it "doesn't override output_stream" do

data/spec/rspec/core/configuration_options_spec.rb

@@ -42,6 +42,22 @@ describe RSpec::Core::ConfigurationOptions do
       opts.configure(config)
     end
 
+    it "sends default_path before files_or_directories_to_run" do
+      opts = config_options_object(*%w[--default_path spec])
+      config = double("config").as_null_object
+      config.should_receive(:default_path=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
+    it "sends pattern before files_or_directories_to_run" do
+      opts = config_options_object(*%w[--pattern **/*.spec])
+      config = double("config").as_null_object
+      config.should_receive(:pattern=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
     it "merges the :exclusion_filter option with the default exclusion_filter" do
       opts = config_options_object(*%w[--tag ~slow])
       config = RSpec::Core::Configuration.new
@@ -62,6 +78,14 @@ describe RSpec::Core::ConfigurationOptions do
     it "sets :color_enabled => false" do
       parse_options('--no-color').should include(:color_enabled => false)
     end
+
+    it "overrides previous :color_enabled => true" do
+      parse_options('--color', '--no-color').should include(:color_enabled => false)
+    end
+
+    it "gets overriden by a subsequent :color_enabled => true" do
+      parse_options('--no-color', '--color').should include(:color_enabled => true)
+    end
   end
 
   describe "-I" do
@@ -103,8 +127,13 @@ describe RSpec::Core::ConfigurationOptions do
 
   describe '--line_number' do
     it "sets :line_number" do
-      parse_options('-l','3').should include(:line_number => '3')
-      parse_options('--line_number','3').should include(:line_number => '3')
+      parse_options('-l','3').should include(:line_numbers => ['3'])
+      parse_options('--line_number','3').should include(:line_numbers => ['3'])
+    end
+
+    it "can be specified multiple times" do
+      parse_options('-l','3', '-l', '6').should include(:line_numbers => ['3', '6'])
+      parse_options('--line_number','3', '--line_number', '6').should include(:line_numbers => ['3', '6'])
     end
   end
 
@@ -183,6 +212,21 @@ describe RSpec::Core::ConfigurationOptions do
 
   end
 
+  describe "--no-drb" do
+    it "disables drb" do
+      parse_options("--no-drb").should include(:drb => false)
+    end
+
+    it "overrides a previous drb => true" do
+      parse_options("--drb", "--no-drb").should include(:drb => false)
+    end
+
+    it "gets overriden by a subsquent drb => true" do
+      parse_options("--no-drb", "--drb").should include(:drb => true)
+    end
+  end
+
+
   describe "files_or_directories_to_run" do
     it "parses files from '-c file.rb dir/file.rb'" do
       parse_options("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
@@ -203,9 +247,17 @@ describe RSpec::Core::ConfigurationOptions do
 
     it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
       parse_options("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
-
     end
+  end
 
+  describe "default_path" do
+    it "gets set before files_or_directories_to_run" do
+      config = double("config").as_null_object
+      config.should_receive(:default_path=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts = config_options_object("--default_path", "foo")
+      opts.configure(config)
+    end
   end
 
   # TODO ensure all options are output
@@ -227,7 +279,7 @@ describe RSpec::Core::ConfigurationOptions do
       it "includes --example" do
         config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
       end
-      
+
       it "unescapes characters which were escaped upon storing --example originally" do
         config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
       end
@@ -278,8 +330,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 --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s -I path/a -I path/b --require path/c --require path/d])
+        config_options_object(*%w[ --drb --color --format s --example pattern --line_number 1 --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s -I path/a -I path/b --require path/c --require path/d])
       end
     end
 
@@ -287,8 +339,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --tty --format s --line_number 1 --example pattern --profile --backtrace ]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --tty --line_number 1 --example pattern --format s])
+        config_options_object(*%w[ --tty --format s --example pattern --line_number 1 --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --tty --example pattern --line_number 1 --format s])
       end
     end
 
@@ -296,8 +348,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s])
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s])
       end
     end
 
@@ -305,8 +357,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb and --options" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s ])
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s ])
       end
     end
   end
@@ -340,7 +392,7 @@ describe RSpec::Core::ConfigurationOptions do
       ENV["SPEC_OPTS"] = "--debug"
       options = parse_options("--drb")
       options[:color_enabled].should be_true
-      options[:line_number].should eq("37")
+      options[:line_numbers].should eq(["37"])
       options[:debug].should be_true
       options[:drb].should be_true
     end