rails app:update + railsdiff

Author: ysbaddaden

Gemfile

@@ -31,7 +31,7 @@ gem 'premailer-rails', '< 1.10' # 1.10 requires Rails.application.assets_manifes
 # Views
 gem 'csv_builder', '~> 2.1'
 gem 'haml-rails', '~> 0.9'
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 1.2' # TODO: next?('~> 2.5', '~> 1.2')
 gem 'view_components', git: 'https://github.com/manastech/rails-view_components.git', branch: 'master'
 gem 'wicked_pdf', '~> 2.1'
 
@@ -73,7 +73,7 @@ gem 'geojson_import', git: 'https://github.com/instedd/geojson_import', branch:
 # end
 
 # Services
-gem 'puma', '~> 2.13'
+gem 'puma', next?('~> 3.0', '~> 2.13')
 gem 'sidekiq', '~> 3.5'
 gem 'sinatra', '~> 1.4' unless next? # for sidekiq web FIXME: upgrade sidekiq
 gem 'sidekiq-cron', '~> 0.3'
@@ -93,7 +93,7 @@ else
   gem 'sass-rails', '~> 4.0'
 end
 gem 'therubyracer', '~> 0.12' # FIXME: deprecated for years
-gem 'turbolinks', '~> 2.5'
+gem 'turbolinks', '~> 2.5' # TODO: next?('~> 5', '~> 2.5')
 gem 'uglifier', '~> 2.7'
 
 # TODO: externalize frontend dependencies (NPM or YARN)!
@@ -111,16 +111,18 @@ end
 
 group :development do
   gem 'letter_opener'
+  gem 'listen', '~> 3.0.5' if next?
   gem 'quiet_assets' unless next?
+  gem 'spring'
+  gem 'spring-commands-rspec'
+  gem 'spring-watcher-listen', '~> 2.0.0' if next?
   gem 'web-console', '< 4.0' # last version to support ruby 2.2
 end
 
 group :development, :test do
   gem 'pry-byebug', '< 2.7.0' unless next? # last version to support ruby 2.2
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
-  gem 'spring'
-  gem 'spring-commands-rspec'
 end
 
 group :test do

Gemfile.next.lock

@@ -332,6 +332,9 @@ GEM
     letter_opener (1.8.0)
       launchy (>= 2.2, < 3)
     libv8 (3.16.14.19)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     lodash-rails (3.10.1)
       railties (>= 3.1)
     loofah (2.15.0)
@@ -395,7 +398,7 @@ GEM
       binding_of_caller (~> 0.7)
       pry (~> 0.13)
     public_suffix (3.1.1)
-    puma (2.16.0)
+    puma (3.12.6)
     raabro (1.4.0)
     rack (2.1.4)
     rack-test (0.6.3)
@@ -525,6 +528,9 @@ GEM
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -611,6 +617,7 @@ DEPENDENCIES
   kaminari (~> 0.16)
   leaflet-rails (~> 0.7.4)
   letter_opener
+  listen (~> 3.0.5)
   location_service!
   lodash-rails (~> 3.10.1)
   machinist (~> 2.0)
@@ -626,7 +633,7 @@ DEPENDENCIES
   premailer-rails (< 1.10)
   pry-rescue
   pry-stack_explorer
-  puma (~> 2.13)
+  puma (~> 3.0)
   rack (< 2.2.0)
   rails (~> 5.0.0)
   rails-assets-urijs (~> 1.17.0)!
@@ -650,6 +657,7 @@ DEPENDENCIES
   site_prism (~> 2.17)
   spring
   spring-commands-rspec
+  spring-watcher-listen (~> 2.0.0)
   sprockets-rails (< 3.3.0)
   therubyracer (~> 0.12)
   timecop (~> 0.8)

Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

app/assets/javascripts/application.js

@@ -5,7 +5,7 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.

bin/bundle

@@ -1,105 +1,3 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'bundle' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-    module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("../../Gemfile", __FILE__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_version
-    @bundler_version ||= begin
-      env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
-  end
-
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_version
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/setup

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require_relative 'config/environment'
 run Rails.application

config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 

config/boot.rb

@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.

config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -9,9 +9,24 @@
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  if Rails::VERSION::MAJOR >= 5
+    # Enable/disable caching. By default caching is disabled.
+    if Rails.root.join('tmp/caching-dev.txt').exist?
+      config.action_controller.perform_caching = true
+
+      config.cache_store = :memory_store
+      config.public_file_server.headers = {
+        'Cache-Control' => 'public, max-age=172800'
+      }
+    else
+      config.action_controller.perform_caching = false
+
+      config.cache_store = :null_store
+    end
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
@@ -29,9 +44,10 @@
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  if Rails::VERSION::MAJOR >= 5
+    # Suppress logger output for asset requests.
+    config.assets.quiet = true
+  end
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
@@ -41,6 +57,12 @@
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
+  if Rails::VERSION::MAJOR > 5
+    # Use an evented file watcher to asynchronously detect changes in source code,
+    # routes, locales, etc. This feature depends on the listen gem.
+    config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  end
+
   config.action_mailer.default_url_options = { host: Settings.host }
 
   config.active_job.queue_adapter = :sidekiq