rspec-core 2.3.1 → 2.4.0

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

@@ -147,7 +147,8 @@ module RSpec
           exception = example.execution_result[:exception]
           output.puts "#{short_padding}#{index.next}) #{example.full_description}"
           output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
-          exception.message.split("\n").each { |line| output.puts "#{long_padding}#{red(line)}" }
+          output.puts "#{long_padding}#{red(exception.class.name << ":")}" unless exception.class.name =~ /RSpec/
+          exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" }
 
           example.example_group.ancestors.push(example.example_group).each do |group|
             if group.metadata[:shared_group_name]

data/lib/rspec/core/hooks.rb

@@ -10,8 +10,8 @@ module RSpec
           @block = block
         end
 
-        def options_apply?(group)
-          !group || group.apply?(:all?, options)
+        def options_apply?(example_or_group)
+          !example_or_group || example_or_group.apply?(:all?, options)
         end
 
         def to_proc
@@ -50,8 +50,8 @@ module RSpec
       end
 
       class HookCollection < Array
-        def find_hooks_for(group)
-          dup.reject {|hook| !hook.options_apply?(group)}
+        def find_hooks_for(example_or_group)
+          self.class.new(select {|hook| hook.options_apply?(example_or_group)})
         end
       end
 
@@ -112,12 +112,12 @@ module RSpec
         hooks[hook][scope].run_all!(example_group_instance)
       end
 
-      def run_hook_filtered(hook, scope, group, example_group_instance)
-        find_hook(hook, scope, group).run_all(example_group_instance)
+      def run_hook_filtered(hook, scope, group, example_group_instance, example = nil)
+        find_hook(hook, scope, group, example).run_all(example_group_instance)
       end
 
-      def find_hook(hook, scope, example_group_class)
-        hooks[hook][scope].find_hooks_for(example_group_class)
+      def find_hook(hook, scope, example_group_class, example = nil)
+        hooks[hook][scope].find_hooks_for(example || example_group_class)
       end
 
     private

data/lib/rspec/core/option_parser.rb

@@ -48,11 +48,17 @@ module RSpec::Core
                 '  [h]tml',
                 '  [t]extmate',
                 '  custom formatter class name') do |o|
-          options[:formatter] = o
+          options[:formatters] ||= []
+          options[:formatters] << [o]
         end
 
-        parser.on('-o', '--out FILE', 'output to a file instead of STDOUT') do |o|
-          options[:output_stream] = File.open(o,'w')
+        parser.on('-o', '--out FILE',
+                  'Write output to a file instead of STDOUT. This option applies',
+                  'to the previously specified --format, or the default format if',
+                  'no format is specified.'
+                 ) do |o|
+          options[:formatters] ||= [['progress']]
+          options[:formatters].last << o
         end
 
         parser.on_tail('-h', '--help', "You're looking at it.") do
@@ -69,6 +75,10 @@ module RSpec::Core
           options[:line_number] = o
         end
 
+        parser.on('-O', '--options PATH', 'Specify the path to an options file') do |path|
+          options[:custom_options_file] = path
+        end
+
         parser.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
           options[:profile_examples] = o
         end

data/lib/rspec/core/pending.rb

@@ -4,6 +4,8 @@ module RSpec
       DEFAULT_MESSAGE = 'No reason given'
 
       def pending(*args)
+        return self.class.before(:each) { pending(*args) } unless example
+
         options = args.last.is_a?(Hash) ? args.pop : {}
         message = args.first || DEFAULT_MESSAGE
 

data/lib/rspec/core/rake_task.rb

@@ -149,7 +149,7 @@ module RSpec
         if ENV['SPEC']
           FileList[ ENV['SPEC'] ]
         else
