rspec-core 2.0.0.beta.15 → 2.0.0.beta.16

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

@@ -0,0 +1,52 @@
+module RSpec
+  module Core
+    module Formatters
+      # This class extracts code snippets by looking at the backtrace of the passed error
+      class SnippetExtractor #:nodoc:
+        class NullConverter; def convert(code, pre); code; end; end #:nodoc:
+        begin; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end
+        
+        def snippet(error)
+          raw_code, line = snippet_for(error.backtrace[0])
+          highlighted = @@converter.convert(raw_code, false)
+          highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
+          post_process(highlighted, line)
+        end
+        
+        def snippet_for(error_line)
+          if error_line =~ /(.*):(\d+)/
+            file = $1
+            line = $2.to_i
+            [lines_around(file, line), line]
+          else
+            ["# Couldn't get snippet for #{error_line}", 1]
+          end
+        end
+        
+        def lines_around(file, line)
+          if File.file?(file)
+            lines = File.open(file).read.split("\n")
+            min = [0, line-3].max
+            max = [line+1, lines.length-1].min
+            selected_lines = []
+            selected_lines.join("\n")
+            lines[min..max].join("\n")
+          else
+            "# Couldn't get snippet for #{file}"
+          end
+        end
+        
+        def post_process(highlighted, offending_line)
+          new_lines = []
+          highlighted.split("\n").each_with_index do |line, i|
+            new_line = "<span class=\"linenum\">#{offending_line+i-2}</span>#{line}"
+            new_line = "<span class=\"offending\">#{new_line}</span>" if i == 2
+            new_lines << new_line
+          end
+          new_lines.join("\n")
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'rspec/core/formatters/html_formatter'
+
+module RSpec
+  module Core
+    module Formatters
+      # Formats backtraces so they're clickable by TextMate
+      class TextMateFormatter < HtmlFormatter
+        def backtrace_line(line)
+          if line = super(line)
+            line.sub!(/([^:]*\.rb):(\d*)/) do
+              "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/core/mocking/with_rspec.rb

@@ -1,19 +1,19 @@
-require 'rspec/mocks/framework'
-require 'rspec/mocks/extensions'
+require 'rspec/mocks'
 
 module RSpec
   module Core
     module MockFrameworkAdapter
 
-      include RSpec::Mocks::ExampleMethods
       def _setup_mocks
-        $rspec_mocks ||= RSpec::Mocks::Space.new
+        RSpec::Mocks::setup(self)
       end
+
       def _verify_mocks
-        $rspec_mocks.verify_all
+        RSpec::Mocks::verify
       end
+
       def _teardown_mocks
-        $rspec_mocks.reset_all
+        RSpec::Mocks::teardown
       end
 
     end

data/lib/rspec/core/option_parser.rb

@@ -44,6 +44,8 @@ module RSpec::Core
         parser.on('-f', '--format FORMATTER', 'Choose a formatter',
                 '  [p]rogress (default - dots)',
                 '  [d]ocumentation (group and example names)',
+                '  [h]tml',
+                '  [t]extmate',
                 '  custom formatter class name') do |o|
           options[:formatter] = o
         end

data/lib/rspec/core/runner.rb

@@ -4,22 +4,22 @@ module RSpec
   module Core
     class Runner
 
-      def self.at_exit_hook_disabled?
-        @no_at_exit_hook ||= false
+      def self.autorun
+        return if autorun_disabled? || installed_at_exit? || running_in_drb?
+        @installed_at_exit = true
+        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
       end
 
-      def self.disable_at_exit_hook!
-        @no_at_exit_hook = true
+      def self.autorun_disabled?
+        @autorun_disabled ||= false
       end
 
-      def self.installed_at_exit?
-        @installed_at_exit ||= false
+      def self.disable_autorun!
+        @autorun_disabled = true
       end
 
-      def self.autorun
-        return if at_exit_hook_disabled? || installed_at_exit? || running_in_drb?
-        @installed_at_exit = true
-        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
+      def self.installed_at_exit?
+        @installed_at_exit ||= false
       end
 
       def self.running_in_drb?
@@ -43,7 +43,7 @@ module RSpec
       end
 
       def self.run_in_process(options, err, out)
-        CommandLine.new(options).run(err, out)
+        CommandLine.new(options, RSpec::configuration, RSpec::world).run(err, out)
       end
 
     end

