From 723cdf1d4fccaadbbd4c38d72b9837460eb9b8a3 Mon Sep 17 00:00:00 2001
From: David Chelimsky <dchelimsky@gmail.com>
Date: Tue, 16 Mar 2010 07:49:02 -0500
Subject: [PATCH] bangless default

---
 lib/rspec/mocks/methods.rb | 4 ++--
 rspec-mocks.gemspec        | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/rspec/mocks/methods.rb b/lib/rspec/mocks/methods.rb
index 679e50554..a791a6975 100644
--- a/lib/rspec/mocks/methods.rb
+++ b/lib/rspec/mocks/methods.rb
@@ -9,7 +9,7 @@ def should_not_receive(sym, &block)
         __mock_proxy.add_negative_message_expectation(caller(1)[0], sym.to_sym, &block)
       end
       
-      def stub!(sym_or_hash, opts={}, &block)
+      def stub(sym_or_hash, opts={}, &block)
         if Hash === sym_or_hash
           sym_or_hash.each {|method, value| stub!(method).and_return value }
         else
@@ -17,7 +17,7 @@ def stub!(sym_or_hash, opts={}, &block)
         end
       end
       
-      alias_method :stub, :stub!
+      alias_method :stub!, :stub
 
       def stub_chain(*methods)
         if methods.length > 1
diff --git a/rspec-mocks.gemspec b/rspec-mocks.gemspec
index 25aaee80d..43b2e82c9 100644
--- a/rspec-mocks.gemspec
+++ b/rspec-mocks.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-16}
   s.description = %q{Rspec's 'test double' framework, with support for stubbing and mocking}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "cucumber.yml",
      "features/mocks/block_local_expectations.feature",
      "features/mocks/mix_stubs_and_mocks.feature",
+     "features/mocks/warn_when_expectation_is_set_on_nil.feature",
      "features/stubs/stub_implementation.feature",
      "features/support/env.rb",
      "lib/rspec/mocks.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/rspec/mocks/extensions/object.rb",
      "lib/rspec/mocks/framework.rb",
      "lib/rspec/mocks/message_expectation.rb",
+     "lib/rspec/mocks/method_double.rb",
      "lib/rspec/mocks/methods.rb",
      "lib/rspec/mocks/mock.rb",
      "lib/rspec/mocks/order_group.rb",
@@ -108,7 +110,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{rspec-mocks-2.0.0.beta.4}
   s.test_files = [
-    "spec/rspec/mocks/and_yield_spec.rb",
+    "spec/spec_helper.rb",
+     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
      "spec/rspec/mocks/argument_expectation_spec.rb",
      "spec/rspec/mocks/at_least_spec.rb",
@@ -147,7 +150,6 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/stub_spec.rb",
      "spec/rspec/mocks/stubbed_message_expectations_spec.rb",
      "spec/rspec/mocks/twice_counts_spec.rb",
-     "spec/spec_helper.rb",
      "spec/support/macros.rb"
   ]