-          FileList[ pattern ].map { |f| %["#{f}"] }
+          FileList[ pattern ].map { |f| f.gsub(/"/, '\"').gsub(/'/, "\\\\'") }
         end
       end
 

data/lib/rspec/core/subject.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module RSpec
   module Core
     module Subject

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.3.1'
+      STRING = '2.4.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -81,8 +81,8 @@ module RSpec
 
       include RSpec::Core::Hooks
 
-      def find_hook(hook, scope, group)
-        @configuration.find_hook(hook, scope, group)
+      def find_hook(hook, scope, group, example = nil)
+        @configuration.find_hook(hook, scope, group, example)
       end
 
     private

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-
 require 'ostruct'
+require 'tmpdir'
 
 describe RSpec::Core::ConfigurationOptions do
 
@@ -10,7 +10,7 @@ describe RSpec::Core::ConfigurationOptions do
     coo
   end
 
-  def options_from_args(*args)
+  def parse_options(*args)
     config_options_object(*args).options
   end
 
@@ -27,114 +27,108 @@ describe RSpec::Core::ConfigurationOptions do
       opts = config_options_object(*%w[--require a/path -f a/formatter])
       config = double("config").as_null_object
       config.should_receive(:requires=).ordered
-      config.should_receive(:formatter=).ordered
+      config.should_receive(:add_formatter).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)
-      options_from_args('--color').should include(:color_enabled => true)
-      options_from_args('--colour').should include(:color_enabled => true)
+  describe "-c, --color, and --colour" do
+    it "sets :color_enabled => true" do
+      parse_options('-c').should include(:color_enabled => true)
+      parse_options('--color').should include(:color_enabled => true)
+      parse_options('--colour').should include(:color_enabled => true)
     end
+  end
 
-    example "--no-color is parsed as false" do
-      options_from_args('--no-color').should include(:color_enabled => false)
+  describe "--no-color" do
+    it "sets :color_enabled => false" do
+      parse_options('--no-color').should include(:color_enabled => false)
     end
   end
 
-  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'])
+  describe "-I" do
+    example "adds to :libs" do
+      parse_options('-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'])
+    example "can be used more than once" do
+      parse_options('-I', 'dir_1', '-I', 'dir_2').should include(:libs => ['dir_1','dir_2'])
     end
   end
 
   describe '--require' do
-    example "--requires files" do
-      options_from_args('--require', 'a/path').should include(:requires => ['a/path'])
+    example "requires files" do
+      parse_options('--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'])
+    example "can be used more than once" do
+      parse_options('--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')
+  describe "--format, -f" do
+    it "sets :formatter" do
+      parse_options('--format', 'd').should include(:formatters => [['d']])
+      parse_options('-f', 'd').should include(:formatters => [['d']])
+      parse_options('-fd').should include(:formatters => [['d']])
     end
 
-    example "-f/--format can accept a class name" do
-      options_from_args('-fSome::Formatter::Class').should include(:formatter => 'Some::Formatter::Class')
+    example "can accept a class name" do
+      parse_options('-fSome::Formatter::Class').should include(:formatters => [['Some::Formatter::Class']])
     end
   end
 
-  describe 'profile_examples' do
-    example "-p or --profile should be parsed as true" do
-      options_from_args('-p').should include(:profile_examples => true)
-      options_from_args('--profile').should include(:profile_examples => true)
+  describe "--profile, -p" do
+    it "sets :profile_examples => true" do
+      parse_options('-p').should include(:profile_examples => true)
+      parse_options('--profile').should include(:profile_examples => true)
     end
   end
 
-  describe 'line_number' do
-    it "is parsed from -l or --line_number" do
-      options_from_args('-l','3').should include(:line_number => '3')
-      options_from_args('--line_number','3').should include(:line_number => '3')
+  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')
     end
   end
 
-  describe "example" do
-    it "is parsed from --example or -e" do
-      options_from_args('--example','foo').should include(:full_description => /foo/)
-      options_from_args('-e','bar').should include(:full_description => /bar/)
+  describe "--example" do
+    it "sets :full_description" do
+      parse_options('--example','foo').should include(:full_description => /foo/)
+      parse_options('-e','bar').should include(:full_description => /bar/)
     end
   end
 