data/lib/rspec/core/world.rb

@@ -4,7 +4,8 @@ module RSpec
 
       attr_reader :example_groups, :filtered_examples
 
-      def initialize
+      def initialize(configuration=RSpec.configuration)
+        @configuration = configuration
         @example_groups = []
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
@@ -16,20 +17,16 @@ module RSpec
         }
       end
 
-      def configuration
-        RSpec.configuration
-      end
-
       def inclusion_filter
-        configuration.filter
+        @configuration.filter
       end
 
       def exclusion_filter
-        configuration.exclusion_filter
+        @configuration.exclusion_filter
       end
 
       def find_modules(group)
-        configuration.find_modules(group)
+        @configuration.find_modules(group)
       end
 
       def shared_example_groups
@@ -58,12 +55,12 @@ module RSpec
 
       def announce_inclusion_filter
         if inclusion_filter
-          if RSpec.configuration.run_all_when_everything_filtered? && RSpec.world.example_count == 0
-            RSpec.configuration.output_stream.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
-            RSpec.configuration.clear_inclusion_filter
+          if @configuration.run_all_when_everything_filtered? && RSpec.world.example_count == 0
+            @configuration.reporter.message "No examples were matched by #{inclusion_filter.inspect}, running all"
+            @configuration.clear_inclusion_filter
             filtered_examples.clear
           else
-            RSpec.configuration.output_stream.puts "Run filtered using #{inclusion_filter.inspect}"          
+            @configuration.reporter.message "Run filtered using #{inclusion_filter.inspect}"
           end
         end      
       end
@@ -71,7 +68,7 @@ module RSpec
       include RSpec::Core::Hooks
 
       def find_hook(hook, scope, group)
-        RSpec.configuration.find_hook(hook, scope, group)
+        @configuration.find_hook(hook, scope, group)
       end
 
     private

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.15"
+  s.version = "2.0.0.beta.16"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-06}
   s.default_executable = %q{rspec}
   s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "autotest/discover.rb",
      "bin/rspec",
      "cucumber.yml",
+     "features/README.markdown",
      "features/command_line/example_name_option.feature",
      "features/command_line/exit_status.feature",
      "features/command_line/line_number_appended_to_path.feature",
@@ -71,7 +72,10 @@ Gem::Specification.new do |s|
      "lib/rspec/core/formatters/base_text_formatter.rb",
      "lib/rspec/core/formatters/documentation_formatter.rb",
      "lib/rspec/core/formatters/helpers.rb",
+     "lib/rspec/core/formatters/html_formatter.rb",
      "lib/rspec/core/formatters/progress_formatter.rb",
+     "lib/rspec/core/formatters/snippet_extractor.rb",
+     "lib/rspec/core/formatters/text_mate_formatter.rb",
      "lib/rspec/core/hooks.rb",
      "lib/rspec/core/kernel_extensions.rb",
      "lib/rspec/core/let.rb",
@@ -110,7 +114,14 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/base_text_formatter_spec.rb",
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/helpers_spec.rb",
+     "spec/rspec/core/formatters/html_formatted-1.8.7.html",
+     "spec/rspec/core/formatters/html_formatted-1.9.1.html",
+     "spec/rspec/core/formatters/html_formatted-1.9.2.html",
+     "spec/rspec/core/formatters/html_formatter_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
+     "spec/rspec/core/formatters/snippet_extractor_spec.rb",
+     "spec/rspec/core/formatters/text_mate_formatted-1.8.7.html",
+     "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
      "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
@@ -121,6 +132,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
      "spec/rspec/core/resources/custom_example_group_runner.rb",
+     "spec/rspec/core/resources/formatter_specs.rb",
      "spec/rspec/core/resources/utf8_encoded.rb",
      "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
@@ -135,7 +147,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.15
+  Thank you for installing rspec-core-2.0.0.beta.16
   
 **************************************************
 }
@@ -143,7 +155,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-core-2.0.0.beta.15}
+  s.summary = %q{rspec-core-2.0.0.beta.16}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -159,7 +171,10 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/base_text_formatter_spec.rb",
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/helpers_spec.rb",
+     "spec/rspec/core/formatters/html_formatter_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
+     "spec/rspec/core/formatters/snippet_extractor_spec.rb",
+     "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
      "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
