From a9804487fdb00cb3a7af0bedac22a078f4fefbe5 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Tue, 20 Mar 2012 15:35:32 -0600
Subject: [PATCH] Revert "Add isolated Gemfile for core so that other
 components of Spree are not included."

This reverts commit 105db909983bdd486b6fedbc8dbc372274e559af.

This commit should not be here just yet...
---
 Gemfile                      | 47 ++++++++++++++++++++++++++++++++-
 common_spree_dependencies.rb | 51 ------------------------------------
 2 files changed, 46 insertions(+), 52 deletions(-)
 delete mode 100644 common_spree_dependencies.rb

diff --git a/Gemfile b/Gemfile
index c74b2a60ce2..22624ae011a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,48 @@
-eval(File.read(File.dirname(__FILE__) + '/common_spree_dependencies.rb'))
+source 'http://rubygems.org'
+
+gem 'json'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', "~> 3.2"
+  gem 'coffee-rails', "~> 3.2"
+end
+
+group :test do
+  gem 'guard'
+  gem 'guard-rspec', '~> 0.5.0'
+  gem 'rspec-rails', '~> 2.8.0'
+  gem 'factory_girl_rails', '~> 1.7.0'
+  gem 'email_spec', '~> 1.2.1'
+
+  platform :ruby_18 do
+    gem 'rcov'
+  end
+
+  platform :ruby_19 do
+    gem 'simplecov'
+  end
+
+  gem 'ffaker'
+  gem 'shoulda-matchers', '~> 1.0.0'
+  gem 'capybara'
+  gem 'selenium-webdriver', '2.16.0'
+  gem 'database_cleaner', '0.7.1'
+  gem 'launchy'
+end
+
+# platform :ruby_18 do
+#   gem "ruby-debug"
+# end
+
+# platform :ruby_19 do
+#   gem "ruby-debug19"
+# end
 
 gemspec
+
+
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
deleted file mode 100644
index 98df198cf36..00000000000
--- a/common_spree_dependencies.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# By placing all of Spree's shared dependencies in this file and then loading 
-# it for each component's Gemfile, we can be sure that we're only testing just
-# the one component of Spree.
-source 'http://rubygems.org'
-
-gem 'json'
-gem 'sqlite3'
-gem 'mysql2'
-gem 'pg'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails', "~> 3.2"
-  gem 'coffee-rails', "~> 3.2"
-end
-
-group :test do
-  gem 'guard'
-  gem 'guard-rspec', '~> 0.5.0'
-  gem 'rspec-rails', '~> 2.8.0'
-  gem 'factory_girl_rails', '~> 1.7.0'
-  gem 'email_spec', '~> 1.2.1'
-
-  platform :ruby_18 do
-    gem 'rcov'
-  end
-
-  platform :ruby_19 do
-    gem 'simplecov'
-  end
-
-  gem 'ffaker'
-  gem 'shoulda-matchers', '~> 1.0.0'
-  gem 'capybara'
-  gem 'selenium-webdriver', '2.16.0'
-  gem 'database_cleaner', '0.7.1'
-  gem 'launchy'
-end
-
-# platform :ruby_18 do
-#   gem "ruby-debug"
-# end
-
-# platform :ruby_19 do
-#   gem "ruby-debug19"
-# end
-
-gemspec
-
-