rspec 1.1.3 → 1.1.4

data/CHANGES

@@ -1,6 +1,40 @@
+== Version 1.1.4
+
+Maintenance release.
+
+Note: we've removed the metaclass method from Object. There were some
+generated specs that used it, and they will now break. Just replace the
+metaclass call with (class << self; self; end) and all will be well.
+
+* pending steps print out yellow in stories (patch from Kyle Hargraves)
+* Deprecation warnings for specs that assume auto-inclusion of modules. Closes #326 (patch from Scott Taylor)
+* mock.should_not_receive(:anything) fails fast (once again)
+* Patch from Antti Tarvainen to stop files from being loaded repeatedly when running heckle. Closes #333.
+* Fixed bug in which session object in example was not the same instance used in the controller. Closes #331. 
+* Applied patch from Antti Tarvainen to fix bug where heckle runs rspec runs heckle runs rspec etc. Closes #280.
+* Applied patch from Zach Dennis to merge :steps functionality to :steps_for. Closes #324.
+* Applied patch from Ryan Davis to add eval of block passed to raise_error matcher. Closes #321.
+* alias :context :describe in example_group_methods. Closes #312.
+* Applied patch from Ben Mabey to make the Story runner exit with a non-0 exit code on failing stories. Closes #228.
+* Applied patch from Coda Hale to get the :red hook called in autotest. Closes #279.
+* Applied patch from Patrick Ritchie to support --drb in spec.opts. Closes #274, #293.
+* Moved metaclass method from Object to an internal module which gets included where it is needed.
+* Applied patch from Dayo Esho: and_yield clobbers return value from block. Closes #217.
+* Applied patch from Bob Cotton:  ExampleGroupFactory.default resets previously registered types. Closes #222.
+* Applied patch from Mike Williams to support the lib directory in rails apps with the Textmate Alternate File command. Closes #276.
+* ExampleGroupMethods#xspecify aliases #xit
+* A SharedExampleGroup can be created within another ExampleGroup.
+* Applied patch from Bob Cotton: Nested ExampleGroups do not have a spec_path. Closes #224.
+* Add before_suite and after_suite callbacks to ExampleGroupMethods and Options. Closes #210.
+* The after(:suite) callback lambda is passed a boolean representing whether the suite passed or failed
+* Added NestedTextFormatter. Closes #366.
+* decoupled mock framework from global extensions used by rspec - supports use of flexmock or mocha w/ rails
+* Applied patch from Roman Chernyatchik to allow the user to pass in the rails version into spectask. Closes #325, #370
+
 == Version 1.1.3
 
 Maintenance release.
+Notice to autotest users: you must also upgrade to ZenTest-3.9.0.
 
 * Tightened up exceptions list in autotest/rails_spec. Closes #264.
 * Applied patch from Ryan Davis for ZenTest-3.9.0 compatibility
@@ -18,6 +52,7 @@ Maintenance release.
 == Version 1.1.2
 
 Minor bug fixes/enhancements.
+Notice to autotest users: you must also upgrade to ZenTest-3.8.0.
 
 * RSpec's Autotest subclasses compatible with ZenTest-3.8.0 (thanks to Ryan Davis for making it easier on Autotest subs).
 * Applied patch from idl to add spec/lib to rake stats. Closes #226.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2007 The RSpec Development Team
+Copyright (c) 2005-2008 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -5,9 +5,9 @@ with Executable Scenarios and Executable Examples at the code level.
 
 RSpec ships with several modules:
 
-Spec::Story provides a framework for expressing User Stories
+Spec::Story provides a framework for expressing User Stories and Scenarios
 
-Spec::Example provides a framework for expressing code Examples
+Spec::Example provides a framework for expressing Isolated Examples
 
 Spec::Matchers provides Expression Matchers for use with Spec::Expectations
 and Spec::Mocks.
@@ -22,50 +22,15 @@ behaviour to your existing objects.
 
 == Installation
 
-The simplest approach is to install the gem:
+The simplest approach is to install the gem (as root in some environments):
 
-  gem install -r rspec #mac users must sudo
+  gem install -r rspec
 
 == Building the RSpec gem
-If you prefer to build the gem locally, check out source from svn://rubyforge.org/var/svn/rspec/trunk. Then
-do the following:
 