@@ -170,6 +185,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
      "spec/rspec/core/resources/custom_example_group_runner.rb",
+     "spec/rspec/core/resources/formatter_specs.rb",
      "spec/rspec/core/resources/utf8_encoded.rb",
      "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
@@ -186,19 +202,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.15"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.15"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.16"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
       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.15"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.15"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.16"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
       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.15"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.15"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.16"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/command_line_spec.rb

@@ -3,13 +3,6 @@ require "stringio"
 
 module RSpec::Core
   describe CommandLine do
-    context "given an array" do
-      it "converts the contents to a ConfigurationOptions object" do
-        command_line = CommandLine.new(%w[--color])
-        command_line.instance_eval { @options }.should be_a(ConfigurationOptions)
-      end
-    end
-
     context "given a ConfigurationOptions object" do
       it "assigns it to @options" do
         config_options = ConfigurationOptions.new(%w[--color])
@@ -27,7 +20,7 @@ module RSpec::Core
       end
 
       let(:command_line) do
-        CommandLine.new(config_options)
+        CommandLine.new(config_options, config)
       end
 
       let(:config) do
@@ -37,7 +30,6 @@ module RSpec::Core
       let(:out) { ::StringIO.new }
 
       before do
-        command_line.stub(:configuration) { config }
         config.stub(:run_hook)
       end
 

data/spec/rspec/core/configuration_spec.rb

@@ -140,19 +140,22 @@ module RSpec::Core
 
       context "with no filter" do
         it "includes the given module into each example group" do
