Update rails gems to 4.0

11 years ago · 1a78d3ddef
parent 761a7ea60b
commit 1a78d3ddef
2 changed files with 116 additions and 133 deletions
--- a/50
+++ b/50
@ -1,39 +1,35 @@
 source 'http://rubygems.org'

-gem 'rails',            '3.2.14'
-gem 'jquery-rails',     '~> 2.2.0'
-gem 'pg',               '~> 0.14.1'
-gem 'carrierwave',      '~> 0.8.0'
-gem 'omniauth',         '~> 1.1.4'
-gem 'omniauth-twitter', '~> 0.0.16'
-gem 'omniauth-github',  '~> 1.1.0'
-gem 'kaminari',         '~> 0.14.1'
-gem 'airbrake',         '~> 3.1.7', :require => false
-gem 'draper',           '~> 1.2.1'
-gem 'fog',              '~> 1.9.0'
-gem 'simple_form',      '~> 2.0.4'
-gem 'sidekiq',          '~> 2.13'
-gem 'thin',             '~> 1.5.0'
-gem 'open4',            '~> 1.3.0'
-gem 'redcarpet',        '~> 2.2.2'
-gem 'slim',             '~> 2.0.0'
+gem 'rails',                '~> 4.0.0'
+gem 'protected_attributes', '~> 1.0.3'
+gem 'jquery-rails',         '~> 2.2.0'
+gem 'pg',                   '~> 0.14.1'
+gem 'carrierwave',          '~> 0.8.0'
+gem 'omniauth',             '~> 1.1.4'
+gem 'omniauth-twitter',     '~> 0.0.16'
+gem 'omniauth-github',      '~> 1.1.0'
+gem 'kaminari',             '~> 0.14.1'
+gem 'airbrake',             '~> 3.1.7', :require => false
+gem 'draper',               '~> 1.2.1'
+gem 'fog',                  '~> 1.9.0'
+gem 'simple_form',          '~> 3.0.0.rc'
+gem 'sidekiq',              '~> 2.13'
+gem 'thin',                 '~> 1.5.0'
+gem 'open4',                '~> 1.3.0'
+gem 'redcarpet',            '~> 2.2.2'
+gem 'slim',                 '~> 2.0.0'
+gem 'dotenv-rails',         '~> 0.8'
+gem 'sass-rails',           '~> 4.0.0'
+gem 'coffee-rails',         '~> 4.0.0'
+gem 'uglifier',             '>= 2.1.2'
 gem 'tsm', :git => 'git://github.com/sickill/tsm.git'
-gem 'dotenv-rails',     '~> 0.8'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.6'
-  gem 'coffee-rails', '~> 3.2.2'
-  gem 'uglifier',     '>= 1.0.3'
-end

 group :development do
  gem 'quiet_assets',   '~> 1.0.1'
  gem 'capistrano',     '~> 2.15'
  gem 'capistrano-ext', '~> 1.2'
  gem 'foreman',        '~> 0.63.0'
-  gem 'zeus', '0.13.4.pre2'
+  gem 'zeus',           '0.13.4.pre2'
 end

 group :test, :development do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -8,42 +8,42 @@ GIT
 GEM
  remote: http://rubygems.org/
  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
    airbrake (3.1.12)
      activesupport
      builder
      json
-    arel (3.0.2)
-    builder (3.0.4)
+    arel (4.0.0)
+    atomic (1.1.12)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    builder (3.1.4)
    cane (2.5.2)
      parallel
-    capistrano (2.15.4)
+    capistrano (2.15.5)
      highline
      net-scp (>= 1.0.0)
      net-sftp (>= 2.0.0)
@ -65,13 +65,13 @@ GEM
    childprocess (0.3.9)
      ffi (~> 1.0, >= 1.0.11)
    coderay (1.0.9)
-    coffee-rails (3.2.2)
+    coffee-rails (4.0.0)
      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0.beta, < 5.0)
    coffee-script (2.2.0)
      coffee-script-source
      execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
    connection_pool (1.1.0)
    daemons (1.1.9)
    dalli (2.6.4)
@ -86,8 +86,7 @@ GEM
      request_store (~> 1.0.3)
    erubis (2.7.0)
    eventmachine (1.0.3)