-  rake gem
-  gem install pkg/rspec-0.x.x.gem (you may have to sudo)
-
-== Running RSpec's specs
-In order to run RSpec's full suite of specs (rake pre_commit) you must install the following gems:
-
-* rake          # Runs the build script
-* rcov          # Verifies that the code is 100% covered by specs
-* webby         # Generates the static HTML website
-* syntax        # Required to highlight ruby code
-* diff-lcs      # Required if you use the --diff switch
-* win32console  # Required by the --colour switch if you're on Windows
-* meta_project  # Required in order to make releases at RubyForge
-* heckle        # Required if you use the --heckle switch
-* hpricot       # Used for parsing HTML from the HTML output formatter in RSpec's own specs
-
-Once those are all installed, you should be able to run the suite with the following steps:
-
-* svn co svn://rubyforge.org/var/svn/rspec/trunk rspec
-* cd rspec
-* rake install_dependencies
-* cd example_rails_app
-* export RSPEC_RAILS_VERSION=1.2.3
-* rake rspec:generate_mysql_config
-* mysql -u root < db/mysql_setup.sql
-* cd ..
-* rake pre_commit
-
-Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core 
-and stdlib - with a few exceptions:
-
-* The spec command line uses diff-lcs when --diff is specified.
-* The spec command line uses heckle when --heckle is specified.
-* The Spec::Rake::SpecTask needs RCov if RCov is enabled in the task.
-
-See http://rspec.rubyforge.org for further documentation.
-
-== Contributing
+If you prefer to build the gem locally:
 
+  git clone git://github.com/dchelimsky/rspec.git
+  cd rspec
+  rake gem
+  gem install pkg/rspec-0.x.x.gem #as root

data/Rakefile

@@ -7,8 +7,6 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'spec/version'
 dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(File.expand_path("#{dir}/pre_commit/lib"))
-require "pre_commit"
 
 # Some of the tasks are in separate files since they are also part of the website documentation
 load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
@@ -27,7 +25,6 @@ PKG_FILES = FileList[
   'failing_examples/**/*',
   'plugins/**/*',
   'stories/**/*',
-  'pre_commit/**/*',
   'rake_tasks/**/*'
 ]
 
@@ -56,8 +53,8 @@ end
 
 desc "Run all specs and store html output in doc/output/report.html"
 Spec::Rake::SpecTask.new('spec_html') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb', '../../RSpec.tmbundle/Support/spec/*_spec.rb']
-  t.spec_opts = ['--format html:../doc/output/report.html','--backtrace']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--format html:../../../../doc/output/report.html', '--format progress','--backtrace']
 end
 
 desc "Run all failing examples"
@@ -124,48 +121,36 @@ task :todo do
   egrep /(FIXME|TODO|TBD)/
 end
 
-task :clobber do
-  core.clobber
-end
-
-task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news]
+task :release => [:verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news]
 
 desc "Verifies that there is no uncommitted code"
 task :verify_committed do
-  IO.popen('svn stat') do |io|
-    io.each_line do |line|
-      raise "\n!!! Do a svn commit first !!!\n\n" if line =~ /^\s*M\s*/
-    end
-  end
+  # IO.popen('git status') do |io|
+  #   io.each_line do |line|
+  #     raise "\n!!! Do a git commit first !!!\n\n" if line =~ /^#\s*modified:/
+  #   end
+  # end
 end
 
 desc "Creates a tag in svn"
 task :tag do
-  from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1]
-  to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}")
-  current = from.gsub(/trunk/, "tags/CURRENT")
-
-  puts "Creating tag in SVN"
-  tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\""
-  `#{tag_cmd}` ; raise "ERROR: #{tag_cmd}" unless $? == 0
-
-  puts "Removing CURRENT"
-  remove_current_cmd = "svn rm #{current} -m \"Remove tags/CURRENT\""
-  `#{remove_current_cmd}` ; raise "ERROR: #{remove_current_cmd}" unless $? == 0
-
-  puts "Re-Creating CURRENT"
-  create_current_cmd = "svn cp #{to} #{current} -m \"Copy #{Spec::VERSION::TAG} to tags/CURRENT\""
-  `#{create_current_cmd}` ; "ERROR: #{create_current_cmd}" unless $? == 0
+  # from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1]
+  # to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}")
+  # current = from.gsub(/trunk/, "tags/CURRENT")
+  # 
+  # puts "Creating tag in SVN"
+  # tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\""
+  # `#{tag_cmd}` ; raise "ERROR: #{tag_cmd}" unless $? == 0
+  # 
+  # puts "Removing CURRENT"
+  # remove_current_cmd = "svn rm #{current} -m \"Remove tags/CURRENT\""
+  # `#{remove_current_cmd}` ; raise "ERROR: #{remove_current_cmd}" unless $? == 0
+  # 
+  # puts "Re-Creating CURRENT"
+  # create_current_cmd = "svn cp #{to} #{current} -m \"Copy #{Spec::VERSION::TAG} to tags/CURRENT\""
+  # `#{create_current_cmd}` ; "ERROR: #{create_current_cmd}" unless $? == 0
 end
 
