From 240678673d0508bb433f52477941f601d624454b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 23 Jan 2015 10:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0GemFile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 57 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index c659a78ab..5045cb822 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,5 @@
-source 'http://ruby.taobao.org'
+source 'http://rubygems.org'
+#source 'http://ruby.sdutlinux.org/'
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
@@ -15,24 +16,45 @@ gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
+gem 'spreadsheet'
+gem 'ruby-ole'
+gem 'email_verifier'
 
 group :development do
   gem 'better_errors', path: 'lib/better_errors'
   gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
-  if ENV['PRY']
-    gem 'pry'
-    gem 'pry-nav'
-  end
 end
 
-# group :test do
-#  # shoulda的版本做了改动
-#  #gem "shoulda", "~> 3.3.2"
-#  gem "shoulda", "> 3.3.2"
-#  gem "mocha", "~> 0.13.3"
-#  gem 'capybara', '~> 2.0.0'
-#  gem 'nokogiri', '< 1.6.0'
-# end
+group :test do
+  gem "shoulda", "~> 3.5.0"
+  gem "mocha", "~> 1.1.0"
+  gem 'capybara', '~> 2.4.1'
+  gem 'nokogiri', '~> 1.6.3'
+  gem 'factory_girl', '~> 4.4.0'
+  gem 'selenium-webdriver', '~> 2.42.0'
+
+
+  # platforms :mri, :mingw do
+  #   group :rmagick do
+  #     # RMagick 2 supports ruby 1.9
+  #     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+  #     # different requirements for the same gem on different platforms
+  #     gem "rmagick", ">= 2.0.0"
+  #   end
+  #end
+end
+
+group :development, :test do
+	# gem "guard-rails", '~> 0.5.3'
+	gem 'spork-testunit', '~> 0.0.8'
+	# gem 'guard-spork', '~> 1.5.1'
+	# gem 'guard-test', '~> 1.0.0'
+	gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/
+	gem 'pry'
+	gem 'pry-nav'
+  gem 'rspec-rails' , '2.13.1'
+  gem 'guard-rspec','2.5.0'
+end
 
 
 # Gems used only for assets and not required
@@ -53,15 +75,6 @@ group :ldap do
 end
 
 
-# platforms :mri, :mingw do
-#  group :rmagick do
-#    # RMagick 2 supports ruby 1.9
-#    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-#    # different requirements for the same gem on different platforms
-#    gem "rmagick", ">= 2.0.0"
-#  end
-# end
-
 # Optional gem for OpenID authentication
 group :openid do
   gem "ruby-openid", "~> 2.1.4", :require => "openid"