rspec 0.6.0 → 0.6.1

data/CHANGES

@@ -1,9 +1,24 @@
 = RSpec Changelog
 
+== Version 0.6.1
+This is the "fix the most annoying bugs release" of RSpec. There are 9 bugfixes this time.
+Things that may break backwards compatibility:
+1) Spec::Rake::SpecTask no longer has the options attribute. Use ruby_opts, spec_opts and rcov_opts instead.
+
+* Fixed [#4891] RCOV task failing on windows
+* Fixed [#4896] Shouldn't modify user's $LOAD_PATH (Tip from Gavin Sinclair)
+* Fixed [#5369] ruby -w: warnings in RSpec 0.5.16 (Tip from Suraj Kurapati)
+* Applied [#5141] SpecMatcher doesn't escape strings before matching (Patch from Nikolai Weibull).
+* Fixed [#5224] Move 'require diff-lcs' from test_helper.rb to diff_test.rb (Tip from Chris Roos)
+* Applied [#5449] Rake stats for specs (Patch from Nick Sieger)
+* Applied [#5468, #5058] Fix spec runner to correctly run controller specs (Patch from Daniel Siemssen)
+* Applied fixes to rails_spec_runner to improve its ability to run several times. (Patch from Daniel Siemssen)
+* Changed RCov::VerifyTask to fail if the coverage is above the threshold. This is to ensure it gets bumped when coverage improves.
+
 == Version 0.6.0
 This release makes an official commitment to underscore_syntax (with no more support for dot.syntax)
 
-* Fixed bug (5292) that caused mock argument matching to fail on classes that overrided ==
+* Fixed bug (5292) that caused mock argument matching to fail
 * Converted ALL tests to use underscore syntax
 * Fixed all remaining problems with underscores revealed by converting all the tests to underscores
 * Enhanced sugar to support combinations of methods (i.e. once.and_return) 
@@ -17,6 +32,7 @@ This release improves Rails support and test2spec translation.
 
 * Fixed underscore problems that occurred when RSpec was used in Rails
 * Simplified the Rails support by packaging it as a plugin instead of a generator gem.
+* Fixed [#5063] 'rspec_on_rails' require line in spec_helper.rb
 * Added pre_commit rake task to reduce risk of regressions. Useful for rspec developers and patchers.
 * Added failure_message to RSpec Rake task
 * test2spec now defines converted helper methods outside of the setup block (bug #5057).

data/Rakefile

@@ -68,6 +68,14 @@ Spec::Rake::SpecTask.new('test2spec_test' => :test2spec) do |t|
   t.failure_message = "**** Translated specs failed. See doc/output/tools/rspec_specs.html ****"
 end
 
+desc 'Verify that no warnings occur'
+task :verify_warnings do
+  `ruby -w #{File.dirname(__FILE__) + '/bin/spec'} --help 2> warnings.txt`
+  warnings = File.open('warnings.txt').read
+  File.rm 'warnings.txt'
+  raise "There were warnings:\n#{warnings}" if warnings =~ /warning/n
+end
+
 desc 'Generate HTML documentation for website'
 task :webgen => :test2spec do
   Dir.chdir 'doc' do
@@ -165,11 +173,11 @@ task :tag do
 end
 
 desc "Run this task before you commit. You should see 'OK TO COMMIT'"
-task :pre_commit => [:website, :examples, :failing_examples_with_html, :rails_pre_commit, :commit_ok]
+task :pre_commit => [:verify_warnings, :website, :examples, :failing_examples_with_html, :rails_pre_commit, :commit_ok]
 
 task :rails_pre_commit do
   Dir.chdir 'vendor/rspec_on_rails' do    
-    `rake pre_commit`
+    `rake pre_commit --verbose`
     raise "RSpec on Rails pre_commit failed\ncd to vendor/rspec_on_rails and run rake pre_commit for more details" if $? != 0
   end
 end

data/examples/airport_spec.rb

@@ -30,5 +30,4 @@ context "Airport at home" do
   teardown do
     @airport = nil
   end
-
 end

data/lib/spec.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.push File.dirname(__FILE__) + '/../lib'
-
 require 'spec/version'
 require 'spec/api'
 require 'spec/runner'

data/lib/spec/api/mocks/message_expectation.rb

@@ -100,7 +100,7 @@ module Spec
         if @args_to_yield.length != block.arity
           Kernel::raise Spec::Api::MockExpectationError, "Wrong arity of passed block. Expected #{@args_to_yield.size}"
         end
-        block.call *@args_to_yield
+        block.call(*@args_to_yield)
       end
 
       def invoke_return_block(args, block)

data/lib/spec/api/sugar.rb

@@ -18,7 +18,8 @@ module Spec
             object = self
             calls = sym.to_s.split("_")
             while calls.length > 1
-              break if (object.respond_to?calls.join("_"))
+              remainder = calls.join("_")
+              break if (object.respond_to?(remainder))
               call = calls.shift
               object = object.__send__(call)
               break if call == "be"

data/lib/spec/rake/rcov_verify.rb

@@ -1,6 +1,7 @@
 module RCov
   # A task that can verify that the RCov coverage doesn't
-  # drop below a certain threshold.
+  # drop below a certain threshold. It should be run after
+  # running Spec::Rake::SpecTask.
   class VerifyTask < Rake::TaskLib
     # Name of the task. Defaults to :rcov_verify
     attr_accessor :name
@@ -14,8 +15,8 @@ module RCov
     attr_accessor :verbose
     
     # The threshold value (in percent) for coverage. If the 
-    # actual coverage is below this value, the task will raise an 
-    # exception
+    # actual coverage is not equal to this value, the task will raise an 
+    # exception. 
     attr_accessor :threshold
     
     def initialize(name=:rcov_verify)
@@ -39,6 +40,7 @@ module RCov
         end
         puts "Coverage: #{total_coverage}% (threshold: #{threshold}%)" if verbose
         raise "Coverage must be at least #{threshold}% but was #{total_coverage}%" if total_coverage < threshold
+        raise "Coverage has increased above the threshold of #{threshold}% to #{total_coverage}%. You should update your threshold value." if total_coverage > threshold
       end
     end
   end

data/lib/spec/rake/spectask.rb

@@ -6,142 +6,165 @@ require 'rake'
 require 'rake/tasklib'
 
 module Spec
-module Rake
-
-  # A task that runs a set of RSpec contexts.
-  #
-  # Example:
-  #  
-  #   Rake::SpecTask.new do |t|
-  #     t.libs << "spec"
-  #     t.spec_files = FileList['spec/**/*_spec.rb']
-  #   end
-  #
-  class SpecTask < ::Rake::TaskLib
-
-    # Name of spec task. (default is :spec)
-    attr_accessor :name
-
-    # List of directories to added to $LOAD_PATH before running the
-    # specs. (default is 'lib')
-    attr_accessor :libs
-
-    # Options poassed to spec
-    attr_accessor :spec_opts
-
-    # Test options passed to the spec suite.  An explicit
-    # SPECOPTS=opts on the command line will override this. (default
-    # is NONE)
-    attr_accessor :options
-
-    # Request that the specs be run with the warning flag set.
-    # E.g. warning=true implies "ruby -w" used to run the specs.
-    attr_accessor :warning
-
-    # Glob pattern to match spec files. (default is 'spec/spec*.rb')
-    attr_accessor :pattern
-
-    # Whether or not to use rcov (default is false)
-    # See http://eigenclass.org/hiki.rb?rcov
-    attr_accessor :rcov
-
-    # Where output is written. Default is STDOUT.
-    attr_accessor :out
-
-    # Array of commandline options to pass to ruby (or rcov) when running specs.
-    attr_accessor :ruby_opts
-
-    # Whether or not to fail Rake when an error occurs (typically when specs fail).
-    # Default is true
-    attr_accessor :fail_on_error
-
-    # A message to print to stdout when there are failures. Useful if +out+ is used.
-    attr_accessor :failure_message
-
-    # Explicitly define the list of spec files to be included in a
-    # spec.  +list+ is expected to be an array of file names (a
-    # FileList is acceptable).  If both +pattern+ and +spec_files+ are
-    # used, then the list of spec files is the union of the two.
-    def spec_files=(list)
-      @spec_files = list
-    end
+  module Rake
+
+    # A Rake task that runs a set of RSpec contexts.
+    #
+    # Example:
+    #  
+    #   Rake::SpecTask.new do |t|
+    #     t.warning = true
+    #   end
+    #
+    # This will create a task that can be run with:
+    #
+    #   rake spec
+    #
+    class SpecTask < ::Rake::TaskLib
+
+      # Name of spec task. (default is :spec)
+      attr_accessor :name
+
+      # Array of directories to be added to $LOAD_PATH before running the
+      # specs. Defaults to ['lib']
+      attr_accessor :libs
+
+      # If true, requests that the specs be run with the warning flag set.
+      # E.g. warning=true implies "ruby -w" used to run the specs. Defaults to false.
+      attr_accessor :warning
+
+      # Glob pattern to match spec files. (default is 'spec/spec*.rb')
+      attr_accessor :pattern
+
+      # Array of commandline options to pass to RSpec. Defaults to [].
+      attr_accessor :spec_opts
+
+      # Where RSpec's output is written. Defaults to STDOUT.
+      attr_accessor :out
+
+      # Whether or not to use RCov (default is false)
+      # See http://eigenclass.org/hiki.rb?rcov
+      attr_accessor :rcov
+      
+      # Array of commandline options to pass to RCov. Defaults to ['--exclude', 'lib\/spec,bin\/spec'].
+      # Ignored if rcov=false
+      attr_accessor :rcov_opts
+
+      # Directory where the RCov report is written. Defaults to "coverage"
+      # Ignored if rcov=false
+      attr_accessor :rcov_dir
+
+      # Array of commandline options to pass to ruby. Defaults to [].
+      attr_accessor :ruby_opts
+
+      # Whether or not to fail Rake when an error occurs (typically when specs fail).
+      # Defaults to true.
+      attr_accessor :fail_on_error
+
+      # A message to print to stdout when there are failures.
+      attr_accessor :failure_message
+
+      # Explicitly define the list of spec files to be included in a
+      # spec.  +list+ is expected to be an array of file names (a
+      # FileList is acceptable).  If both +pattern+ and +spec_files+ are
+      # used, then the list of spec files is the union of the two.
+      def spec_files=(list)
+        @spec_files = list
+      end
 
-    # Create a specing task.
-    def initialize(name=:spec)
-      @name = name
-      @libs = ["lib"]
-      @pattern = nil
-      @options = nil
-      @spec_files = nil
-      @spec_opts = []
-      @warning = false
-      @rcov = false
-      @ruby_opts = []
-      @out = nil
-      @fail_on_error = true
-      yield self if block_given?
-      @pattern = 'spec/**/*_spec.rb' if @pattern.nil? && @spec_files.nil?
-      define
-    end
+      # Create a specing task.
+      def initialize(name=:spec)
+        @name = name
+        @libs = ["lib"]
+        @pattern = nil
+        @spec_files = nil
+        @spec_opts = []
+        @warning = false
+        @ruby_opts = []
+        @out = nil
+        @fail_on_error = true
+        @rcov = false
+        @rcov_opts = ['--exclude', 'lib\/spec,bin\/spec']
+        @rcov_dir = "coverage"
+
+        yield self if block_given?
+        @pattern = 'spec/**/*_spec.rb' if @pattern.nil? && @spec_files.nil?
+        define
+      end
+
+      def define
+        #raise "No spec files found." if file_list.empty?
+        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
 
-    # Create the tasks defined by this task lib.
-    def define
-      lib_path = @libs.join(File::PATH_SEPARATOR)
-      desc "Run specs" + (@name==:spec ? "" : " for #{@name}")
-      task @name do
-        specs = file_list
-        raise "No spec files found." if specs.empty?
-        
-        spec = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
-        file_prefix = @rcov ? " -- " : ""
-        interpreter = @rcov ? "rcov" : "ruby"
-        redirect = @out.nil? ? "" : " > #{@out}"
-
-        @ruby_opts.unshift( "-I#{lib_path}" )
-        @ruby_opts.unshift( "-w" ) if @warning
-        @ruby_opts.unshift( '--exclude "lib\/spec\/.*"' ) if @rcov
-        begin
-          run interpreter, @ruby_opts.join(" ") +
-            " \"#{spec}\" " +
-            " #{@spec_opts.join(' ')} " +
-            file_prefix +
-            specs.collect { |fn| "\"#{fn}\"" }.join(' ') +
-            redirect
-          
-          puts @failure_message if @failure_message && ($? != 0)
-        rescue => e
-          puts @failure_message if @failure_message
-          raise e if @fail_on_error
+        lib_path = @libs.join(File::PATH_SEPARATOR)
+        actual_name = Hash === name ? name.keys.first : name
+        unless ::Rake.application.last_comment
+          desc "Run RSpec for #{actual_name}" + (@rcov ? " using RCov" : "")
         end
+        task @name do
+          RakeFileUtils.verbose(@verbose) do
+            ruby_opts = @ruby_opts.clone
+            ruby_opts.push( "-I#{lib_path}" )
+            ruby_opts.push( "-S rcov" ) if @rcov
+            ruby_opts.push( "-w" ) if @warning
+
+            redirect = @out.nil? ? "" : " > #{@out}"
+            # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- [spec_opts] examples
+            # or
+            # ruby [ruby_opts] -Ilib bin/spec [spec_opts] examples
+            begin
+              ruby(
+                ruby_opts.join(" ") + " " + 
+                rcov_option_list +
+                (@rcov ? %[ -o "#{@rcov_dir}" ] : "") + 
+                spec_script + " " +
+                (@rcov ? "-- " : "") + 
+                spec_option_list + " " +
+                file_list.collect { |fn| %["#{fn}"] }.join(' ') + " " + 
+                redirect
+              )
+            rescue => e
+               puts @failure_message if @failure_message
+               raise e if @fail_on_error
+            end
+          end
+        end
+
+        if @rcov
+          desc "Remove rcov products for #{actual_name}"
+          task paste("clobber_", actual_name) do
+            rm_r @rcov_dir rescue nil
+          end
+
+          clobber_task = paste("clobber_", actual_name)
+          task :clobber => [clobber_task]
+
+          task actual_name => clobber_task
+        end
+        self
       end
-      self
-    end
 
-    def file_list # :nodoc:
-      if ENV['SPEC']
-        FileList[ ENV['SPEC'] ]
-      else
-        result = []
-        result += @spec_files.to_a if @spec_files
-        result += FileList[ @pattern ].to_a if @pattern
-        FileList[result]
+      def rcov_option_list # :nodoc:
+        return "" unless @rcov
+        ENV['RCOVOPTS'] || @rcov_opts.join(" ") || ""
       end
-    end
 
-    def run(interpreter, *args, &block)
-      if Hash === args.last
-        options = args.pop
-      else
-        options = {}
+      def spec_option_list # :nodoc:
+        ENV['RSPECOPTS'] || @spec_opts.join(" ") || ""
       end
-      if args.length > 1 then
-        sh(*([interpreter] + args + [options]), &block)
-      else
-        sh("#{interpreter} #{args}", options, &block)
+
+      def file_list # :nodoc:
+        if ENV['SPEC']
+          FileList[ ENV['SPEC'] ]
+        else
+          result = []
+          result += @spec_files.to_a if @spec_files
+          result += FileList[ @pattern ].to_a if @pattern
+          FileList[result]
+        end
       end
-    end
 
+    end
   end
 end
-end
 

data/lib/spec/runner/context.rb

@@ -9,7 +9,7 @@ module Spec
           @context_eval_module.extend ContextEval::ModuleMethods
           @context_eval_module.include ContextEval::InstanceMethods
           before_context_eval
-          @context_eval_module.class_eval &context_block
+          @context_eval_module.class_eval(&context_block)
         end
 
         def before_context_eval
@@ -24,15 +24,15 @@ module Spec
         end
 
         def setup(&block)
-          @context_eval_module.setup &block
+          @context_eval_module.setup(&block)
         end
 
         def teardown(&block)
-          @context_eval_module.teardown &block
+          @context_eval_module.teardown(&block)
         end
 
         def specify(spec_name, &block)
-          @context_eval_module.specify spec_name, &block
+          @context_eval_module.specify(spec_name, &block)
         end
 
         def run(reporter, dry_run=false)

data/lib/spec/runner/spec_matcher.rb

@@ -5,17 +5,10 @@ class SpecMatcher
     @name_to_match = context_and_or_spec_name
   end
   
-  def matches? spec
-    if matches_context?
-      if matches_spec?(spec) or context_only?
-        return true
-      end
-    end
-    if matches_spec? spec
-      if spec_only? spec
-        return true
-      end
-    end
+  def matches?(spec_name)
+    return true if matches_context? && (matches_spec?(spec_name) || context_only?)
+    return true if matches_spec?(spec_name) && spec_only?(spec_name)
+    return false
   end
   
   private
@@ -29,11 +22,11 @@ class SpecMatcher
   end
   
   def matches_context?
-    @name_to_match =~ /^#{@context_name}\b/
+    @name_to_match =~ /^#{Regexp.escape(@context_name)}\b/
   end
   
-  def matches_spec? spec
-    @name_to_match =~ /\b#{spec}$/
+  def matches_spec?(spec_name)
+    @name_to_match =~ /\b#{Regexp.escape(spec_name)}$/
   end
   
 end

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 6
-      TINY   = 0
+      TINY   = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/test/spec/api/helper/arbitrary_predicate_test.rb

@@ -49,7 +49,7 @@ module Spec
         # should_be_funny(args)
   
         def test_should_be_funny_with_args_passes_args_properly
-           mock = HandCodedMock.new(true)
+          mock = HandCodedMock.new(true)
           assert_nothing_raised do
             mock.should_be_hungry(1, 2, 3)
           end
@@ -99,7 +99,7 @@ module Spec
         # should_be_funny(args)
   
         def test_should_not_be_funny_with_args_passes_args_properly
-           mock = HandCodedMock.new(false)
+          mock = HandCodedMock.new(false)
           assert_nothing_raised do
             mock.should_not_be_hungry(1, 2, 3)
           end

data/test/spec/api/helper/containment_test.rb

@@ -44,6 +44,18 @@ module Spec
           end
         end
 
+        def FIXME_test_should_has_key_shouldnt_raise_when_hash_inclusion_is_present
+          assert_nothing_raised do
+            {"a"=>1}.should_has_key "a"
+          end
+        end
+
+        def FIXME_test_should_have_key_shouldnt_raise_when_hash_inclusion_is_present
+          assert_nothing_raised do
+            {"a"=>1}.should_have_key "a"
+          end
+        end
+
         def test_should_include_should_raise_when_hash_inclusion_is_missing
           assert_raise(ExpectationNotMetError) do
             {"a"=>1}.should_include "b"

data/test/spec/runner/spec_matcher_test.rb

@@ -7,6 +7,11 @@ module Spec
         matcher = SpecMatcher.new("a context with a spec", "a context")
         assert matcher.matches?("with a spec")
       end
+
+      def test_should_match_with_regexp_reserved_characters
+        matcher = SpecMatcher.new("a context with #[] a spec", "a context")
+        assert matcher.matches?("with #[] a spec")
+      end
       
       def test_should_not_match_wrong_context
         matcher = SpecMatcher.new("another context with a spec", "a context")

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2006-08-09 00:00:00 -05:00
-summary: RSpec-0.6.0 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.6.1
+date: 2006-08-23 00:00:00 +02:00
+summary: RSpec-0.6.1 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -25,7 +25,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
-post_install_message: 
 authors: 
 - Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
 files: