feat: upgrade Ruby (#1505)

* feat: upgrade Ruby

* fix: duplicated slug

* feat: upgrade gem

Author: Jean Bertrand

.gitignore

@@ -11,3 +11,4 @@ yarn-error.log
 .jekyll-cache
 
 .vscode
+.DS_Store

.rubocop.yml

@@ -0,0 +1,46 @@
+inherit_from: []
+
+inherit_gem:
+  standard: config/base.yml
+
+require:
+  - standard
+
+AllCops:
+  Exclude:
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
+    - 'bin/{webpack,webpack-dev-server}'
+    - '_plugins/**/*'
+
+# Opting out of this one. Standard's desired behaviour (one indent when multi line)
+# can be weird in some contexts, cf token_authentication.rb`
+Layout/ArrayAlignment:
+  Enabled: false
+
+# Allowing returns
+Style/RedundantReturn:
+  Enabled: false
+
+# Leave trailing commas.
+# The case where they're not appropriate are too few to justify switching
+# (at least, for now).
+# https://github.com/penelopezone/rubyfmt/issues/154
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/NegatedIf:
+  Enabled: false
+
+Style/ConditionalAssignment:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-3.0.1
+3.0.3

Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby '3.0.1'
+ruby "3.0.3"
 
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
@@ -10,8 +10,8 @@ ruby '3.0.1'
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem 'jekyll'
-gem 'webrick'
+gem "jekyll"
+gem "webrick"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 # gem 'minima', '~> 2.0'
@@ -22,24 +22,28 @@ gem 'webrick'
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem 'jekyll-feed'
-  gem 'jekyll-sitemap'
-  gem 'jekyll-toc'
+  gem "jekyll-feed"
+  gem "jekyll-sitemap"
+  gem "jekyll-toc"
 end
 
 group :development, :test do
-  gem 'pry-nav'
-  gem 'pry-rails'
+  gem "pry-nav"
+  gem "pry-rails"
+
+  ## Linting
+  gem "rubocop"
+  gem "standard"
 end
 
-gem 'webpacker', '< 5'
+gem "webpacker", "< 5"
 
-gem 'puma'
-gem 'rack-canonical-host'
-gem 'rack-jekyll', github: "adaoraul/rack-jekyll"
-gem 'rack-rewrite'
-gem 'rack-ssl-enforcer'
-gem 'rack-cors'
+gem "puma"
+gem "rack-canonical-host"
+gem "rack-jekyll", github: "adaoraul/rack-jekyll"
+gem "rack-rewrite"
+gem "rack-ssl-enforcer"
+gem "rack-cors"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -10,26 +10,27 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.0)
-      actionview (= 7.0.0)
-      activesupport (= 7.0.0)
+    actionpack (7.0.1)
+      actionview (= 7.0.1)
+      activesupport (= 7.0.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.0)
-      activesupport (= 7.0.0)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.0)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
     colorator (1.1.0)
@@ -84,12 +85,15 @@ GEM
       nokogiri (>= 1.5.9)
     mercenary (0.4.0)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.1)
     minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.0)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pry (0.14.1)
