Merge branch 'rspec-2.12' of git://github.com/jlee-r7/metasploit-fram…

…ework into jlee-r7-rspec-2.12
rapid7 · Dec 13, 2012 · 3d000ee · 3d000ee
2 parents 79918d1 + 73f5986
commit 3d000ee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -23,7 +23,7 @@ end
 
 group :test do
   # testing framework
-  gem 'rspec'
+  gem 'rspec', '>= 2.12'
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
   gem 'simplecov', '0.5.4', :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,46 +12,46 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.3)
+    builder (3.0.4)
     coderay (1.0.8)
     diff-lcs (1.1.3)
     i18n (0.6.1)
     method_source (0.8.1)
-    multi_json (1.3.6)
+    multi_json (1.0.4)
     pg (0.14.1)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rake (0.9.2.2)
-    redcarpet (2.1.1)
-    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)
+    rake (10.0.2)
+    redcarpet (2.2.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     slop (3.3.3)
-    tzinfo (0.3.33)
-    yard (0.8.2.1)
+    tzinfo (0.3.35)
+    yard (0.8.3)
 
 PLATFORMS
   ruby
@@ -63,6 +63,6 @@ DEPENDENCIES
   pg (>= 0.11)
   rake
   redcarpet
-  rspec
+  rspec (>= 2.12)
   simplecov (= 0.5.4)
   yard