X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Gemfile.lock;h=ed34277668c26faa35bd7260329f79a5dd54dbcd;hb=75a2db7eb468f6df4338f8a7545f4c7dbc19b841;hp=3075490de126c8c6f47c062dd3fa1c993993c497;hpb=305ee1ab4982332ba8e3b4f9d0f7299903c0a665;p=pettanr%2Fpettanr.git diff --git a/Gemfile.lock b/Gemfile.lock index 3075490d..ed342776 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: http://rubygems.org/ specs: + ZenTest (4.8.2) actionmailer (3.1.1) actionpack (= 3.1.1) mail (~> 2.3.0) @@ -29,8 +30,11 @@ GEM activesupport (= 3.1.1) activesupport (3.1.1) multi_json (~> 1.0) - arel (2.2.1) - aws-s3 (0.6.2) + addressable (2.3.2) + arel (2.2.3) + autotest (4.4.6) + ZenTest (>= 4.4.1) + aws-s3 (0.6.3) builder mime-types xml-simple @@ -43,57 +47,70 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.2.3) - ffi (~> 1.0.6) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) + choice (0.1.6) coffee-rails (3.1.1) coffee-script (>= 2.2.0) railties (~> 3.1.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) - cucumber (1.1.3) + coffee-script-source (1.3.3) + creative_commons_v30_licenses (0.0.9) + rails (~> 3.1.1) + cucumber (1.2.1) builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.6.7) + diff-lcs (>= 1.1.3) + gherkin (~> 2.11.0) json (>= 1.4.6) - term-ansicolor (>= 1.0.6) - cucumber-rails (1.2.1) + cucumber-rails (1.3.0) capybara (>= 1.1.2) - cucumber (>= 1.1.3) + cucumber (>= 1.1.8) nokogiri (>= 1.5.0) - database_cleaner (0.7.0) + database_cleaner (0.8.0) devise (1.5.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) warden (~> 1.1) diff-lcs (1.1.3) erubis (2.7.0) - execjs (1.2.11) + execjs (1.4.0) multi_json (~> 1.0) - factory_girl (2.6.4) - activesupport (>= 2.3.9) - ffi (1.0.11-x86-mingw32) - gherkin (2.6.9-x86-mingw32) + factory_girl (4.0.0) + activesupport (>= 3.0.0) + ffi (1.1.5-x86-mingw32) + gherkin (2.11.2-x86-mingw32) json (>= 1.4.6) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.19) - railties (~> 3.0) + jquery-rails (2.1.1) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.6.3) - mail (2.3.0) + json (1.7.5) + libwebsocket (0.1.5) + addressable + mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) + mime-types (1.19) moro-miso (0.0.6) - multi_json (1.0.4) - nokogiri (1.5.0-x86-mingw32) - orm_adapter (0.0.5) + multi_json (1.3.6) + nokogiri (1.5.5-x86-mingw32) + orm_adapter (0.0.7) + pettan_commons_v01_licenses (0.0.6) + rails (~> 3.1.1) + pettan_protected_v01_licenses (0.0.6) + rails (~> 3.1.1) + pettan_public_v01_licenses (0.0.6) + rails (~> 3.1.1) + pg (0.14.0-x86-mingw32) polyglot (0.3.3) - rack (1.3.5) - rack-cache (1.1) + public_domain_v01_licenses (0.0.6) + rails (~> 3.1.1) + rack (1.3.6) + rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -109,10 +126,11 @@ GEM activesupport (= 3.1.1) bundler (~> 1.0) railties (= 3.1.1) - rails-erd (0.4.5) - activerecord (~> 3.0) - activesupport (~> 3.0) - ruby-graphviz (~> 0.9.18) + rails-erd (1.0.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + choice (~> 0.1.6) + ruby-graphviz (~> 1.0.4) railties (3.1.1) actionpack (= 3.1.1) activesupport (= 3.1.1) @@ -121,51 +139,58 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) - rdoc (3.11) + rdoc (3.12) json (~> 1.4) - rspec (2.7.0) - rspec-core (~> 2.7.0) - rspec-expectations (~> 2.7.0) - rspec-mocks (~> 2.7.0) - rspec-core (2.7.1) - rspec-expectations (2.7.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.7.0) - rspec-rails (2.7.0) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.7.0) - ruby-graphviz (0.9.21) - rubyzip (0.9.5) - sass (3.1.11) - sass-rails (3.1.5) + rmagick (2.13.1) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rspec-rails (2.11.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec (~> 2.11.0) + ruby-graphviz (1.0.8) + rubyzip (0.9.9) + sass (3.2.1) + sass-rails (3.1.6) actionpack (~> 3.1.0) railties (~> 3.1.0) - sass (~> 3.1.10) + sass (>= 3.1.10) tilt (~> 1.3.2) - selenium-webdriver (2.14.0) - childprocess (>= 0.2.1) - ffi (~> 1.0.9) - multi_json (~> 1.0.4) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sprockets (2.0.3) + sprockets (2.0.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5-x86-mingw32) - term-ansicolor (1.0.7) + sqlite3 (1.3.6-x86-mingw32) + standard_licenses (0.0.6) + rails (~> 3.1.1) + therubyracer-heroku (0.8.1.pre3) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) - uglifier (1.1.0) + tzinfo (0.3.33) + uglifier (1.2.7) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) + unknown_v01_licenses (0.0.6) + rails (~> 3.1.1) + validate_url (0.2.0) + activemodel (>= 3.0.0) validates_existence (0.7.1) - warden (1.1.0) + warden (1.2.1) rack (>= 1.0) webrat (0.7.3) nokogiri (>= 1.2.0) @@ -179,21 +204,33 @@ PLATFORMS x86-mingw32 DEPENDENCIES + autotest aws-s3 coffee-rails (~> 3.1.1) + creative_commons_v30_licenses cucumber cucumber-rails database_cleaner - devise + devise (= 1.5.2) factory_girl jquery-rails moro-miso + pettan_commons_v01_licenses + pettan_protected_v01_licenses + pettan_public_v01_licenses + pg + public_domain_v01_licenses rails (= 3.1.1) rails-erd + rmagick rspec rspec-rails sass-rails (~> 3.1.4) sqlite3 + standard_licenses + therubyracer-heroku uglifier (>= 1.0.3) + unknown_v01_licenses + validate_url validates_existence webrat