-  describe "files_or_directories_to_run" do
-    it "parses files from '-c file.rb dir/file.rb'" do
-      options_from_args("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
-    end
-
-    it "parses dir from 'dir'" do
-      options_from_args("dir").should include(:files_or_directories_to_run => ["dir"])
-    end
-
-    it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
-      options_from_args("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"])
+  describe "--backtrace, -b" do
+    it "sets full_backtrace on config" do
+      parse_options("--backtrace").should include(:full_backtrace => true)
+      parse_options("-b").should include(:full_backtrace => true)
     end
+  end
 
-    it "provides no files or directories if spec directory does not exist" do
-      FileTest.stub(:directory?).with("spec").and_return false
-      options_from_args().should include(:files_or_directories_to_run => [])
+  describe "--debug, -d" do
+    it "sets :debug => true" do
+      parse_options("--debug").should include(:debug => true)
+      parse_options("-d").should include(:debug => true)
     end
+  end
 
-    it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
-      options_from_args("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"])
-
+  describe "--fail-fast" do
+    it "defaults to false" do
+      parse_options[:fail_fast].should be_false
     end
 
-  end
-
-  describe "--backtrace (-b)" do
-    it "sets full_backtrace on config" do
-      options_from_args("--backtrace").should include(:full_backtrace => true)
-      options_from_args("-b").should include(:full_backtrace => true)
+    it "sets fail_fast on config" do
+      parse_options("--fail-fast")[:fail_fast].should be_true
     end
   end
 
-  describe "--debug (-d)" do
-    it "sets debug on config" do
-      options_from_args("--debug").should include(:debug => true)
-      options_from_args("-d").should include(:debug => true)
+  describe "--options" do
+    it "sets :custom_options_file" do
+      parse_options(*%w[-O my.opts]).should include(:custom_options_file => "my.opts")
+      parse_options(*%w[--options my.opts]).should include(:custom_options_file => "my.opts")
     end
   end
 
-  describe "--drb (-X)" do
+  describe "--drb, -X" do
     context "combined with --debug" do
       it "turns off the debugger if --drb is specified first" do
         config_options_object("--drb", "--debug").drb_argv.should_not include("--debug")
@@ -170,8 +164,32 @@ describe RSpec::Core::ConfigurationOptions do
     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"])
+    end
+
+    it "parses dir from 'dir'" do
+      parse_options("dir").should include(:files_or_directories_to_run => ["dir"])
+    end
+
+    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
+
+    it "provides no files or directories if spec directory does not exist" do
+      FileTest.stub(:directory?).with("spec").and_return false
+      parse_options().should include(:files_or_directories_to_run => [])
+    end
+
+    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
+
   # TODO ensure all options are output
-  # TODO check if we need to spec that the short options are "expanded" ("-v" becomes "--version" currently)
   describe "#drb_argv" do
     it "preserves extra arguments" do
       File.stub(:exist?) { false }
@@ -182,10 +200,14 @@ describe RSpec::Core::ConfigurationOptions do
       config_options_object(*%w[--fail-fast]).drb_argv.should include("--fail-fast")
     end
 
+    it "includes --options" do
+      config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
+    end
+
     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 --format s --line_number 1 --example pattern -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])
       end
     end
 
@@ -194,7 +216,7 @@ describe RSpec::Core::ConfigurationOptions 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 --format s --line_number 1 --example pattern ])
+          drb_argv.should eq(%w[ --color --profile --backtrace --tty --line_number 1 --example pattern --format s])
       end
     end
 
@@ -203,7 +225,7 @@ describe RSpec::Core::ConfigurationOptions 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 --format s --line_number 1 --example pattern ])
+          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s])
       end
     end
 
@@ -212,102 +234,76 @@ describe RSpec::Core::ConfigurationOptions 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 --format s --line_number 1 --example pattern ])
+          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s ])
       end
     end
   end
 
