Merge pull request #3627 from consul/upgrade_to_ruby2.4

Upgrade ruby to 2.4.6

.rubocop_basic.yml

@@ -9,7 +9,6 @@ AllCops:
   Exclude:
     - "db/migrate/**/*"
     - "db/schema.rb"
-  TargetRubyVersion: 2.3
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true

.ruby-version

@@ -1 +1 @@
-2.3.2
+2.4.6

.travis.yml

@@ -2,8 +2,6 @@ language: ruby
 addons:
   postgresql: "9.4"
   chrome: stable
-rvm:
-- 2.3.2
 cache: bundler
 bundler_args: --without development
 before_script:

README.md

@@ -37,7 +37,7 @@ You can access the main website of the project at [http://consulproject.org](htt
 
 **NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org)
 
-Prerequisites: install git, Ruby 2.3.2, `bundler` gem, Node.js and PostgreSQL (>=9.4).
+Prerequisites: install git, Ruby 2.4.6, `bundler` gem, Node.js and PostgreSQL (>=9.4).
 
 ```bash
 git clone https://github.com/consul/consul.git

README_ES.md

@@ -36,7 +36,7 @@ Puedes acceder a la página principal del proyecto en [http://consulproject.org]
 
 **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org)
 
-Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler`, Node.js y PostgreSQL (9.4 o superior).
+Prerequisitos: tener instalado git, Ruby 2.4.6, la gema `bundler`, Node.js y PostgreSQL (9.4 o superior).
 
 ```bash
 git clone https://github.com/consul/consul.git

config/deploy.rb

@@ -7,7 +7,6 @@ def deploysecret(key)
 end
 
 set :rails_env, fetch(:stage)
-set :rvm1_ruby_version, "2.3.2"
 set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq }
 
 set :application, "consul"
@@ -41,9 +40,9 @@ set(:config_files, %w[
 set :whenever_roles, -> { :app }
 
 namespace :deploy do
-  #before :starting, "rvm1:install:rvm"  # install/update RVM
-  #before :starting, "rvm1:install:ruby" # install Ruby and create gemset
-  #before :starting, "install_bundler_gem" # install bundler gem
+  before :starting, "rvm1:install:rvm"
+  before :starting, "rvm1:install:ruby"
+  before :starting, "install_bundler_gem"
 
   after "deploy:migrate", "add_new_settings"
   after :publishing, "deploy:restart"
@@ -63,7 +62,9 @@ end
 
 task :install_bundler_gem do
   on roles(:app) do
-    execute "rvm use #{fetch(:rvm1_ruby_version)}; gem install bundler"
+    within release_path do
+      execute :rvm, fetch(:rvm1_ruby_version), "do", "gem install bundler"
+    end
   end
 end