rspec 0.1.2 → 0.1.3

data/CHANGES

@@ -1,5 +1,24 @@
 = RSpec Changelog
 
+== Explanation of this file:
+ 
+* This document should be updated for every commit.
+
+* The first section of each version (until the lines starting with a *)
+  will be used in the release notes' summary as well
+  as in the news posted on rubyforge. Therefore,
+  make sure it is a sentence that makes sense to the reader.
+  It should summarise the release at a high level.
+
+* Make sure the PKG_VERSION constant in Rakefile.rb is
+  consistent with the latest version in this document.
+
+== Version 0.1.3
+
+Improved mocking:
+
+* block based Mock expectations
+
 == Version 0.1.2
 
 This release adds some improvements to the mock API and minor syntax improvements

data/Rakefile.rb

@@ -1,7 +1,9 @@
 $:.unshift('lib')
+require 'rubygems'
 require 'xforge'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'rake/contrib/xforge'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -17,7 +19,7 @@ PKG_NAME = "rspec"
 # (This is subject to change - AH)
 #
 # REMEMBER TO KEEP PKG_VERSION IN SYNC WITH CHANGELOG
-PKG_VERSION = "0.1.2"
+PKG_VERSION = "0.1.3"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -25,7 +27,7 @@ PKG_FILES = FileList[
   'doc/**/*'
 ]
 
-task :default => [:gem]
+task :default => [:test]
 
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -109,7 +111,12 @@ task :todo do
   egrep /#.*(FIXME|TODO|TBD)/
 end
 
-task :release => [:release_files, :publish_doc]
+task :release => [:verify_env_vars, :release_files, :publish_doc, :publish_news]
+
+task :verify_env_vars do
+  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
+  raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
+end
 
 task :publish_doc => [:rdoc] do
   publisher = Rake::RubyForgePublisher.new(PKG_NAME, ENV['RUBYFORGE_USER'])
@@ -123,10 +130,23 @@ task :release_files => [:gem] do
   ]
 
   Rake::XForge::Release.new(PKG_NAME) do |xf|
-    # Never hardcode user name and password in the Rakefile!
-    xf.user_name = ENV['RUBYFORGE_USER']
+    # Never hardcode user name and password in the Rakefile!
+    xf.user_name = ENV['RUBYFORGE_USER']
     xf.password = ENV['RUBYFORGE_PASSWORD']
     xf.files = release_files.to_a
-    xf.release_name = "RSpec #{PKG_VERSION}"
-  end
+    xf.release_name = "RSpec #{PKG_VERSION}"
+  end
+end
+
+desc "Publish news on RubyForge"
+task :publish_news => [:gem] do
+  release_files = FileList[
+    "pkg/#{PKG_FILE_NAME}.gem"
+  ]
+
+  Rake::XForge::NewsPublisher.new(PKG_NAME) do |news|
+    # Never hardcode user name and password in the Rakefile!
+    news.user_name = ENV['RUBYFORGE_USER']
+    news.password = ENV['RUBYFORGE_PASSWORD']
+  end
 end

data/lib/spec/mock.rb

@@ -54,7 +54,11 @@ class MockExpectation
   
   def verify_call(message,args,block)
     unless @method_block.nil?
-      result = @method_block.call(*args)
+      begin
+        result = @method_block.call(*args)
+      rescue Spec::Exceptions::ExpectationNotMetError => detail
+        raise Spec::Exceptions::MockExpectationError, "Call expectation violated with: " + $!
+      end
       @call_count = @call_count + 1
       return result
     end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.10
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2005-08-13
+  version: 0.1.3
+date: 2005-08-14
 summary: Behaviour Specification Framework for Ruby
 require_paths: 
   - lib