mocha 0.9.12 → 0.10.0

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.minitest.1.3.0

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "1.3.0"
+end

data/Gemfile.minitest.1.4.0

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "1.4.0"
+end

data/Gemfile.minitest.1.4.1

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "1.4.1"
+end

data/Gemfile.minitest.1.4.2

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "1.4.2"
+end

data/Gemfile.minitest.2.0.0

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "2.0.0"
+end

data/Gemfile.minitest.2.0.1

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "2.0.1"
+end

data/Gemfile.minitest.2.3.0

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest", "2.3.0"
+end

data/Gemfile.minitest.latest

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "minitest"
+end

data/Gemfile.test-unit.2.0.0

@@ -0,0 +1,8 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "test-unit", "2.0.0"
+  gem "hoe", "2.8.0" # later versions of hoe depend on Rubygems >= 1.4 which in turn depends on Ruby >= 1.8.7
+end

data/Gemfile.test-unit.2.0.1

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "test-unit", "2.0.1"
+end

data/Gemfile.test-unit.2.0.3

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "test-unit", "2.0.3"
+end

data/Gemfile.test-unit.latest

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem "test-unit"
+end

data/README.rdoc

@@ -8,6 +8,10 @@ Mocha provides a unified, simple and readable syntax for both traditional mockin
 
 Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com/] by me ({James}[http://jamesmead.org/]) and my (then) colleagues {Ben}[http://www.techbelly.com/], {Chris}[http://chrisroos.co.uk/] and {Paul}[http://po-ru.com/].
 
+== Build Status
+
+https://secure.travis-ci.org/floehopper/mocha.png
+
 == Download and Installation
 
 Install the gem with the following command...

data/RELEASE.rdoc

@@ -1,4 +1,23 @@
-= 0.9.12 ()
+= 0.10.0 ()
+* Add Expectation#throws to allow a stubbed method to use Kernel#throw.
+* Updates for versions of Test::Unit up to and including v2.3.3 (including patch by Jens Fahnenbruck).
+* Updates for versions of MiniTest up to and including v2.5.1.
+* Since the singleton method added by Mocha masks the underlying instance method, there's no need to move it out the way and then back again. This fixes Github issue #20, because the original method is left unchanged - https://github.com/floehopper/mocha/issues/20 (thanks to Nick Lewis).
+* Handle stubbing of a singleton method, leaving the original method unchanged after the test.
+* When stubbing an instance method that was originally defined as a singleton method, the original method should still exist after the test.
+* Fixed mis-print in Mocha::ObjectMethods#unstub documentation (patch by Gleb Pomykalov).
+* Improved test coverage around stubbing of methods defined in different ways - this makes use of the newly extracted introspection gem (although this means some tests are now failing in Ruby v1.9.2).
+* Added configuration for Travis continuous integration.
+* Make the gemspec the canonical reference and stop generating it from the Rakefile.
+* Use the built-in Bundler rake tasks for packaging the gem.
+* Use the "release" rake task provided by Bundler instead of using the Rake::XForge::Release functionality.
+* Extract Object#__metaclass__ into a new metaclass gem.
+* Run rake tasks without `bundle exec`.
+* Avoid deprecation warning for rdoc rake task.
+* Remove the `use_test_unit_gem` MOCHA_OPTION which hasn't worked since we switched to bundler - we can now run the tests specifying a different Gemfile instead.
+* Use multiple Gemfiles seems to run Travis CI builds against multiple version of test-unit & minitest.
+
+= 0.9.12 (8bb523e8467626c23b271eb529c33fb118e368fe)
 * Make Mocha's tests pass under Ruby 1.9.2 i.e. using MiniTest. One of the main issues was that we were not parsing stacktraces on MiniTest errors comprehensively enough.
 * Avoid 'circular require considered harmful' warning when running Mocha's tests in Ruby 1.9.2
 * Make performance tests work on Ruby 1.9.2 i.e. using MiniTest.
@@ -104,7 +123,7 @@
   * when a method on a non-existent method is stubbed
   * when a method on a non-mock object is stubbed
   * when a method is stubbed unnecessarily (i.e. the stubbed method is not called during the test)
-  
+
 * Improved error messages
   * User-friendly list of unsatisfied expectations, satisfied expectations and state machines.
   * Improved readability of cardinality description.
@@ -220,7 +239,7 @@
   Time.now # => Mon Jan 01 00:00:00 UTC 2007
   Time.stubs(:now).returns(Time.parse('Thu Feb 01 00:00:00 UTC 2007'))
   Time.now # => Thu Feb 01 00:00:00 UTC 2007
-  
+
 - Deprecate passing an instance of Proc to Expectation#returns.
 - Explicitly include all Rakefile dependencies in project.
 - Fixed old Stubba example.

data/Rakefile

@@ -1,10 +1,9 @@
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/testtask'
+require "bundler"
+Bundler::GemHelper.install_tasks
+require "bundler/setup"
 
-module Mocha
-  VERSION = "0.9.12"
-end
+require 'rdoc/task'
+require 'rake/testtask'
 
 desc "Run all tests"
 task 'default' => ['test', 'test:performance']
@@ -15,7 +14,9 @@ task 'test' => ['test:units', 'test:acceptance']
 namespace 'test' do
 
   unit_tests = FileList['test/unit/**/*_test.rb']
-  acceptance_tests = FileList['test/acceptance/*_test.rb']
+  all_acceptance_tests = FileList['test/acceptance/*_test.rb']
+  ruby186_incompatible_acceptance_tests = FileList['test/acceptance/stub_class_method_defined_on_*_test.rb'] + FileList['test/acceptance/stub_instance_method_defined_on_*_test.rb']
+  ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
 
   desc "Run unit tests"
   Rake::TestTask.new('units') do |t|
@@ -28,11 +29,15 @@ namespace 'test' do
   desc "Run acceptance tests"
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    t.test_files = acceptance_tests
+    if defined?(RUBY_VERSION) && (RUBY_VERSION >= "1.8.7")
+      t.test_files = all_acceptance_tests
+    else
+      t.test_files = ruby186_compatible_acceptance_tests
+    end
     t.verbose = true
     t.warning = true
   end
-  
+
   # require 'rcov/rcovtask'
   # Rcov::RcovTask.new('coverage') do |t|
   #   t.libs << 'test'
@@ -104,11 +109,8 @@ Rake::RDocTask.new('rdoc') do |task|
   )
 end
 
-desc "Generate all documentation"
-task 'generate_docs' => ['clobber_rdoc', 'rdoc', 'examples', 'agiledox.txt']
-
 desc "Upload RDoc to RubyForge"
-task 'publish_docs' do
+task 'publish_docs' => ['clobber_rdoc', 'rdoc', 'examples', 'agiledox.txt'] do
   require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("jamesmead@rubyforge.org", "/var/www/gforge-projects/mocha", "doc").upload
 end
@@ -150,81 +152,6 @@ task 'examples' do
   end
 end
 
-Gem.manage_gems if Gem::RubyGemsVersion < '1.2.0'
-
-def build_specification(version = Mocha::VERSION)
-  Gem::Specification.new do |s|
-    s.name   = "mocha"
-    s.summary = "Mocking and stubbing library"
-    s.version = version
-    s.platform = Gem::Platform::RUBY
-    s.author = 'James Mead'
-    s.description = <<-EOF
-      Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
-    EOF
-    s.email = 'mocha-developer@googlegroups.com'
-    s.homepage = 'http://mocha.rubyforge.org'
-    s.rubyforge_project = 'mocha'
-
-    s.has_rdoc = true
-    s.extra_rdoc_files = ['README.rdoc', 'COPYING.rdoc']
-    s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README.rdoc' << '--line-numbers'
-
-    if Gem::RubyGemsVersion < '1.2.0'
-      s.add_dependency('rake')
-    else
-      s.add_development_dependency('rake')
-    end
-
-    s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*', '.gemtest'].exclude('TODO').to_a
-  end
-end
-
-specification = build_specification
-
-Rake::GemPackageTask.new(specification) do |package|
-   package.need_zip = true
-   package.need_tar = true
-end
-
-desc 'Generate updated gemspec with unique version, which will cause gem to be auto-built on github.'
-task :gemspec do
-  File.open('mocha.gemspec', 'w') do |output|
-    output << build_specification(Mocha::VERSION + '.' + Time.now.strftime('%Y%m%d%H%M%S')).to_ruby
-  end
-end
-
-task 'verify_user' do
-  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
-end
-
-task 'verify_password' do
-  raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
-end
-
-desc "Publish package files on RubyForge."
-task 'publish_packages' => ['verify_user', 'verify_password', 'clobber_package', 'package'] do
-  require 'meta_project'
-  require 'rake/contrib/xforge'
-  release_files = FileList[
-    "pkg/mocha-#{Mocha::VERSION}.gem",
-    "pkg/mocha-#{Mocha::VERSION}.tgz",
-    "pkg/mocha-#{Mocha::VERSION}.zip"
-  ]
-
-  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new('mocha')) do |release|
-    release.user_name = ENV['RUBYFORGE_USER']
-    release.password = ENV['RUBYFORGE_PASSWORD']
-    release.files = release_files.to_a
-    release.release_name = "Mocha #{Mocha::VERSION}"
-    release.release_changes = ''
-    release.release_notes = ''
-  end
-end
-
-desc "Do a full release."
-task 'release' => ['default', 'generate_docs', 'publish_packages', 'publish_docs', 'gemspec'] do
-  puts
-  puts "*** Remember to commit newly generated gemspec after release ***"
-  puts
+task 'release' => 'default' do
+  Rake::Task['publish_docs'].invoke
 end

