rspec 0.5.2 → 0.5.3

data/CHANGES

@@ -1,5 +1,14 @@
 = RSpec Changelog
 
+== Version 0.5.3
+The "hurry up, CoR is in two days" release.
+
+* Don't run rcov by default [aslak_hellesoy]
+* Make separate task for running tests with RCov [aslak_hellesoy]
+* Added Rake task to fail build if coverage drops below a certain threshold [aslak_hellesoy]
+* Even more failure output cleanup (simplification) [dchelimsky]
+* Added duck_type constraint for mocks [dchelimsky]
+
 == Version 0.5.2
 This release has minor improvements to the commandline and fixes some gem warnings
 
@@ -18,8 +27,7 @@ This release is the first release of RSpec with a new website. It will look bett
 * Various improvements to failure reporting [dchelimsky]
 
 == Version 0.5.0
-
-This release introduces a new API and obsoletes previous versions.
+This release introduces a new API and obsolesces previous versions.
 
 * Moved source code to separate subfolders
 * Added new DSL runner based on instance_exec

data/Rakefile

@@ -1,15 +1,14 @@
 $:.unshift('lib')
 require 'rubygems'
-require 'meta_project'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/xforge'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'lib/spec/version'
 require 'lib/spec/rake/spectask'
-require 'test/rake/rcov_testtask'
+require 'test/rcov/rcov_testtask'
+require 'test/rcov/rcov_verify'
 
 PKG_NAME = "rspec"
 # Versioning scheme: MAJOR.MINOR.PATCH
@@ -36,13 +35,16 @@ Spec::Rake::SpecTask.new do |t|
 end
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end
 
-# Generates the HTML documentation
-desc 'Generate documentation'
+RCov::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+desc 'Generate HTML documentation'
 task :doc do
   sh %{pushd doc; webgen; popd }
 end
@@ -52,19 +54,11 @@ rd = Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc/output/rdoc'
   rdoc.title    = "RSpec"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include('CHANGES')
+  rdoc.rdoc_files.include('README', 'CHANGES')
   rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
-  rdoc.rdoc_files.exclude('doc/**/*_attrs.rdoc')
 end
 
-# ====================================================================
-# Create a task that will package the Rake software into distributable
-# tar, zip and gem files.
-
 spec = Gem::Specification.new do |s|
-
-  #### Basic information.
-
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.summary = "Behaviour Specification Framework for Ruby"
@@ -78,8 +72,6 @@ spec = Gem::Specification.new do |s|
   s.files = PKG_FILES.to_a
   s.require_path = 'lib'
 
-  #### Documentation and testing.
-
   s.has_rdoc = true
   s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
   s.rdoc_options <<
@@ -87,18 +79,12 @@ spec = Gem::Specification.new do |s|
     '--main' << 'README' <<
     '--line-numbers'
   
-  s.test_files = Dir.glob('test/tc_*.rb')
-
-  #### Make executable
+  s.test_files = Dir.glob('test/*_test.rb')
   s.require_path = 'lib'
   s.autorequire = 'spec'
-
   s.bindir = "bin"
   s.executables = ["spec", "test2rspec"]
   s.default_executable = "spec"
-
-  #### Author and project details.
-
   s.author = "Steven Baker" 
   s.email = "srbaker@pobox.com"
   s.homepage = "http://rspec.rubyforge.org"
@@ -110,8 +96,6 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
-# Support Tasks ------------------------------------------------------
-
 def egrep(pattern)
   Dir['**/*.rb'].each do |fn|
     count = 0
@@ -139,9 +123,14 @@ end
 task :release => [:clobber, :verify_user, :verify_password, :test, :upload_releases, :publish_website, :publish_news]
 
 desc "Build the website with rdoc and rcov, but do not publish it"
-task :website => [:clobber, :test, :doc, :rdoc, :rcov]
+task :website => [:clobber, :copy_rcov_report, :doc, :rdoc]
+
+RCov::VerifyTask.new do |t|
+  t.threshold = 99.1 # Don't make it lower unless you have a damn good reason.
+  t.index_html = 'coverage/index.html'
+end
 
