From 31863738c1f6c9835a5ee82ad0c4696e81b694f1 Mon Sep 17 00:00:00 2001
From: randuin <randuin@gmail.com>
Date: Fri, 2 Sep 2011 18:19:15 -0700
Subject: [PATCH] Added vim .swp files to the gitignore and also added pry to
 the development group for the Gemfile

---
 .gitignore   |  1 +
 Gemfile      |  4 ++++
 Gemfile.lock | 13 +++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/.gitignore b/.gitignore
index 601013ca9..20c73819c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ vendor/cache/*.gem
 .DS_Store
 coverage
 *~
+*.swp
diff --git a/Gemfile b/Gemfile
index 3db971454..6818d1ba1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,3 +27,7 @@ gem "nokogiri"
 gem "meta_search", :git => "git://github.com/ernie/meta_search.git"
 gem "silent-postgres"
 gem "whenever", :require => false
+
+group :development do
+  gem 'pry'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 867dd2dfc..4f01274a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,6 +49,7 @@ GEM
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
     builder (3.0.0)
+    coderay (0.9.8)
     daemons (1.1.4)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
@@ -72,6 +73,8 @@ GEM
       nokogiri (~> 1.4)
       webrobots (>= 0.0.9, ~> 0.0)
     memcache-client (1.8.5)
+    method_source (0.6.0)
+      ruby_parser (>= 2.0.5)
     mime-types (1.16)
     mocha (0.9.12)
     multi_json (1.0.3)
@@ -80,6 +83,11 @@ GEM
     nokogiri (1.5.0)
     pg (0.11.0)
     polyglot (0.3.2)
+    pry (0.9.3)
+      coderay (>= 0.9.8)
+      method_source (>= 0.6.0)
+      ruby_parser (>= 2.0.5)
+      slop (~> 1.9.0)
     rack (1.3.2)
     rack-cache (1.0.3)
       rack (>= 0.4)
@@ -106,6 +114,9 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
+    ruby_parser (2.2.0)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.6)
     shoulda (2.11.3)
     silent-postgres (0.1.1)
     simple_form (1.4.2)
@@ -114,6 +125,7 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
+    slop (1.9.1)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -156,6 +168,7 @@ DEPENDENCIES
   mocha
   nokogiri
   pg
+  pry
   rails (= 3.1.0.rc8)
   shoulda
   silent-postgres