Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c8c4f3e..b9b9b40 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,21 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.1.1'
-gem 'devise'
+gem 'devise', '=1.5.2'
+gem 'rest-client'
 gem 'aws-s3'
 gem 'validates_existence'
 gem "validate_url"
+gem "pettanr_creative_commons_v30_licenses"
+gem 'pettanr_pettan_commons_v01_licenses'
+gem 'pettanr_pettan_protected_v01_licenses'
+gem 'pettanr_pettan_public_v01_licenses'
+gem 'pettanr_public_domain_v01_licenses'
+gem 'pettanr_unknown_v01_licenses'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
-
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -35,14 +40,18 @@ gem 'jquery-rails'
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
 group :production do
-#  gem 'pg'
-#  gem 'therubyracer-heroku'
-#  gem 'rmagick', '=2.12.0', :require => 'RMagick'
+  gem 'pg'
+  gem 'therubyracer-heroku'
+end
+
+group :mgk do
+  gem 'rmagick'
 end
 
 group :development, :test do
+  gem 'sqlite3'
   gem 'webrat'
-  gem 'rspec'
+  gem 'rspec', '~> 2.13.0'
    gem 'rspec-rails'
    gem 'cucumber'
    gem 'cucumber-rails'
@@ -50,5 +59,10 @@ group :development, :test do
   gem 'database_cleaner'
   gem 'rails-erd'
   gem 'factory_girl'
+end
+
+group :test do
   gem 'autotest'
+  gem 'webmock'
 end
+