diff --git a/Gemfile b/Gemfile index a9c91a0..ccf8c4a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.1' +gem 'rails', '7.1.0' gem 'paperclip' gem 'capistrano' gem 'beanstalk-client' @@ -14,7 +14,7 @@ group :development, :test do gem "rspec", "2.0.0", :git => "http://github.com/rspec/rspec.git" gem "rspec-rails" gem "ZenTest" - gem "factory_girl_rails" + gem "factory_girl_rails", ">= 1.0.1" end diff --git a/Gemfile.lock b/Gemfile.lock index 65b06b6..c19708d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,88 +11,193 @@ GEM remote: http://rubygems.org/ specs: ZenTest (4.4.0) - abstract (1.0.0) - actionmailer (3.0.1) - actionpack (= 3.0.1) - mail (~> 2.2.5) - actionpack (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.4.1) - rack (~> 1.2.1) - rack-mount (~> 0.6.12) - rack-test (~> 0.5.4) - tzinfo (~> 0.3.23) - activemodel (3.0.1) - activesupport (= 3.0.1) - builder (~> 2.1.2) - i18n (~> 0.4.1) - activerecord (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - arel (~> 1.0.0) - tzinfo (~> 0.3.23) - activeresource (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - activesupport (3.0.1) - arel (1.0.1) - activesupport (~> 3.0.0) + actioncable (7.1.0) + actionpack (= 7.1.0) + activesupport (= 7.1.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.0) + actionpack (= 7.1.0) + activejob (= 7.1.0) + activerecord (= 7.1.0) + activestorage (= 7.1.0) + activesupport (= 7.1.0) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.0) + actionpack (= 7.1.0) + actionview (= 7.1.0) + activejob (= 7.1.0) + activesupport (= 7.1.0) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.0) + actionview (= 7.1.0) + activesupport (= 7.1.0) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.0) + actionpack (= 7.1.0) + activerecord (= 7.1.0) + activestorage (= 7.1.0) + activesupport (= 7.1.0) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.0) + activesupport (= 7.1.0) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.0) + activesupport (= 7.1.0) + globalid (>= 0.3.6) + activemodel (7.1.0) + activesupport (= 7.1.0) + activerecord (7.1.0) + activemodel (= 7.1.0) + activesupport (= 7.1.0) + timeout (>= 0.4.0) + activestorage (7.1.0) + actionpack (= 7.1.0) + activejob (= 7.1.0) + activerecord (= 7.1.0) + activesupport (= 7.1.0) + marcel (~> 1.0) + activesupport (7.1.0) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + base64 (0.1.1) beanstalk-client (1.1.0) - builder (2.1.2) + bigdecimal (3.1.4) + builder (3.2.4) capistrano (2.5.19) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.0.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + date (3.3.3) diff-lcs (1.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) - factory_girl (1.3.2) - factory_girl_rails (1.0) - factory_girl (~> 1.3) - rails (>= 3.0.0.beta4) + drb (2.1.1) + ruby2_keywords + erubi (1.12.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) + railties (>= 3.0.0) + globalid (1.2.1) + activesupport (>= 6.1) highline (1.6.1) - i18n (0.4.1) - mail (2.2.7) - activesupport (>= 2.3.6) - mime-types - treetop (>= 1.4.5) - mime-types (1.16) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.8.1) + rdoc + reline (>= 0.3.8) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) + mutex_m (0.1.2) mysql (2.8.1) + net-imap (0.4.0) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) net-ssh (>= 2.0.9) + net-smtp (0.4.0) + net-protocol net-ssh (2.0.23) net-ssh-gateway (1.0.1) net-ssh (>= 1.99.1) + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) paperclip (2.3.4) activerecord activesupport - polyglot (0.3.1) - rack (1.2.1) - rack-mount (0.6.13) - rack (>= 1.0.0) - rack-test (0.5.6) - rack (>= 1.0) - rails (3.0.1) - actionmailer (= 3.0.1) - actionpack (= 3.0.1) - activerecord (= 3.0.1) - activeresource (= 3.0.1) - activesupport (= 3.0.1) - bundler (~> 1.0.0) - railties (= 3.0.1) - railties (3.0.1) - actionpack (= 3.0.1) - activesupport (= 3.0.1) - rake (>= 0.8.4) - thor (~> 0.14.0) - rake (0.8.7) + psych (5.1.0) + stringio + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.0) + actioncable (= 7.1.0) + actionmailbox (= 7.1.0) + actionmailer (= 7.1.0) + actionpack (= 7.1.0) + actiontext (= 7.1.0) + actionview (= 7.1.0) + activejob (= 7.1.0) + activemodel (= 7.1.0) + activerecord (= 7.1.0) + activestorage (= 7.1.0) + activesupport (= 7.1.0) + bundler (>= 1.15.0) + railties (= 7.1.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.0) + actionpack (= 7.1.0) + activesupport (= 7.1.0) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.0.6) + rdoc (6.5.0) + psych (>= 4.0.0) + reline (0.3.9) + io-console (~> 0.5) rspec-core (2.0.0) rspec-expectations (2.0.0) diff-lcs (>= 1.1.2) @@ -101,10 +206,17 @@ GEM rspec-expectations (= 2.0.0) rspec-rails (2.0.1) rspec (~> 2.0.0) - thor (0.14.3) - treetop (1.4.8) - polyglot (>= 0.3.1) - tzinfo (0.3.23) + ruby2_keywords (0.0.5) + stringio (3.0.8) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + webrick (1.8.1) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) PLATFORMS ruby @@ -113,9 +225,12 @@ DEPENDENCIES ZenTest beanstalk-client capistrano - factory_girl_rails + factory_girl_rails (>= 1.0.1) mysql paperclip - rails (= 3.0.1) + rails (= 7.1.0) rspec (= 2.0.0)! rspec-rails + +BUNDLED WITH + 2.1.4