data/init.rb

@@ -0,0 +1,3 @@
+# Mocha should no longer be loaded at plugin load time
+# You should explicitly load Mocha *after* Test::Unit or MiniTest have been loaded
+# e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb

data/lib/mocha.rb

@@ -1,4 +1,4 @@
-require 'mocha/options'
+require 'mocha/version'
 require 'mocha_standalone'
 require 'mocha/configuration'
 require 'mocha/integration'

data/lib/mocha/central.rb

@@ -9,16 +9,16 @@ module Mocha
     end
    
     def stub(method)
-      unless stubba_methods.include?(method)
+      unless stubba_methods.detect { |m| m.matches?(method) }
         method.stub 
         stubba_methods.push(method)
       end
     end
     
     def unstub(method)
-      if stubba_methods.include?(method)
-        method.unstub
-        stubba_methods.delete(method)
+      if existing = stubba_methods.detect { |m| m.matches?(method) }
+        existing.unstub
+        stubba_methods.delete(existing)
       end
     end
     

data/lib/mocha/class_method.rb

@@ -1,31 +1,31 @@
-require 'mocha/metaclass'
+require 'metaclass'
 
 module Mocha
 
   class ClassMethod
-  
+
     attr_reader :stubbee, :method
-   
+
     def initialize(stubbee, method)
       @stubbee = stubbee
       @method = RUBY_VERSION < '1.9' ? method.to_s : method.to_sym
     end