@@ -109,7 +113,7 @@ GEM
       rack (>= 1.0.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-proxy (0.7.0)
+    rack-proxy (0.7.2)
       rack
     rack-rewrite (1.5.1)
     rack-ssl-enforcer (0.2.9)
@@ -120,25 +124,45 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.0)
-      actionpack (= 7.0.0)
-      activesupport (= 7.0.0)
+    railties (7.0.1)
+      actionpack (= 7.0.1)
+      activesupport (= 7.0.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
+    rainbow (3.0.0)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rouge (3.27.0)
+    rubocop (1.20.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
@@ -165,12 +189,14 @@ DEPENDENCIES
   rack-jekyll!
   rack-rewrite
   rack-ssl-enforcer
+  rubocop
+  standard
   tzinfo-data
   webpacker (< 5)
   webrick
 
 RUBY VERSION
-   ruby 3.0.1p64
+   ruby 3.0.3p157
 
 BUNDLED WITH
-   2.2.19
+   2.2.32

Rakefile

@@ -1 +1 @@
-Dir.glob('lib/tasks/*.rake').each { |r| import r }
+Dir.glob("lib/tasks/*.rake").each { |r| import r }

changelog/buildpacks/_posts/2018-03-29-ruby-updates-multiple-cves.md changelog/buildpacks/_posts/2018-03-29-ruby-updates-multiple-cves-old.md

@@ -1,9 +1,9 @@
-require 'rack/jekyll'
-require 'rack/rewrite'
-require 'rack/ssl-enforcer'
-require 'rack/canonical_host'
-require 'rack/cors'
-require 'yaml'
+require "rack/jekyll"
+require "rack/rewrite"
+require "rack/ssl-enforcer"
+require "rack/canonical_host"
+require "rack/cors"
+require "yaml"
 
 class Object
   def blank?
@@ -16,66 +16,66 @@ class Object
 end
 
 use Rack::Rewrite do
-  r301 %r{.*}, "https://#{ ENV['CANONICAL_HOST'] }/samples$&", if: Proc.new {|rack_env|
-    ['samples.scalingo.com'].include?(rack_env['SERVER_NAME'])
+  r301 %r{.*}, "https://#{ENV["CANONICAL_HOST"]}/samples$&", if: proc { |rack_env|
+    ["samples.scalingo.com"].include?(rack_env["SERVER_NAME"])
   }
   r301 "/samples/", "/samples"
 
-  r301 %r{.*}, "https://#{ ENV['CANONICAL_HOST'] }/changelog$&", if: Proc.new {|rack_env|
-    ['changelog.scalingo.com'].include?(rack_env['SERVER_NAME'])
+  r301 %r{.*}, "https://#{ENV["CANONICAL_HOST"]}/changelog$&", if: proc { |rack_env|
+    ["changelog.scalingo.com"].include?(rack_env["SERVER_NAME"])
   }
   r301 "/changelog/", "/changelog"
 
-  r301 %r{.*}, "https://#{ ENV['CANONICAL_HOST'] }/cli$&", if: Proc.new {|rack_env|
-    ['cli.scalingo.com'].include?(rack_env['SERVER_NAME'])
+  r301 %r{.*}, "https://#{ENV["CANONICAL_HOST"]}/cli$&", if: proc { |rack_env|
+    ["cli.scalingo.com"].include?(rack_env["SERVER_NAME"])
   }
   r301 "/cli/", "/cli"
 
-  r301 /\/internals\/(.*)-buildpack/, "/platform/deployment/buildpacks/$1"
+  r301(/\/internals\/(.*)-buildpack/, "/platform/deployment/buildpacks/$1")
 
-  r301 /\/addons\/scalingo-postgresql(.*)/,    "/databases/postgresql$1"
-  r301 /\/addons\/scalingo-mysql(.*)/,         "/databases/mysql$1"
-  r301 /\/addons\/scalingo-mongodb(.*)/,       "/databases/mongodb$1"
-  r301 /\/addons\/scalingo-elasticsearch(.*)/, "/databases/elasticsearch$1"
-  r301 /\/addons\/scalingo-influxdb(.*)/,      "/databases/influxdb$1"
+  r301(/\/addons\/scalingo-postgresql(.*)/, "/databases/postgresql$1")
+  r301(/\/addons\/scalingo-mysql(.*)/, "/databases/mysql$1")
+  r301(/\/addons\/scalingo-mongodb(.*)/, "/databases/mongodb$1")
+  r301(/\/addons\/scalingo-elasticsearch(.*)/, "/databases/elasticsearch$1")
+  r301(/\/addons\/scalingo-influxdb(.*)/, "/databases/influxdb$1")
 
-  redirections = YAML.load_file('redirections.yml')
-  redirections['301'].each{|redir|
+  redirections = YAML.load_file("redirections.yml")
+  redirections["301"].each { |redir|
     r301 redir["old"], redir["new"]
   }
-  redirections['obsolete'].each{|redir|
+  redirections["obsolete"].each { |redir|
     r301 redir, "/"
   }
 
-  r301    %r{^(.+).html$}, '$1'
-  rewrite %r{^([^?]+)(\??)(.*)}, '$1.html$2$3', if: Proc.new {|rack_env|
-    rack_env['PATH_INFO'].present? && rack_env['PATH_INFO'] != '/' && rack_env['PATH_INFO'] !~ /\.(jpg|jpeg|png|gif|ico|eot|otf|ttf|woff|woff2|css|js|xml|txt)$/i
+  r301 %r{^(.+).html$}, "$1"
+  rewrite %r{^([^?]+)(\??)(.*)}, "$1.html$2$3", if: proc { |rack_env|
+    rack_env["PATH_INFO"].present? && rack_env["PATH_INFO"] != "/" && rack_env["PATH_INFO"] !~ /\.(jpg|jpeg|png|gif|ico|eot|otf|ttf|woff|woff2|css|js|xml|txt)$/i
   }
 end
 
 use Rack::Cors do
-  if ENV['ALLOWED_CHANGELOG_FEED_CONSUMERS'].present?
-    allowed_origins = ENV['ALLOWED_CHANGELOG_FEED_CONSUMERS'].split(',')
+  if ENV["ALLOWED_CHANGELOG_FEED_CONSUMERS"].present?
+    allowed_origins = ENV["ALLOWED_CHANGELOG_FEED_CONSUMERS"].split(",")
 
     allow do
       origins(*allowed_origins)
-      resource '/changelog/feed.xml', headers: :any, methods: :get
+      resource "/changelog/feed.xml", headers: :any, methods: :get
     end
   end
 end
 
-if ENV['FORCE_SSL'].present?
+if ENV["FORCE_SSL"].present?
   use Rack::SslEnforcer
 end
 
-if ENV['CANONICAL_HOST'].present? && ENV['CANONICAL_HOST_DISABLED'].blank?
-  canonical_hosts_ignore = ENV['CANONICAL_HOSTS_IGNORE'].present? ? ENV['CANONICAL_HOSTS_IGNORE'].split(",").map(&:strip) : []
-  use Rack::CanonicalHost, ENV['CANONICAL_HOST'], ignore: canonical_hosts_ignore
+if ENV["CANONICAL_HOST"].present? && ENV["CANONICAL_HOST_DISABLED"].blank?
+  canonical_hosts_ignore = ENV["CANONICAL_HOSTS_IGNORE"].present? ? ENV["CANONICAL_HOSTS_IGNORE"].split(",").map(&:strip) : []
+  use Rack::CanonicalHost, ENV["CANONICAL_HOST"], ignore: canonical_hosts_ignore
 end
 
-if ENV['BASIC_AUTH_ENABLED']
+if ENV["BASIC_AUTH_ENABLED"]
   use Rack::Auth::Basic, "Protected Area" do |username, password|
-    [username, password] == ENV['BASIC_AUTH'].split(":")
+    ENV["BASIC_AUTH"].split(":") == [username, password]
   end
 end
 

changelog/databases/_posts/2019-04-12-redis-4.0.14.markdown changelog/databases/_posts/2019-04-12-redis-4.0.14-old.markdown

@@ -1,10 +1,9 @@
-workers Integer(ENV['WEB_CONCURRENCY'] || 2)
-threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
+workers Integer(ENV["WEB_CONCURRENCY"] || 2)
+threads_count = Integer(ENV["RAILS_MAX_THREADS"] || 5)
 threads threads_count, threads_count
 
 preload_app!
 
-rackup      DefaultRackup
-port        ENV['PORT']     || 3000
-environment ENV['RACK_ENV'] || 'development'
-
+rackup DefaultRackup
+port ENV["PORT"] || 3000
+environment ENV["RACK_ENV"] || "development"