-task :rcov => [:test] do
+task :copy_rcov_report => [:test_with_rcov, :rcov_verify] do
   rm_rf 'doc/output/coverage'
   mkdir 'doc/output' unless File.exists? 'doc/output'
   mv 'coverage', 'doc/output'
@@ -166,9 +155,10 @@ task :publish_website => [:verify_user, :website] do
   publisher.upload
 end
 
-desc "Release gem to RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
+desc "Release gem+tgz+zip to RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
 task :upload_releases => [:verify_user, :verify_password, :package] do
-
+  require 'meta_project'
+  require 'rake/contrib/xforge'
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
@@ -186,6 +176,8 @@ end
 
 desc "Publish news on RubyForge"
 task :publish_news => [:verify_user, :verify_password] do
+  require 'meta_project'
+  require 'rake/contrib/xforge'
   Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
     # Never hardcode user name and password in the Rakefile!
     news.user_name = ENV['RUBYFORGE_USER']

data/doc/src/default.css

@@ -41,7 +41,6 @@ acronym {
 #header h1 strong {
 	color:#c00;
 }
-
 #header h2 {
 	margin:140px 0 0 0;
 	font-size:1em;
@@ -65,7 +64,6 @@ acronym {
 	list-style:none;
 	display:inline;
 }
-
 #navigation li a {
 	padding:5px 5px 2px 5px;
 	margin:0 1px 0 1px;
@@ -74,7 +72,6 @@ acronym {
 	font-weight:bold;
 	border-bottom:1px solid #c00;
 }
-
 #navigation li a:hover {
 	color:#C00;
 	border-bottom:1px solid #ddd;
@@ -86,8 +83,7 @@ acronym {
 #content p {
 	padding:2px 20px;
 	text-align:justify;
-	text-indent:0.5cm;
-	line-height:1.8em;
+	line-height:1.4em;
 }
 #content h1 {
 	display:block;
@@ -102,7 +98,7 @@ acronym {
 }
 #content h2 {
 	display:block;
-	margin:20px 0 0 30px;
+	margin:20px 0 0 0px;
 	padding:0;
 	font-family:"Trebuchet MS",arial,sans-serif;
 	font-size:1.1em;
@@ -140,12 +136,17 @@ acronym {
 	padding:0;
 	text-indent:0;
 }
+#content code {
+    font-family:"courier new";
+    color:#444;
+    font-weight:bold;
+}
 #content pre {
-	margin:10px 60px;
-	padding:5px;
+	padding:10px;
+	margin:0 18px 0 18px;
 	color:#444;
-	border:1px solid #eee;
-	background-color:#fafafa;
+	border:1px solid #444;
+	background-color:#ddd;
 }
 #content ul {
 	margin-left:70px;

data/doc/src/documentation/api.page

@@ -5,200 +5,147 @@ ordering: 5
 ---
 h2. Core API
 
-When RSpec executes specifications, it defines a method *should* on every object in the system.
-This *should* method is your entry to the magic of RSpec.
+When RSpec executes specifications, it defines a method <code>should</code> on every object in the system. This <code>should</code> method is your entry to the magic of RSpec.
 
-Almost all expectation forms have a corresponding negated form. It is listed
-when it is supported and, in general, is met when ever the non negated form would be
-violated.
+Almost all expectation forms have a corresponding negated form. It is listed when it is supported and, in general, is met when ever the non-negated form would be violated.
 
 h3. General
 
 h4. Arbitrary Block
 
 <pre>
-<code>
 target.should.satisfy {|arg| ...}
 target.should.not.satisfy {|arg| ...}
-</code>
 </pre>
 
-The supplied block is evaluated, passing <code>target</code> as the sole argument. If the
-block evaluates to <code>false</code> in the case of <code>should.satisfy</code>, or <code>true</code> in the case of
-<code>should.not.satisfy</code>, <code>ExpectationNotMetError</code> is raised.
+The supplied block is evaluated, passing <code>target</code> as the sole argument. If the block evaluates to <code>false</code> in the case of <code>should.satisfy</code>, or <code>true</code> in the case of <code>should.not.satisfy</code>, <code>ExpectationNotMetError</code> is raised.
 
 <pre>
-<code>
 target.should.satisfy {|arg| arg > 0}