-  
+
     def stub
       hide_original_method
       define_new_method
     end
-  
+
     def unstub
       remove_new_method
       restore_original_method
       stubbee.reset_mocha
     end
-    
+
     def mock
       stubbee.mocha
     end
-  
+
     def hide_original_method
       if method_exists?(method)
         begin
@@ -35,7 +35,7 @@ module Mocha
         end
       end
     end
-  
+
     def define_new_method
       stubbee.__metaclass__.class_eval(%{
         def #{method}(*args, &block)
@@ -43,11 +43,11 @@ module Mocha
         end
       }, __FILE__, __LINE__)
     end
-  
+
     def remove_new_method
       stubbee.__metaclass__.send(:remove_method, method)
     end
-  
+
     def restore_original_method
       if method_exists?(hidden_method)
         begin
@@ -58,7 +58,7 @@ module Mocha
         end
       end
     end
-  
+
     def hidden_method
       if RUBY_VERSION < '1.9'
         method_name = method.to_s.gsub(/\W/) { |s| "_substituted_character_#{s[0]}_" }
@@ -67,25 +67,25 @@ module Mocha
       end
       hidden_method = "__stubba__#{method_name}__stubba__"
       RUBY_VERSION < '1.9' ? hidden_method.to_s : hidden_method.to_sym
-    end  
-  
-    def eql?(other)
+    end
+
+    def matches?(other)
       return false unless (other.class == self.class)
       (stubbee.object_id == other.stubbee.object_id) and (method == other.method)
     end