-desc "Run this task before you commit. You should see 'OK TO COMMIT'"
-task(:pre_commit) {core.pre_commit}
-
-desc "Build the website, but do not publish it"
-task(:website) {core.website}
-
-task(:rdoc_rails) {core.rdoc_rails}
-
 task :verify_user do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
 end
@@ -197,10 +182,11 @@ end
 desc "Package the Rails plugin"
 task :package_rspec_on_rails do
   mkdir 'pkg' rescue nil
-  rm_rf 'pkg/rspec_on_rails' rescue nil
-  `svn export ../rspec_on_rails pkg/rspec_on_rails-#{PKG_VERSION}`
+  rm_rf "pkg/rspec-rails-#{PKG_VERSION}" rescue nil
+  `git clone ../rspec-rails pkg/rspec-rails-#{PKG_VERSION}`
+  rm_rf "pkg/rspec-rails-#{PKG_VERSION}/.git"
   Dir.chdir 'pkg' do
-    `tar cvzf rspec_on_rails-#{PKG_VERSION}.tgz rspec_on_rails-#{PKG_VERSION}`
+    `tar cvzf rspec-rails-#{PKG_VERSION}.tgz rspec-rails-#{PKG_VERSION}`
   end
 end
 task :pkg => :package_rspec_on_rails
@@ -208,20 +194,21 @@ task :pkg => :package_rspec_on_rails
 desc "Package the RSpec.tmbundle"
 task :package_tmbundle do
   mkdir 'pkg' rescue nil
-  rm_rf 'pkg/RSpec.tmbundle' rescue nil
-  `svn export ../RSpec.tmbundle pkg/RSpec.tmbundle`
+  rm_rf "pkg/RSpec-#{PKG_VERSION}.tmbundle" rescue nil
+  `git clone ../../../../RSpec.tmbundle pkg/RSpec-#{PKG_VERSION}.tmbundle`
+  rm_rf "pkg/RSpec-#{PKG_VERSION}.tmbundle/.git"
   Dir.chdir 'pkg' do
-    `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec.tmbundle`
+    `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec-#{PKG_VERSION}.tmbundle`
   end
 end
 task :pkg => :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, :package] do
+task :publish_packages => [:verify_user, :package, :pkg] do
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
-    "pkg/rspec_on_rails-#{PKG_VERSION}.tgz",
+    "pkg/rspec-rails-#{PKG_VERSION}.tgz",
     "pkg/#{PKG_FILE_NAME}.zip",
     "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz"
   ]
@@ -272,8 +259,4 @@ task :publish_news => [:verify_user] do
   else
     puts "** Not publishing news to RubyForge - this is a prerelease"
   end
-end
-
-def core
-  PreCommit::Core.new(self)
-end
+end

data/TODO

@@ -1,2 +1 @@
-=== Before releasing 1.1.0:
 

data/UPGRADE

@@ -1,29 +1,5 @@
-= Upgrading existing code to RSpec-0.9
-
-== General (see below for Spec::Rails specifics)
-
-=== New Syntax for should and should_not
-
-* Use translator (should get 90% of your code)
-* Manually fix "parenthesis" warnings
-
-=== Change before_context_eval to before_eval
-
-before_context_eval is an un-published hook used by
-Spec::Rails to create specialized behaviour contexts.
-Most of you don't need to change this, but for those
-who have exploited it, you'll need to change it to
-before_eval.
-
 == Spec::Rails
 
-=== spec_helper.rb
-
-We've added a new way to configure Spec::Runner to do
-things like use_transactional_fixtures and use_instantiated_fixtures.
-You'll need to update spec/spec_helper.rb accordingly. You can either
-just re-generate it:
-
   script/generate rspec
   
 Or modify spec_helper.rb based on the template, which can be found at:

data/examples/pure/partial_mock_example.rb

@@ -25,4 +25,5 @@ describe "A partial mock" do
     MockableClass.msg_2
     MockableClass.msg_3
   end
+
 end

data/examples/stories/calculator.rb

@@ -27,7 +27,7 @@ Story "addition", %{
   As an accountant
   I want to add numbers
   So that I can count some beans
-}, :steps => steps do
+}, :steps_for => steps do
   Scenario "2 + 3" do
     Given "an addend of 2"
     And "an addend of 3"

data/lib/autotest/rspec.rb

@@ -21,17 +21,15 @@ class Autotest::Rspec < Autotest
 
   def initialize
     super
