Merge branch 'master' into patch-1

technicalpickles · Nov 7, 2012 · bd118ed · bd118ed
2 parents 0ec1eba + 35dd7ae
commit bd118ed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,20 +6,23 @@ GEM
       rake
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    rdoc (3.6.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+      rdoc
+    json (1.7.5)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
 
 PLATFORMS
   ruby

diff --git a/rspec-spies.gemspec b/rspec-spies.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rspec-spies"
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
@@ -45,22 +45,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rspec-spies>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_runtime_dependency(%q<rspec-mocks>, ["~> 2.11.3"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<appraisal>, [">= 0"])
     else
       s.add_dependency(%q<rspec-spies>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_dependency(%q<rspec-mocks>, ["~> 2.11.3"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<appraisal>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec-spies>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+    s.add_dependency(%q<rspec-mocks>, ["~> 2.11.3"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])