-    eventmachine (1.0.3-java)
-    excon (0.22.1)
+    excon (0.25.3)
    execjs (1.4.0)
      multi_json (~> 1.0)
    factory_girl (4.2.0)
@ -95,14 +94,11 @@ GEM
    factory_girl_rails (4.2.1)
      factory_girl (~> 4.2.0)
      railties (>= 3.0.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
    faye-websocket (0.4.7)
      eventmachine (>= 0.12.0)
-    faye-websocket (0.4.7-java)
-      eventmachine (>= 0.12.0)
    ffi (1.9.0)
-    ffi (1.9.0-java)
    fog (1.9.0)
      builder
      excon (~> 0.14)
@ -116,11 +112,8 @@ GEM
    foreman (0.63.0)
      dotenv (>= 0.7)
      thor (>= 0.13.6)
-    foreman (0.63.0-java)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
    formatador (0.2.4)
-    guard (1.8.0)
+    guard (1.8.2)
      formatador (>= 0.2.4)
      listen (>= 1.0.0)
      lumberjack (>= 1.0.2)
@ -129,14 +122,13 @@ GEM
    guard-jasmine-headless-webkit (0.3.2)
      guard (>= 0.4.0)
      jasmine-headless-webkit (>= 0.7.0)
-    guard-rspec (3.0.0)
+    guard-rspec (3.0.2)
      guard (>= 1.8)
      rspec (~> 2.13)
    hashie (2.0.5)
    highline (1.6.19)
    hike (1.2.3)
    http_parser.rb (0.5.3)
-    http_parser.rb (0.5.3-java)
    httpauth (0.2.0)
    i18n (0.6.4)
    jasmine (1.3.2)
@ -155,39 +147,40 @@ GEM
      jasmine (~> 1.3)
      jasmine-headless-webkit
      rails (>= 3.1.0)
-    journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (2.2.2)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    json (1.8.0)
-    json (1.8.0-java)
    jwt (0.1.8)
      multi_json (>= 1.5)
    kaminari (0.14.1)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    kgio (2.8.0)
-    listen (1.1.3)
+    listen (1.2.2)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
      rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
-    method_source (0.8.1)
+    metaclass (0.0.1)
+    method_source (0.8.2)
    mime-types (1.23)
+    minitest (4.7.5)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
    multi_json (1.7.8)
    multipart-post (1.2.0)
    net-scp (1.0.4)
      net-ssh (>= 1.99.1)
    net-sftp (2.1.2)
      net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
    net-ssh-gateway (1.2.0)
      net-ssh (>= 2.6.5)
-    nokogiri (1.5.9)
-    nokogiri (1.5.9-java)
+    nokogiri (1.5.10)
    oauth (0.4.7)
    oauth2 (0.8.1)
      faraday (~> 0.8)
@ -198,7 +191,7 @@ GEM
    omniauth (1.1.4)
      hashie (>= 1.2, < 3)
      rack
-    omniauth-github (1.1.0)
+    omniauth-github (1.1.1)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.1)
    omniauth-oauth (1.0.1)
@ -207,52 +200,43 @@ GEM
    omniauth-oauth2 (1.1.1)
      oauth2 (~> 0.8.0)
      omniauth (~> 1.0)
-    omniauth-twitter (0.0.16)
+    omniauth-twitter (0.0.18)
      multi_json (~> 1.3)
      omniauth-oauth (~> 1.0)
    open4 (1.3.0)
-    parallel (0.6.5)
+    parallel (0.7.1)
    pg (0.14.1)
    poltergeist (1.3.0)
      capybara (~> 2.1.0)
      faye-websocket (>= 0.4.4, < 0.5.0)
      http_parser.rb (~> 0.5.3)
    polyglot (0.3.3)
+    protected_attributes (1.0.3)
+      activemodel (>= 4.0.0, < 5.0)
    pry (0.9.12.2)
      coderay (~> 1.0.5)
      method_source (~> 0.8)
      slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    pry-rails (0.3.0)