-
     self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m
-    self.completed_re = /\Z/ # FIX: some sort of summary line at the end?
+    self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
-
+  
   def consolidate_failures(failed)
-    filters = Hash.new { |h,k| h[k] = [] }
-    failed.each do |spec, failed_trace|
-      if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
-        filters[f] << spec
-        break
+    filters = new_hash_of_arrays
+    failed.each do |spec, trace|
+      if trace =~ /\n(\.\/)?(.*\.rb):[\d]+:\Z?/
+        filters[$2] << spec
       end
     end
     return filters
@@ -41,7 +39,7 @@ class Autotest::Rspec < Autotest
     return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
   end
   
-  def add_options_if_present
+  def add_options_if_present # :nodoc:
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end
 

data/lib/spec/example.rb

@@ -1,7 +1,7 @@
 require 'timeout'
-require 'forwardable'
 require 'spec/example/pending'
 require 'spec/example/module_reopening_fix'
+require 'spec/example/module_inclusion_warnings'
 require 'spec/example/example_group_methods'
 require 'spec/example/example_methods'
 require 'spec/example/example_group'

data/lib/spec/example/configuration.rb

@@ -7,14 +7,20 @@ module Spec
       #     config.mock_with :rspec, :mocha, :flexmock, or :rr
       #   end
       #
-      # To use any other mock framework, you'll have to provide
-      # your own adapter. This is simply a module that responds to
-      # setup_mocks_for_rspec, verify_mocks_for_rspec and teardown_mocks_for_rspec.
+      # To use any other mock framework, you'll have to provide your own
+      # adapter. This is simply a module that responds to the following
+      # methods:
+      #
+      #   setup_mocks_for_rspec
+      #   verify_mocks_for_rspec
+      #   teardown_mocks_for_rspec.
+      #
       # These are your hooks into the lifecycle of a given example. RSpec will
-      # call setup_mocks_for_rspec before running anything else in each Example.
-      # After executing the #after methods, RSpec will then call verify_mocks_for_rspec
-      # and teardown_mocks_for_rspec (this is guaranteed to run even if there are
-      # failures in verify_mocks_for_rspec).
+      # call setup_mocks_for_rspec before running anything else in each
+      # Example. After executing the #after methods, RSpec will then call
+      # verify_mocks_for_rspec and teardown_mocks_for_rspec (this is
+      # guaranteed to run even if there are failures in
+      # verify_mocks_for_rspec).
       #
       # Once you've defined this module, you can pass that to mock_with:
       #
@@ -35,12 +41,18 @@ module Spec
         @mock_framework ||= mock_framework_path("rspec")
       end
       
-      # Declares modules to be included in all example groups (<tt>describe</tt> blocks).
-      #
-      #   config.include(My::Bottle, My::Cup)
-      #
-      # If you want to restrict the inclusion to a subset of all the example groups then
-      # specify this in a Hash as the last argument:
+      # :call-seq:
+      #   include(Some::Helpers)
+      #   include(Some::Helpers, More::Helpers)
+      #   include(My::Helpers, :type => :key)
+      #
+      # Declares modules to be included in multiple example groups
+      # (<tt>describe</tt> blocks). With no :type, the modules listed will be
+      # included in all example groups. Use :type to restrict the inclusion to
+      # a subset of example groups. The value assigned to :type should be a
+      # key that maps to a class that is either a subclass of
+      # Spec::Example::ExampleGroup or extends Spec::Example::ExampleGroupMethods
+      # and includes Spec::Example::ExampleMethods
       #
       #   config.include(My::Pony, My::Horse, :type => :farm)
       #
@@ -70,7 +82,7 @@ module Spec
       #
       # This makes it possible to say:
       #
-      #   person.should swim # passes if person.should_swim? returns true
+      #   person.should swim # passes if person.can_swim? returns true
       #
       def predicate_matchers
         @predicate_matchers ||= {}
@@ -85,10 +97,11 @@ module Spec
         )
         example_group.prepend_before(scope, &proc)
       end
+      
       # Appends a global <tt>before</tt> block to all example groups.
       #
-      # If you want to restrict the block to a subset of all the example groups then
-      # specify this in a Hash as the last argument:
+      # If you want to restrict the block to a subset of all the example
+      # groups then specify this in a Hash as the last argument:
       #
       #   config.prepend_before(:all, :type => :farm)
       #
@@ -115,6 +128,7 @@ module Spec
         example_group.prepend_after(scope, &proc)
       end
       alias_method :after, :prepend_after
+      
       # Appends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def append_after(*args, &proc)