-  
+
     alias_method :==, :eql?
-  
+
     def to_s
       "#{stubbee}.#{method}"
     end
-    
+
     def method_exists?(method)
       symbol = method.to_sym
-      metaclass = stubbee.__metaclass__
-      metaclass.public_method_defined?(symbol) || metaclass.protected_method_defined?(symbol) || metaclass.private_method_defined?(symbol)
+      __metaclass__ = stubbee.__metaclass__
+      __metaclass__.public_method_defined?(symbol) || __metaclass__.protected_method_defined?(symbol) || __metaclass__.private_method_defined?(symbol)
     end
 
   end
-  
+
 end

data/lib/mocha/expectation.rb

@@ -3,6 +3,7 @@ require 'mocha/parameters_matcher'
 require 'mocha/expectation_error'
 require 'mocha/return_values'
 require 'mocha/exception_raiser'
+require 'mocha/thrower'
 require 'mocha/yield_parameters'
 require 'mocha/is_a'
 require 'mocha/in_state_ordering_constraint'
@@ -287,20 +288,20 @@ module Mocha # :nodoc:
     # :call-seq: raises(exception = RuntimeError, message = nil) -> expectation
     #
     # Modifies expectation so that when the expected method is called, it raises the specified +exception+ with the specified +message+ i.e. calls Kernel#raise(exception, message).
-    #   object = mock()
-    #   object.expects(:expected_method).raises(Exception, 'message')
+    #   object = stub()
+    #   object.stubs(:expected_method).raises(Exception, 'message')
     #   object.expected_method # => raises exception of class Exception and with message 'message'
     # Note that if you have a custom exception class with extra constructor parameters, you can pass in an instance of the exception (just as you can for Kernel#raise).
-    #   object = mock()
-    #   object.expects(:expected_method).raises(MyException.new('message', 1, 2, 3))
+    #   object = stub()
+    #   object.stubs(:expected_method).raises(MyException.new('message', 1, 2, 3))
     #   object.expected_method # => raises the specified instance of MyException
     # May be called multiple times on the same expectation. Also see Expectation#then.
-    #   object = mock()
+    #   object = stub()
     #   object.stubs(:expected_method).raises(Exception1).then.raises(Exception2)
     #   object.expected_method # => raises exception of class Exception1
     #   object.expected_method # => raises exception of class Exception2
     # May be called in conjunction with Expectation#returns on the same expectation.
-    #   object = mock()
+    #   object = stub()
     #   object.stubs(:expected_method).raises(Exception).then.returns(2, 3)
     #   object.expected_method # => raises exception of class Exception1
     #   object.expected_method # => 2
@@ -310,6 +311,32 @@ module Mocha # :nodoc:
       self
     end
 
+    # :call-seq: throws(tag, object = nil) -> expectation
+    #
+    # Modifies expectation so that when the expected method is called, it throws the specified +tag+ with the specific return value +object+ i.e. calls Kernel#throw(tag, object).
+    #   object = stub()
+    #   object.stubs(:expected_method).throws(:done)
+    #   object.expected_method # => throws tag :done
+    # Note you can also pass in an optional return value +object+ (just as you can for Kernel#throw).
+    #   object = stub()
+    #   object.stubs(:expected_method).throws(:done, 'result')
+    #   object.expected_method # => throws tag :done and causes catch block to return 'result'
+    # May be called multiple times on the same expectation. Also see Expectation#then.
+    #   object = stub()
+    #   object.stubs(:expected_method).throws(:done).then.throws(:continue)
+    #   object.expected_method # => throws :done
+    #   object.expected_method # => throws :continue
+    # May be called in conjunction with Expectation#returns on the same expectation.
+    #   object = stub()
+    #   object.stubs(:expected_method).throws(:done).then.returns(2, 3)
+    #   object.expected_method # => throws :done
+    #   object.expected_method # => 2
+    #   object.expected_method # => 3
+    def throws(tag, object = nil)
+      @return_values += ReturnValues.new(Thrower.new(tag, object))
+      self
+    end
+
     # :call-seq: then() -> expectation
     #            then(state_machine.is(state)) -> expectation
     #