-          config.include(InstanceLevelMethods)
-          
+          RSpec.configure do |c|
+            c.include(InstanceLevelMethods)
+          end
+
           group = ExampleGroup.describe('does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
           group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
         end
-        
       end
 
       context "with a filter" do
         it "includes the given module into each matching example group" do
-          config.include(InstanceLevelMethods, :magic_key => :include)
-          
+          RSpec.configure do |c|
+            c.include(InstanceLevelMethods, :magic_key => :include)
+          end
+
           group = ExampleGroup.describe('does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
           group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
@@ -169,7 +172,10 @@ module RSpec::Core
       end
 
       it "should extend the given module into each matching example group" do
-        config.extend(ThatThingISentYou, :magic_key => :extend)      
+        RSpec.configure do |c|
+          c.extend(ThatThingISentYou, :magic_key => :extend)      
+        end
+
         group = ExampleGroup.describe(ThatThingISentYou, :magic_key => :extend) { }
         group.should respond_to(:that_thing)
       end
@@ -304,18 +310,18 @@ module RSpec::Core
     end
 
     describe "full_backtrace=" do
-      before do
-        @backtrace_clean_patterns = config.backtrace_clean_patterns
-      end
-
-      after do
-        config.backtrace_clean_patterns = @backtrace_clean_patterns
-      end
-
       it "clears the backtrace clean patterns" do
         config.full_backtrace = true
         config.backtrace_clean_patterns.should == []
       end
+
+      it "doesn't impact other instances of config" do
+        config_1 = Configuration.new
+        config_2 = Configuration.new
+
+        config_1.full_backtrace = true
+        config_2.backtrace_clean_patterns.should_not be_empty
+      end
     end
 
     describe "debug=true" do
@@ -384,10 +390,20 @@ module RSpec::Core
             config.custom_option?.should be_true
           end
 
-          it "can be overridden" do
+          it "can be overridden with a truthy value" do
             config.custom_option = "a new value"
             config.custom_option.should eq("a new value")
           end
+
+          it "can be overridden with nil" do
+            config.custom_option = nil
+            config.custom_option.should eq(nil)
+          end
+
+          it "can be overridden with false" do
+            config.custom_option = false
+            config.custom_option.should eq(false)
+          end
         end
       end
 

data/spec/rspec/core/drb_command_line_spec.rb

@@ -1,31 +1,39 @@
 require "spec_helper"
 
 describe "::DRbCommandLine", :ruby => "!jruby" do
-  before do
-    RSpec.stub(:configuration).and_return(RSpec::Core::Configuration.new)
+  let(:config) { RSpec::Core::Configuration.new }
+  let(:out)    { StringIO.new }
+  let(:err)    { StringIO.new }
+
+  def config_options(argv=[])
+    options = RSpec::Core::ConfigurationOptions.new(argv)
+    options.parse_options
+    options
+  end
+
+  def drb_command_line(args)
+    RSpec::Core::DRbCommandLine.new(config_options(args))
+  end
+
+  def run_with(args)
+    drb_command_line(args).run(err, out)
   end
 
   context "without server running" do
     it "prints error" do
-      err = out = StringIO.new
-      RSpec::Core::DRbCommandLine.new([]).run(err, out)
+      run_with []
 
       err.rewind
       err.read.should =~ /No DRb server is running/
     end
     
     it "returns false" do
-      err = out = StringIO.new
-      result = RSpec::Core::DRbCommandLine.new([]).run(err, out)
+      result = run_with []
       result.should be_false
     end
   end
   
   describe "--drb-port" do
-    def config_options_object(*args)
-      RSpec::Core::DRbCommandLine.new(args)
-    end
-
     def with_RSPEC_DRB_set_to(val)
       original = ENV['RSPEC_DRB']
       ENV['RSPEC_DRB'] = val
@@ -39,14 +47,14 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     context "without RSPEC_DRB environment variable set" do
       it "defaults to 8989" do
         with_RSPEC_DRB_set_to(nil) do
-          RSpec::Core::DRbCommandLine.new([]).drb_port.should == 8989
+          drb_command_line([]).drb_port.should == 8989
         end
       end
       
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
-          RSpec::Core::DRbCommandLine.new(["--drb-port", "1234"]).drb_port.should == 1234
-          RSpec::Core::DRbCommandLine.new(["--drb-port", "5678"]).drb_port.should == 5678
+          drb_command_line(["--drb-port", "1234"]).drb_port.should == 1234
+          drb_command_line(["--drb-port", "5678"]).drb_port.should == 5678
         end
       end
     end
@@ -56,7 +64,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "without config variable set" do
         it "uses RSPEC_DRB value" do
           with_RSPEC_DRB_set_to('9000') do
-            RSpec::Core::DRbCommandLine.new([]).drb_port.should == "9000"
+            drb_command_line([]).drb_port.should == "9000"
           end
         end
       end
@@ -64,7 +72,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
-            RSpec::Core::DRbCommandLine.new(%w[--drb-port 5678]).drb_port.should == 5678
+            drb_command_line(%w[--drb-port 5678]).drb_port.should == 5678
           end
         end
       end
@@ -74,7 +82,9 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
   context "with server running" do
     class ::FakeDrbSpecServer
       def self.run(argv, err, out) 
-        RSpec::Core::CommandLine.new(argv).run(err, out)
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        RSpec::Core::CommandLine.new(options, RSpec::Core::Configuration.new).run(err, out)
       end
     end
 
@@ -117,34 +127,32 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       end
     end
 
-    def run_spec_via_druby(argv)
+    it "returns true" do
       err, out = StringIO.new, StringIO.new
-      RSpec::Core::DRbCommandLine.new(argv.push("--drb-port", @drb_port.to_s)).run(err, out)
-      out.rewind
-      out.read
+      result = drb_command_line(["--drb-port", @drb_port.to_s]).run(err, out)
+      result.should be_true
     end
-
-    it "returns true" do
+    
+    it "integrates via Runner.new.run" do
       err, out = StringIO.new, StringIO.new
-      result = RSpec::Core::DRbCommandLine.new(["--drb-port", @drb_port.to_s]).run(err, out)
+      result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
       result.should be_true
     end
+
+    def run_spec_via_druby
+      run_with([dummy_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
+      out.rewind
+      out.read
+    end
     
     it "should output green colorized text when running with --colour option" do
-      out = run_spec_via_druby(["--colour", dummy_spec_filename])
-      out.should =~ /\e\[32m/m
+      pending "figure out a way to properly sandbox this"
+      run_spec_via_druby.should =~ /\e\[32m/m
     end
   
     it "should output red colorized text when running with -c option" do
-      pending
-      out = run_spec_via_druby(["-c", dummy_spec_filename])
-      out.should =~ /\e\[31m/m
-    end
-    
-    it "integrates via Runner.new.run" do
-      err, out = StringIO.new, StringIO.new
-      result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
-      result.should be_true
+      pending "figure out a way to properly sandbox this"
+      run_spec_via_druby.should =~ /\e\[31m/m
     end
   end