From 44723c289c42320b1bd8f108dde44110e2560a73 Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Fri, 27 Aug 2010 16:07:41 +1200
Subject: [PATCH] Use the gems man, the gems!

---
 Gemfile      | 36 ++++++++++++++++--------------------
 Gemfile.lock | 22 ++++++----------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd49e54cbf..60e3f216c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0.rc2'
+gem 'rails',                    '3.0.0.rc2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3-ruby',             :require => 'sqlite3'
 
 # Use unicorn as the web server
 # gem 'unicorn'
@@ -33,30 +33,26 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 
 # Specify the Engines to use:
 
-gem 'refinerycms', :path => '.'
+gem 'refinerycms',              :path => '.'
 
 # Specify additional Refinery CMS Engines here:
-gem 'refinerycms-inquiries',    '~> 0.9.8',
-                                :git => 'git://github.com/resolve/refinerycms-inquiries.git',
-                                :require => 'inquiries'
+gem 'refinerycms-inquiries',    '~> 0.9.8', :require => 'inquiries'
 # gem 'refinerycms-news',       '~> 0.9.8', :require => 'news'
 # gem 'refinerycms-portfolio',  '~> 0.9.7', :require => 'portfolio'
 
 # Add i18n support
-
-gem 'refinerycms-i18n', :git => 'git://github.com/resolve/refinerycms-i18n.git',
-                        :require => 'refinery/i18n'
+gem 'refinerycms-i18n',         '~> 0.9.8', :require => 'refinery/i18n'
 gem 'routing-filter'
 
 # Add acts_as_tree support
-gem 'acts_as_tree',     :git => 'git://github.com/parndt/acts_as_tree.git'
+gem 'acts_as_tree',             :git => 'git://github.com/parndt/acts_as_tree.git'
 
 # Specify a version of RMagick that works in your environment:
-gem 'rmagick',          '~> 2.12.0', :require => false
+gem 'rmagick',                  '~> 2.12.0', :require => false
 
 # FIXME: These requirements are listed here temporarily pending a release
-gem 'dragonfly',        :git => 'git://github.com/parndt/dragonfly.git',
-                        :branch => 'refactor_job'
+gem 'dragonfly',                :git => 'git://github.com/parndt/dragonfly.git',
+                                :branch => 'refactor_job'
 
 # END REFINERY CMS ============================================================
 
@@ -64,11 +60,11 @@ gem 'dragonfly',        :git => 'git://github.com/parndt/dragonfly.git',
 
 group :test do
   # RSpec
-  gem 'rspec',              (RSPEC_VERSION = '~> 2.0.0.beta')
-  gem 'rspec-core',         RSPEC_VERSION, :require => 'rspec/core'
-  gem 'rspec-expectations', RSPEC_VERSION, :require => 'rspec/expectations'
-  gem 'rspec-mocks',        RSPEC_VERSION, :require => 'rspec/mocks'
-  gem 'rspec-rails',        RSPEC_VERSION
+  gem 'rspec',                  (RSPEC_VERSION = '~> 2.0.0.beta')
+  gem 'rspec-core',             RSPEC_VERSION, :require => 'rspec/core'
+  gem 'rspec-expectations',     RSPEC_VERSION, :require => 'rspec/expectations'
+  gem 'rspec-mocks',            RSPEC_VERSION, :require => 'rspec/mocks'
+  gem 'rspec-rails',            RSPEC_VERSION
   # Cucumber
   gem 'capybara'
   gem 'database_cleaner'
@@ -78,9 +74,9 @@ group :test do
   gem 'launchy'
   gem 'gherkin'
   # TODO: Change back to gem when patch is merged in
-  gem 'rack-test', :git => 'git://github.com/alan/rack-test.git'
+  gem 'rack-test',              :git => 'git://github.com/alan/rack-test.git'
   # FIXME: JSON constant constants warnings
-  gem 'json_pure',          '~> 1.4.6', :require => 'json/pure'
+  gem 'json_pure',              '~> 1.4.6', :require => 'json/pure'
   # Factory Girl
   gem 'factory_girl'
   gem 'ruby-prof'
diff --git a/Gemfile.lock b/Gemfile.lock
index 19122d0010..426977b2c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,20 +20,6 @@ GIT
     dragonfly (0.6.2)
       rack
 
-GIT
-  remote: git://github.com/resolve/refinerycms-i18n.git
-  revision: a8560c9
-  branch: master
-  specs:
-    refinerycms-i18n (0.9.8)
-
-GIT
-  remote: git://github.com/resolve/refinerycms-inquiries.git
-  revision: 85f1dfd
-  specs:
-    refinerycms-inquiries (0.9.8)
-      filters_spam (~> 0.1)
-
 PATH
   remote: .
   specs:
@@ -153,6 +139,10 @@ GEM
       rake (>= 0.8.3)
       thor (~> 0.14.0)
     rake (0.8.7)
+    refinerycms-i18n (0.9.8)
+    refinerycms-inquiries (0.9.8)
+      filters_spam (~> 0.1)
+      refinerycms (~> 0.9.8.beta)
     rmagick (2.12.2)
     routing-filter (0.1.6)
       actionpack
@@ -203,8 +193,8 @@ DEPENDENCIES
   rack-test!
   rails (= 3.0.0.rc2)
   refinerycms!
-  refinerycms-i18n!
-  refinerycms-inquiries (~> 0.9.8)!
+  refinerycms-i18n (~> 0.9.8)
+  refinerycms-inquiries (~> 0.9.8)
   rmagick (~> 2.12.0)
   routing-filter
   rspec (~> 2.0.0.beta)