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

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 49c23c1..b9b9b40 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,21 +2,20 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.1.1'
 gem 'devise', '=1.5.2'
+gem 'rest-client'
 gem 'aws-s3'
 gem 'validates_existence'
 gem "validate_url"
-gem "standard_licenses"
-gem "creative_commons_v30_licenses"
-gem 'pettan_commons_v01_licenses'
-gem 'pettan_protected_v01_licenses'
-gem 'public_domain_v01_licenses'
-gem 'unknown_v01_licenses'
+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.
@@ -50,8 +49,9 @@ group :mgk do
 end
 
 group :development, :test do
+  gem 'sqlite3'
   gem 'webrat'
-  gem 'rspec'
+  gem 'rspec', '~> 2.13.0'
    gem 'rspec-rails'
    gem 'cucumber'
    gem 'cucumber-rails'
@@ -63,5 +63,6 @@ end
 
 group :test do
   gem 'autotest'
+  gem 'webmock'
 end