-</code>
 </pre>
 
 h4. Equality
 
 <pre>
-<code>
 target.should.equal <value>
 target.should.not.equal <value>
-</code>
 </pre>
 
-The target object is compared to <code>value</code> using ==. If the result is <code>false</code> (or
-<code>true</code> for the negated form) <code>ExpectationNotMetError</code> is raised.
+The target object is compared to <code>value</code> using ==. If the result is <code>false</code> (or <code>true</code> for the negated form) <code>ExpectationNotMetError</code> is raised.
 
 h4. Floating Point Comparison
 
 <pre>
-<code>
 target.should.be.close <value>, <tolerance>
 target.should.not.be.close <value>, <tolerance>
-</code>
 </pre>
 
-The target object is compared to <code>value</code>. In the former case, if they differ
-by more that <code>tolerance</code> <code>ExpectationNotMetError</code> is raised. In the latter case,
-it is raised if they differ by less than <code>tolerance</code>.
+The target object is compared to <code>value</code>. In the former case, if they differ by more that <code>tolerance</code> <code>ExpectationNotMetError</code> is raised. In the latter case, it is raised if they differ by less than <code>tolerance</code>.
 
 <pre>
-<code>
 target.should.be.close 27.35, 0.05
-</code>
 </pre>
 
 h4. Identity
 
 <pre>
-<code>
 target.should.be <value>
 target.should.not.be <value>
-</code>
 </pre>
 
-The target object is compared to <code>value</code> using <code>equal?</code>. If the result is <code>false</code>
-(or <code>true</code> for the negated form) <code>ExpectationNotMetError</code> is raised.
+The target object is compared to <code>value</code> using <code>equal?</code>. If the result is <code>false</code> (or <code>true</code> for the negated form) <code>ExpectationNotMetError</code> is raised.
 
 h4. Arbitrary Predicate
 
 
 <pre>
-<code>
 target.should.predicate [optional args]
 target.should.be.predicate [optional args]
 target.should.not.predicate [optional args]
 target.should.not.be.predicate [optional args]
-</code>
 </pre>
 
-The message <code>predicate?</code> is sent to <code>target</code> with any supplied arguments. If the
-result is <code>false</code> (or <code>true</code> for the negated form) <code>ExpectationNotMetError</code> is
-raised.
+The message <code>predicate?</code> is sent to <code>target</code> with any supplied arguments. If the result is <code>false</code> (or <code>true</code> for the negated form) <code>ExpectationNotMetError</code> is raised.
 
 <pre>
-<code>
 container.should.include 'a' => container.include? 'a'
 container.should.be.empty => container.empty?
-</code>
 </pre>
 
 h4. Pattern Matching
 
 <pre>
-<code>
 target.should.match <regex>
 target.should.not.match <regex>
-</code>
 </pre>
 
-The <code>target</code> is matched against <code>regex</code>. An <code>ExpectationNotMetError</code> is raised if
-the match fails or succeeds, respectively.
+The <code>target</code> is matched against <code>regex</code>. An <code>ExpectationNotMetError</code> is raised if the match fails or succeeds, respectively.
 
 h3. Class/Type
 
 h4. Direct Instance
 
 <pre>
-<code>
 target.should.be.an.instance.of <class>
 target.should.not.be.an.instance.of <class>
-</code>
 </pre>
 
-An <code>ExpectationNotMetError</code> is raised if <code>target</code> is not or is, respectively, an
-direct instance of <code>class</code>. As expected this correlates to <code>target.instance_of?
- class</code>.
+An <code>ExpectationNotMetError</code> is raised if <code>target</code> is not or is, respectively, an direct instance of <code>class</code>. As expected this correlates to <code>target.instance_of?  class</code>.
 
 h4. Ancestor Class
 
 <pre>
-<code>
 target.should.be.a.kind.of <class>
 target.should.not.be.a.kind.of <class>
-</code>
 </pre>
 
-As above, but uses <code>target.kind_of? class</code>: checking whether <code>class</code> is the
-direct class of <code>target</code>, or an ancestor of <code>target</code>'s class.
+As above, but uses <code>target.kind_of? class</code>: checking whether <code>class</code> is the direct class of <code>target</code>, or an ancestor of <code>target</code>'s class.
 
 h4. Type
 
 <pre>
