rspec-core 2.6.0 → 2.7.0.rc1

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)
@@ -11,11 +11,11 @@ module RSpec::Core
       begin
         yield self
       ensure
-        conclude
+        finish
       end
     end
 
-    def conclude
+    def finish
       begin
         stop
         notify :start_dump
@@ -27,10 +27,9 @@ module RSpec::Core
       end
     end
 
-    alias_method :abort, :conclude
+    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)) }
       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.0'
+      STRING = '2.7.0.rc1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -34,8 +34,8 @@ module RSpec
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
-            examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
-            examples = apply_inclusion_filters(examples, inclusion_filter) if inclusion_filter
+            examples = apply_exclusion_filters(examples, exclusion_filter)
+            examples = apply_inclusion_filters(examples, inclusion_filter)
             examples.uniq
           end
         }
@@ -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)
@@ -106,13 +106,13 @@ module RSpec
           example_groups.clear
           if filter_announcements.empty?
             reporter.message("No examples found.")
-          elsif inclusion_filter
+          elsif !inclusion_filter.empty?
             message = "No examples matched #{inclusion_filter.description}."
             if @configuration.run_all_when_everything_filtered?
               message << " Running all."
             end
             reporter.message(message)
-          elsif exclusion_filter
+          elsif !exclusion_filter.empty?
             reporter.message(
               "No examples were matched. Perhaps #{exclusion_filter.description} is excluding everything?")
           end
@@ -122,7 +122,7 @@ module RSpec
       end
 
       def announce_inclusion_filter(announcements)
-        if inclusion_filter
+        unless inclusion_filter.empty?
           announcements << "including #{inclusion_filter.description}"
         end
       end
@@ -139,10 +139,6 @@ module RSpec
 
     private
 
-      def apply?(predicate, conditions)
-        lambda {|example| example.metadata.apply?(predicate, conditions)}
-      end
-
       def declaration_line_numbers
         @line_numbers ||= example_groups.inject([]) do |lines, g|
           lines + g.declaration_line_numbers

data/lib/rspec/core.rb

@@ -1,3 +1,5 @@
+$rspec_start_time ||= Time.now
+require 'rspec/core/dsl'
 require 'rspec/core/extensions'
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
@@ -37,14 +39,17 @@ module RSpec
     end
   end
 
+  # Used internally to determine what to do when a SIGINT is received
   def self.wants_to_quit
     world.wants_to_quit
   end
 
+  # Used internally to determine what to do when a SIGINT is received
   def self.wants_to_quit=(maybe)
     world.wants_to_quit=(maybe)
   end
 
+  # Internal container for global non-configuration data
   def self.world
     @world ||= RSpec::Core::World.new
   end
@@ -56,38 +61,26 @@ module RSpec
     configuration.reset
   end
 
+  # Returns the global configuration object
   def self.configuration
     @configuration ||= RSpec::Core::Configuration.new
   end
 
+  # Yields the global configuration object
+  #
+  # == Examples
+  #
+  # RSpec.configure do |config|
+  #   config.format = 'documentation'
+  # end
   def self.configure
-    warn_about_deprecated_configure if RSpec.world.example_groups.any?
     yield configuration if block_given?
   end
 
+  # Used internally to clear remaining groups when fail_fast is set
   def self.clear_remaining_example_groups
     world.example_groups.clear
   end
-
-  private
-
-    def self.warn_about_deprecated_configure
-      warn <<-NOTICE
-
-*****************************************************************
-DEPRECATION WARNING: you are using deprecated behaviour that will
-be removed from RSpec 3.
-
-You have set some configuration options after an example group has
-already been defined.  In RSpec 3, this will not be allowed.  All
-configuration should happen before the first example group is
-defined.  The configuration is happening at:
-
-  #{caller[1]}
-*****************************************************************
-
-NOTICE
-    end
 end
 
 require 'rspec/core/backward_compatibility'

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