-  describe "--fail-fast" do
-    it "sets fail_fast on config" do
-      options_from_args("--fail-fast").should include(:fail_fast => true)
-    end
-  end
-
-  describe "options file (override)" do
-    let(:config) { OpenStruct.new }
-
-    it "loads automatically" do
-      File.stub(:exist?) { true }
-      IO.stub(:read) { "--format doc" }
-
-      config_options = RSpec::Core::ConfigurationOptions.new([])
-      config_options.parse_options
-      config_options.configure(config)
-      config.formatter.should == 'doc'
-    end
-
-    it "merges options from the global and local .rspec and the command line" do
-      File.stub(:exist?){ true }
-      IO.stub(:read) do |path|
-        case path
-        when ".rspec"
-          "--format documentation"
-        when /\.rspec/
-          "--line 37"
-        else
-          raise "Unexpected path: #{path}"
-        end
-      end
-      config_options = RSpec::Core::ConfigurationOptions.new(["--no-color"])
-      config_options.parse_options
-
-      config_options.configure(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 }
-      IO.stub(:read) do |path|
-        case path
-        when ".rspec"
-          "--format local"
-        when /\.rspec/
-          "--format global"
-        else
-          raise "Unexpected path: #{path}"
-        end
-      end
-      config_options = RSpec::Core::ConfigurationOptions.new([])
-      config_options.parse_options
-
-      config_options.configure(config)
+  describe "sources: ~/.rspec, ./.rspec, custom, SPEC_OPTS, and CLI" do
+    let(:local_options_file)  { File.join(Dir.tmpdir, ".rspec-local") }
+    let(:global_options_file) { File.join(Dir.tmpdir, ".rspec-global") }
+    let(:custom_options_file) { File.join(Dir.tmpdir, "custom.options") }
 
-      config.formatter.should == "local"
+    before do
+      @orig_spec_opts = ENV["SPEC_OPTS"]
+      @orig_global_options_file = RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE
+      @orig_local_options_file  = RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE
+      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
+      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
+      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = global_options_file
+      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = local_options_file
+      FileUtils.rm local_options_file if File.exist? local_options_file
+      FileUtils.rm global_options_file if File.exist? global_options_file
+      FileUtils.rm custom_options_file if File.exist? custom_options_file
     end
 
-    it "prefers CLI options over file options" do
-      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)
+    after do
+      ENV["SPEC_OPTS"] = @orig_spec_opts
+      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
+      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
+      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = @orig_global_options_file
+      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = @orig_local_options_file
+    end
 
-      config.formatter.should == 'progress'
+    def write_options(scope, options)
+      File.open(send("#{scope}_options_file"), 'w') { |f| f.write(options) }
     end
 
-    context "with SPEC_OPTS" do
-      before do
-        @orig_spec_opts = ENV["SPEC_OPTS"]
-      end
+    it "merges global, local, SPEC_OPTS, and CLI" do
+      write_options(:global, "--color")
+      write_options(:local,  "--line 37")
+      ENV["SPEC_OPTS"] = "--debug"
+      options = parse_options("--drb")
+      options[:color_enabled].should be_true
+      options[:line_number].should eq("37")
+      options[:debug].should be_true
+      options[:drb].should be_true
+    end
 
-      after do
-        ENV["SPEC_OPTS"] = @orig_spec_opts
-      end
+    it "prefers CLI over SPEC_OPTS" do
+      ENV["SPEC_OPTS"] = "--format spec_opts"
+      parse_options("--format", "cli")[:formatters].should eq([['cli']])
+    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'])
+    it "prefers SPEC_OPTS over file options" do
+      write_options(:local,  "--format local")
+      write_options(:global, "--format global")
+      ENV["SPEC_OPTS"] = "--format spec_opts"
+      parse_options[:formatters].should eq([['spec_opts']])
+    end
 
-        config_options.parse_options
-        config_options.configure(config)
+    it "prefers local file options over global" do
+      write_options(:local,  "--format local")
+      write_options(:global, "--format global")
+      parse_options[:formatters].should eq([['local']])
+    end
 
-        config.formatter.should == 'documentation'
+    context "with custom options file" do
+      it "ignores local and global options files" do
+        write_options(:local, "--color")
+        write_options(:global, "--color")
+        parse_options("-O", custom_options_file)[:color_enabled].should be_false
       end
     end
   end
 end
-