rspec 0.7.1 → 0.7.2

data/CHANGES

@@ -1,5 +1,17 @@
 = RSpec Changelog
 
+== Version 0.7.2 (in SVN)
+
+This release introduces a brand new RSpec bundle for TextMate, plus some small bugfixes.
+
+* Packaged RSpec.tmbundle.tgz as part of the distro
+* Fixed [#6593] Add moving progress bar to HtmlFormatter using Javascript
+* Applied [#6265] should_raise should accept an Exception object
+* Fixed [#6616] Can't run Rails specs with RSpec.tmbundle
+* Fixed [#6411] Can't run Rails specs with ruby
+* Added [#6589] New -l --line option. This is useful for IDE/editor runners/extensions.
+* Fixed [#6615] controller.should_render_rjs should support :partial => 'path/to/template'
+
 == Version 0.7.1
 
 Bug fixes and a couple o' new features.

data/Rakefile

@@ -32,7 +32,7 @@ task :default => [:spec, :verify_rcov]
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/**/*_spec.rb', 'vendor/RSpec.tmbundle/Support/spec/*_spec.rb']
   t.spec_opts = ['--diff','--color','--backtrace']
   t.rcov = true
   t.rcov_dir = 'doc/output/coverage'
@@ -224,6 +224,16 @@ task :publish_website => [:verify_user, :website] do
   publisher.upload
 end
 
+desc "Package the RSpec.tmbundle"
+task :package_tmbundle => :pkg do
+  rm_rf 'pkg/RSpec.tmbundle'
+  `svn export vendor/RSpec.tmbundle pkg/RSpec.tmbundle`
+  Dir.chdir 'pkg' do
+    `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec.tmbundle`
+  end
+end
+task :package => :package_tmbundle
+
 desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
 task :publish_packages => [:verify_user, :verify_password, :package] do
   require 'meta_project'
@@ -231,7 +241,8 @@ task :publish_packages => [:verify_user, :verify_password, :package] do
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
-    "pkg/#{PKG_FILE_NAME}.zip"
+    "pkg/#{PKG_FILE_NAME}.zip",
+    "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz"
   ]
 
   Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|

data/examples/custom_formatter.rb

@@ -1,22 +1,11 @@
-require 'spec/runner/formatter/base_text_formatter'
+require 'spec/runner/formatter/progress_bar_formatter'
 
-# Example of a custom formatter. Run me with:
-# bin/spec examples -r examples/custom_formatter.rb -f CustomFormatter
-# bin/spec failing_examples -r examples/custom_formatter.rb -f CustomFormatter
-class CustomFormatter < Spec::Runner::Formatter::BaseTextFormatter
-  def add_context(name, first)
-    @output.print "\n" if first
-  end
-  
-  def spec_failed(name, counter, failure)
-    @output.print 'X'
-  end
-  
-  def spec_passed(name)
-    @output.print '_'
-  end
-  
-  def start_dump
-    @output.print "\n"
+# Example of a formatter with custom bactrace printing. Run me with:
+# ruby bin/spec failing_examples -r examples/custom_formatter.rb -f CustomFormatter
+class CustomFormatter < Spec::Runner::Formatter::ProgressBarFormatter
+  def backtrace_line(line)
+    line.gsub(/([^:]*\.rb):(\d*)/) do
+      "<a href=\"file://#{File.expand_path($1)}\">#{$1}:#{$2}</a> "
+    end
   end
 end

data/examples/mocking_example.rb

@@ -25,4 +25,3 @@ context "a mock" do
     mock.msg(:arg1).should_eql(:val1)
   end
 end
-    

data/lib/spec/mocks/message_expectation.rb

@@ -49,7 +49,12 @@ module Spec
         @order_group.handle_order_constraint self
 
         begin
-          Kernel::raise @exception_to_raise.new unless @exception_to_raise.nil?
+          if @exception_to_raise.class == Class
+            @exception_instance_to_raise = @exception_to_raise.new
+          else 
+            @exception_instance_to_raise = @exception_to_raise
+          end
+          Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
           Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
 
           if !@method_block.nil?

data/lib/spec/runner.rb

@@ -12,3 +12,4 @@ require 'spec/runner/spec_matcher'
 require 'spec/runner/extensions/kernel'
 require 'spec/runner/extensions/object'
 require 'spec/runner/spec_should_raise_handler'
+require 'spec/runner/spec_parser'

data/lib/spec/runner/command_line.rb

@@ -7,9 +7,9 @@ module Spec
       # not a system exit should be called after the specs are run and
       # +warn_if_no_files+ tells whether or not a warning (the help message)
       # should be printed to +stderr+ in case no files are specified.
-      def self.run(argv, stderr, stdout, exit, warn_if_no_files)
+      def self.run(argv, stderr, stdout, exit=false, warn_if_no_files=true)
         old_context_runner = defined?($context_runner) ? $context_runner : nil
-        $context_runner = OptionParser.create_context_runner(argv, stderr, stdout, warn_if_no_files)
+        $context_runner = OptionParser.new.create_context_runner(argv, stderr, stdout, warn_if_no_files)
 
         # If ARGV is a glob, it will actually each over each one of the matching files.
         argv.each do |file_or_dir|

data/lib/spec/runner/extensions/kernel.rb

@@ -7,7 +7,7 @@ module Kernel
 private
   
   def context_runner
-    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, STDERR, STDOUT, false); at_exit { $context_runner.run(false) }; end
+    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.new.create_context_runner(ARGV.dup, STDERR, STDOUT, false); at_exit { $context_runner.run(false) }; end
     $context_runner
   end
 end

data/lib/spec/runner/formatter/base_text_formatter.rb

@@ -66,7 +66,7 @@ module Spec
             @output.puts magenta(failure.header)
             @output.puts magenta(failure.exception.message)
           end
-          @output.puts failure.exception.backtrace.join("\n")
+          @output.puts format_backtrace(failure.exception.backtrace)
           STDOUT.flush
         end
       
@@ -84,8 +84,17 @@ module Spec
           end
         end
 
+        def format_backtrace(backtrace)
+          return "" if backtrace.nil?
+          backtrace.map { |line| backtrace_line(line) }.join("\n")
+        end
+      
       protected
       
+        def backtrace_line(line)
+          line
+        end
+
         def colour(text, colour_code)
           return text unless @colour && @output == Kernel
           "#{colour_code}#{text}\e[0m"
@@ -95,10 +104,6 @@ module Spec
         def green(text); colour(text, "\e[32m"); end
         def magenta(text); colour(text, "\e[35m"); end
         
-        def format_backtrace(backtrace)
-          backtrace.nil? ? "" : backtrace.join("\n")
-        end
-
       end
     end
   end

data/lib/spec/runner/formatter/html_formatter.rb

@@ -5,6 +5,7 @@ module Spec
         def initialize(output, dry_run=false, colour=false)
           super
           @current_count = 0
+          @spec_count = 0
         end
       
         def start(spec_count)
@@ -22,6 +23,7 @@ module Spec
           @output.puts "<div class=\"context\">"
           @output.puts "  <ul>"
           @output.puts "  <li class=\"context_name\">#{name}</li>"
+          STDOUT.flush
         end
 
         def start_dump
@@ -33,13 +35,18 @@ module Spec
         def spec_started(name)
           @current_spec = name
           @current_count += 1
+          STDOUT.flush
         end
 
         def spec_passed(name)
+          move_progress
           @output.puts "    <li class=\"spec passed\"><div class=\"passed_spec_name\">#{escape(@current_spec)}</div></li>"
+          STDOUT.flush
         end
 
         def spec_failed(name, counter, failure)
+          @output.puts "    <script type=\"text/javascript\">makeProgressbarRed();</script>"
+          move_progress
           @output.puts "    <li class=\"spec failed\">"
           @output.puts "      <div class=\"failed_spec_name\">#{escape(@current_spec)}</div>"
           @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
@@ -50,6 +57,11 @@ module Spec
           STDOUT.flush
         end
         
+        def move_progress
+          percent_done = @spec_count == 0 ? 100.0 : (@current_count.to_f / @spec_count.to_f * 1000).to_i / 10.0
+          @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
+        end
+        
         def escape(string)
           string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
         end
@@ -63,6 +75,9 @@ module Spec
           STDOUT.flush
         end
         
+        RED_BACKGROUND   = '#CD0000'
+        GREEN_BACKGROUND = '#659D32'
+        
         HEADER = <<-HEADER
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html 
@@ -74,6 +89,14 @@ module Spec
   <title>RSpec results</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <script type="text/javascript">
+  function moveProgressBar(percentDone) {
+    document.getElementById("progress-bar").style.width = percentDone +"%";
+  }
+  function makeProgressbarRed() {
+    document.getElementById('progress-bar').style.background = '#{RED_BACKGROUND}';
+  }
+  </script>
   <style type="text/css">
   body {
     font-size: 9pt;
@@ -81,6 +104,17 @@ module Spec
     width: 85%;
   }
 
+  #progress-bar-bg {
+    background-color: #C9C9C9; 
+    border-bottom: 1px solid gray; 
+    border-right: 1px solid gray;
+  }
+
+  #progress-bar {
+    background-color: #{GREEN_BACKGROUND};
+    width: 0px;
+  }
+
   div.context {
     padding: 0px;
     background: #fff;
@@ -132,12 +166,21 @@ module Spec
   }
 
   div.backtrace {
-    color: #000; 
+    color: #fff; 
+  }
+
+  div.backtrace a {
+    color: #fff; 
   }
 
   </style>
 </head>
 <body>
+
+<div id="progress-bar-bg">
+  <div id="progress-bar">&nbsp;</div>
+</div>
+
 HEADER
       end
     end

data/lib/spec/runner/option_parser.rb

@@ -4,8 +4,12 @@ require 'optparse'
 module Spec
   module Runner
     class OptionParser
+      def initialize
+        @spec_parser = SpecParser.new
+        @file_factory = File
+      end
 
-      def self.create_context_runner(args, err, out, warn_if_no_files)
+      def create_context_runner(args, err, out, warn_if_no_files)
         options = parse(args, err, out, warn_if_no_files)
 
         formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
@@ -20,7 +24,7 @@ module Spec
         ContextRunner.new(reporter, options.dry_run, options.spec_name)
       end
 
-      def self.parse(args, err, out, warn_if_no_files)
+      def parse(args, err, out, warn_if_no_files)
         options = OpenStruct.new
         options.out = out == STDOUT ? Kernel : out
         options.formatter_type = Formatter::ProgressBarFormatter
@@ -67,10 +71,14 @@ module Spec
             options.colour = true
           end
           
-          opts.on("-s", "--spec SPECIFICATION_NAME", "Execute a single specification") do |spec_name|
+          opts.on("-s", "--spec SPECIFICATION_NAME", "Execute context or specification with matching name") do |spec_name|
             options.spec_name = spec_name
           end
 
+          opts.on("-l", "--line LINE_NUMBER", Integer, "Execute context or specification at given line") do |line_number|
+            options.line_number = line_number.to_i
+          end
+
           opts.on("-f", "--format FORMAT", "Builtin formats: specdoc|s|rdoc|r|html|h", 
                                            "You can also specify a custom formatter class",
                                            "(in which case you should also specify --require)") do |format|
@@ -122,11 +130,38 @@ module Spec
 
         if args.empty? && warn_if_no_files
           err.puts opts
-          exit if err == $stderr
+          exit(1) if err == $stderr
+        end
+
+        if options.line_number
+          set_spec_from_line_number(options, args, err)
         end
 
         options
       end
+      
+      def set_spec_from_line_number(options, args, err)
+        unless options.spec_name
+          if args.length == 1
+            if @file_factory.file?(args[0])
+              source = @file_factory.open(args[0])
+              options.spec_name = @spec_parser.spec_name_for(source, options.line_number)
+            elsif @file_factory.directory?(args[0])
+              err.puts "You must specify one file, not a directory when using the --line option"
+              exit(1) if err == $stderr
+            else
+              err.puts "#{args[0]} does not exist"
+              exit(1) if err == $stderr
+            end
+          else
+            err.puts "Only one file can be specified when using the --line option"
+            exit(1) if err == $stderr
+          end
+        else
+          err.puts "You cannot use both --line and --spec"
+          exit(1) if err == $stderr
+        end
+      end
     end
   end
 end

data/lib/spec/runner/spec_parser.rb

@@ -0,0 +1,40 @@
+module Spec
+  module Runner
+    class SpecParser
+      def spec_name_for(io, line_number)
+        source  = io.read
+        context = context_at_line(source, line_number)
+        spec    = spec_at_line(source, line_number)
+        if context && spec
+          "#{context} #{spec}"
+        elsif context
+          context
+        else
+          nil
+        end
+      end
+
+    protected
+
+      def context_at_line(source, line_number)
+        find_above(source, line_number, /^\s*context\s+['|"](.*)['|"]/)
+      end
+
+      def spec_at_line(source, line_number)
+        find_above(source, line_number, /^\s*specify\s+['|"](.*)['|"]/)
+      end
+
+      def find_above(source, line_number, pattern)
+        lines_above_reversed(source, line_number).each do |line| 
+          return $1 if line =~ pattern
+        end
+        nil
+      end
+
+      def lines_above_reversed(source, line_number)
+        lines = source.split("\n")
+      	lines[0...line_number].reverse
+      end
+    end
+  end
+end

data/lib/spec/version.rb

@@ -3,9 +3,9 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 7
-      TINY   = 1
-      # RANDOM_TOKEN: 0.75692472177863
-      REV    = "$LastChangedRevision: 1080 $".match(/LastChangedRevision: (\d+)/)[1]
+      TINY   = 2
+      # RANDOM_TOKEN: 0.868668446220024
+      REV    = "$LastChangedRevision: 1095 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       FULL_VERSION = "#{STRING} (r#{REV})"

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2006-11-10 00:00:00 -06:00
-summary: RSpec-0.7.1 (r1080) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.7.2
+date: 2006-11-12 00:00:00 +01:00
+summary: RSpec-0.7.2 (r1095) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -78,6 +78,7 @@ files:
 - lib/spec/runner/option_parser.rb
 - lib/spec/runner/reporter.rb
 - lib/spec/runner/spec_matcher.rb
+- lib/spec/runner/spec_parser.rb
 - lib/spec/runner/spec_should_raise_handler.rb
 - lib/spec/runner/specification.rb
 - lib/spec/runner/extensions/kernel.rb