+    pry-rails (0.3.2)
      pry (>= 0.9.10)
    quiet_assets (1.0.2)
      railties (>= 3.1, < 5.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
    rack-test (0.6.2)
      rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
    rainbow (1.1.4)
    raindrops (0.11.0)
    rake (10.0.4)
@ -261,8 +245,6 @@ GEM
      ffi (>= 0.5.0)
    rb-kqueue (0.2.0)
      ffi (>= 0.5.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
    redcarpet (2.2.2)
    redis (3.0.4)
    redis-namespace (1.3.1)
@ -272,10 +254,10 @@ GEM
      rspec-core (~> 2.14.0)
      rspec-expectations (~> 2.14.0)
      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.3)
+    rspec-core (2.14.4)
    rspec-expectations (2.14.0)
      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.14.2)
    rspec-rails (2.14.0)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
@ -285,27 +267,28 @@ GEM
      rspec-mocks (~> 2.14.0)
    ruby-hmac (0.4.0)
    rubyzip (0.9.9)
-    sass (3.2.9)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    sass (3.2.10)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.33.0)
+      sprockets-rails (~> 2.0.0)
+    selenium-webdriver (2.34.0)
      childprocess (>= 0.2.5)
      multi_json (~> 1.0)
      rubyzip
      websocket (~> 1.0.4)
-    shoulda-matchers (1.4.1)
+    shoulda-matchers (1.4.2)
      activesupport (>= 3.0.0)
+      bourne (~> 1.1.2)
    sidekiq (2.13.0)
      celluloid (>= 0.14.1)
      connection_pool (>= 1.0.0)
      json
      redis (>= 3.0)
      redis-namespace
-    simple_form (2.0.4)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
+    simple_form (3.0.0.rc)
+      actionpack (>= 4.0.0.rc1, < 4.1)
+      activemodel (>= 4.0.0.rc1, < 4.1)
    simplecov (0.7.1)
      multi_json (~> 1.0)
      simplecov-html (~> 0.7.1)
@ -313,30 +296,34 @@ GEM
    slim (2.0.1)
      temple (~> 0.6.6)
      tilt (>= 1.3.3, < 2.1)
-    slop (3.4.5)
-    spoon (0.0.4)
-      ffi
-    sprockets (2.2.2)
+    slop (3.4.6)
+    sprockets (2.10.0)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
    temple (0.6.6)
    thin (1.5.1)
      daemons (>= 1.0.9)
      eventmachine (>= 0.12.6)
      rack (>= 1.0.0)
    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
    tilt (1.4.1)
    timers (1.1.0)
    treetop (1.4.14)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.37)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
      execjs (>= 0.3.0)
      multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.6.2)
+    unicorn (4.6.3)
      kgio (~> 2.6)
      rack
      raindrops (~> 0.7)
@ -347,7 +334,6 @@ GEM
      method_source (>= 0.6.7)

 PLATFORMS
-  java
  ruby

 DEPENDENCIES
@ -357,7 +343,7 @@ DEPENDENCIES
  capistrano-ext (~> 1.2)
  capybara (~> 2.1.0)
  carrierwave (~> 0.8.0)
-  coffee-rails (~> 3.2.2)
+  coffee-rails (~> 4.0.0)
  dalli (~> 2.6.2)
  database_cleaner (~> 1.0.1)
  dotenv-rails (~> 0.8)
@ -377,21 +363,22 @@ DEPENDENCIES
  open4 (~> 1.3.0)
  pg (~> 0.14.1)
  poltergeist (~> 1.3.0)
+  protected_attributes (~> 1.0.3)
  pry-rails (~> 0.3.0)
  quiet_assets (~> 1.0.1)
-  rails (= 3.2.14)
+  rails (~> 4.0.0)
  rake (~> 10.0.4)
  rb-inotify (~> 0.9.0)
  redcarpet (~> 2.2.2)
  rspec-rails (~> 2.14)
-  sass-rails (~> 3.2.6)
+  sass-rails (~> 4.0.0)
  shoulda-matchers (~> 1.4.1)
  sidekiq (~> 2.13)
-  simple_form (~> 2.0.4)
+  simple_form (~> 3.0.0.rc)
  simplecov (~> 0.7.1)
  slim (~> 2.0.0)
  thin (~> 1.5.0)
  tsm!
-  uglifier (>= 1.0.3)
+  uglifier (>= 2.1.2)
  unicorn (~> 4.6.2)
  zeus (= 0.13.4.pre2)