-<code>
 target.should.respond.to <symbol>
 target.should.not.respond.to <symbol>
-</code>
 </pre>
 
-Uses <code>target.respond_to? symbol?</code> to check whether <code>symbol</code> is the name of a
-message that <code>target</code> understands.
+Uses <code>target.respond_to? symbol?</code> to check whether <code>symbol</code> is the name of a message that <code>target</code> understands.
 
 h3. Procs
 
 h4. Raising
 
 <pre>
-<code>
 proc.should.raise <exception>
 proc.should.not.raise <exception>
-</code>
 </pre>
 
-Checks that <code>proc</code> does or doesn't cause the named exception to be raised.
-Typically the <code>proc</code> is created in place using <code>lambda</code>. For example:
+Checks that <code>proc</code> does or doesn't cause the named exception to be raised. Typically the <code>proc</code> is created in place using <code>lambda</code>. For example:
 
 <pre>
-<code>
 lambda { 3 / 0 }.should.raise ZeroDivisionError
-</code>
 </pre>
 
 There is a more general form as well.
 
 <pre>
-<code>
 proc.should.raise
 proc.should.not.raise
-</code>
 </pre>
 
-These forms don't worry about what exception is raised (or not). All they are
-concern with is that some except was raised, or that no exception was raised.
+These forms don't worry about what exception is raised (or not). All they are concern with is that some except was raised, or that no exception was raised.
 
 h4. Throwing
 
 <pre>
-<code>
 proc.should.throw <symbol>
 proc.should.not.throw <symbol>
-</code>
 </pre>
 
-Similar to the above, but checks that <code>symbol</code> is thrown from within <code>proc</code>, or
-that it is not. The latter is actually one of two cases: some other symbol is
+Similar to the above, but checks that <code>symbol</code> is thrown from within <code>proc</code>, or that it is not. The latter is actually one of two cases: some other symbol is
 thrown, or no symbol is thrown.
 
 <pre>
-<code>
 proc.should.not.throw
-</code>
 </pre>
 
 This form is more specific.  It checks that no symbol is thrown from within <code>proc</code>.
@@ -208,25 +155,15 @@ h3. Collections
 h4. Containment
 
 <pre>
-<code>
 target.should.include <object>
-</code>
 </pre>
 
-This is simply a specific case of the arbitrary predicate form. It uses
-<code>target.include? object</code> and raises an <code>ExpectationNotMetError</code> if that returns
-false. The remaining collection forms are a little more involved. They rely on
-two things: <code>target</code> responds to the message <code>things</code> by returning an object
-that responds to either <code>length</code> or <code>size</code>, which return a number that is a
-measure of size. Currently <code>length</code> is used if is appropriate, otherwise <code>size</code> is
-attempted.
+This is simply a specific case of the arbitrary predicate form. It uses <code>target.include? object</code> and raises an <code>ExpectationNotMetError</code> if that returns false. The remaining collection forms are a little more involved. They rely on two things: <code>target</code> responds to the message <code>things</code> by returning an object that responds to either <code>length</code> or <code>size</code>, which return a number that is a measure of size. Currently <code>length</code> is used if is appropriate, otherwise <code>size</code> is attempted.
 
 h4. Exact Size
 
 <pre>
-<code>
 target.should.have(<number>).<things>
-</code>
 </pre>
 
 The <code>things</code> of <code>target</code> has a length/size of exactly <code>number</code>. 
@@ -234,9 +171,7 @@ The <code>things</code> of <code>target</code> has a length/size of exactly <cod
 h4. Lower Bound
 
 <pre>
-<code>
 target.should.have.at.least(<number>).<things>
-</code>
 </pre>
 
 The <code>things</code> of <code>target</code> has a length/size of no less than <code>number</code>.
@@ -244,9 +179,7 @@ The <code>things</code> of <code>target</code> has a length/size of no less than
 h4. Upper Bound
 
 <pre>
-<code>
 target.should.have.at.most(<number>).<things>
-</code>
 </pre>
 
 The <code>things</code> of <code>target</code> has a length/size of no more than <code>number</code>.