Update rubocop + use enable-frozen-string-literal (#2354)

2020-08-16 22:08:50 +03:00 · 2020-08-16 22:08:50 +03:00 · 61915cdaab
parent a03aed2d6d
commit 61915cdaab
232 changed files with 597 additions and 124 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -1,6 +1,8 @@
-require: rubocop-performance
+require:
+  - rubocop-performance

 AllCops:
+  NewCops: disable
  TargetRubyVersion: 2.5
  Include:
    - "**/*.rb"
@ -11,11 +13,16 @@ AllCops:
    - "vendor/**/*"
    - "**/tmp/**/*"
    - "middleman-cli/lib/middleman-cli/templates/**/*"
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
 Security/YAMLLoad:
  Enabled: false
 Style/GuardClause:
  Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
  Enabled: false
 Metrics/MethodLength:
  Enabled: false
@ -39,13 +46,13 @@ Lint/AmbiguousBlockAssociation:
  Enabled: false
 Lint/UriEscapeUnescape:
  Enabled: false
-Lint/HandleExceptions:
+Lint/SuppressedException:
  Enabled: false
 Lint/ShadowedException:
  Enabled: false
 Naming/FileName:
  Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
  Enabled: false
 Naming/MemoizedInstanceVariableName:
  Enabled: false
@ -57,9 +64,7 @@ Style/ClassAndModuleChildren:
  Enabled: false
 Style/MissingRespondToMissing:
  Enabled: false
-Style/MethodMissingSuper:
-  Enabled: false
-Style/FrozenStringLiteralComment:
+Lint/MissingSuper:
  Enabled: false
 Style/EvalWithLocation:
  Enabled: false
@ -67,3 +72,5 @@ Style/ClassVars:
  Enabled: false
 Style/GlobalVars:
  Enabled: false
+Style/Proc:
+  Enabled: false
--- a/.travis.yml
+++ b/.travis.yml
@ -1,4 +1,5 @@
 language: ruby
+dist: xenial
 cache: bundler
 rvm:
  - ruby-head
@ -7,11 +8,10 @@ rvm:
  - 2.5
 os:
  - linux
-matrix:
+jobs:
  fast_finish: true
  allow_failures:
    - rvm: ruby-head
 env:
  global:
    - TEST=true
-script: bundle exec rake test
--- a/4
+++ b/4
@ -38,8 +38,8 @@ gem 'mini_racer', '~> 0.2.4', platforms: :ruby
 gem 'therubyrhino', '>= 2.0', platforms: :jruby

 # Code Quality
-gem 'rubocop', '~> 0.70.0', require: false
-gem 'rubocop-performance', require: false
+gem 'rubocop', '~> 0.89', require: false
+gem 'rubocop-performance', '~> 1.7', require: false
 gem 'simplecov', '~> 0.10', require: false

 # Middleman itself
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -49,7 +49,7 @@ GEM
      ffi (~> 1.9)
      rspec-expectations (>= 2.99)
      thor (>= 0.19, < 2.0)
-    ast (2.4.0)
+    ast (2.4.1)
    backports (3.17.1)
    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
@ -109,7 +109,6 @@ GEM
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    interception (0.5)
-    jaro_winkler (1.5.4)
    kramdown (2.3.0)
      rexml
    lazy_priority_queue (0.1.1)
@ -140,9 +139,9 @@ GEM
      padrino-support (= 0.14.4)
      tilt (>= 1.4.1, < 3)
    padrino-support (0.14.4)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
@ -164,6 +163,7 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redcarpet (3.5.0)
+    regexp_parser (1.7.1)
    rexml (3.2.4)
    rgl (0.5.6)
      lazy_priority_queue (~> 0.1.0)
@ -181,15 +181,19 @@ GEM
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.9.0)
    rspec-support (3.9.3)
-    rubocop (0.70.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.89.1)
      parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.3.0)
-      rubocop (>= 0.68.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
    ruby-progressbar (1.10.1)
    ruby2_keywords (0.0.2)
    rubydns (1.0.3)
@ -226,7 +230,7 @@ GEM
      thread_safe (~> 0.1)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
    xpath (2.1.0)
      nokogiri (~> 1.3)
    yard (0.9.25)
@ -254,8 +258,8 @@ DEPENDENCIES
  rake (~> 12.3)
  redcarpet (>= 3.1)
  rspec (~> 3.0)
-  rubocop (~> 0.70.0)
-  rubocop-performance
+  rubocop (~> 0.89)
+  rubocop-performance (~> 1.7)
  rubydns (~> 1.0.1)
  sassc (~> 2.0)
  simplecov (~> 0.10)
--- a/4
+++ b/4
@ -44,8 +44,6 @@ end

 desc 'Run tests for all middleman gems'
 task :test do
-  Rake::Task['rubocop'].invoke
-
  GEM_PATHS.each do |g|
    Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake test" }
  end
@ -63,4 +61,4 @@ desc 'Run RuboCop to check code consistency'
 RuboCop::RakeTask.new(:rubocop)

 desc 'Run tests for all middleman gems'
-task default: :test
+task default: %i[rubocop test]
--- a/middleman-cli/Rakefile
+++ b/middleman-cli/Rakefile
@ -1,3 +1,5 @@
-RAKE_ROOT = __FILE__.freeze
-GEM_NAME = 'middleman-cli'.freeze
+# frozen_string_literal: true
+
+RAKE_ROOT = __FILE__
+GEM_NAME = 'middleman-cli'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true

 require 'middleman-core/profiling'
 Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new if ARGV.include? '--profile'
--- a/middleman-cli/features/support/env.rb
+++ b/middleman-cli/features/support/env.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['TEST'] = 'true'

 require 'active_support/all'
--- a/middleman-cli/fixtures/preview-server-app/bin/dns_server.rb
+++ b/middleman-cli/fixtures/preview-server-app/bin/dns_server.rb
@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true

 require 'rubydns'
 require 'psych'
--- a/middleman-cli/fixtures/preview-server-hook-app/config.rb
+++ b/middleman-cli/fixtures/preview-server-hook-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :layout, false

 class MyFeature < Middleman::Extension
--- a/middleman-cli/lib/middleman-cli.rb
+++ b/middleman-cli/lib/middleman-cli.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Setup our load paths
 libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-core/application'

 # CLI Module
@ -126,7 +128,7 @@ module Middleman::Cli
          puts 'Project built successfully.'
        else
          msg = 'There were errors during this build'
-          msg << ', re-run with `middleman build --verbose` to see the full exception.' unless options['verbose']
+          msg = "#{msg}, re-run with `middleman build --verbose` to see the full exception." unless options['verbose']
          shell.say msg, :red

          exit(1)
--- a/middleman-cli/lib/middleman-cli/config.rb
+++ b/middleman-cli/lib/middleman-cli/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # CLI Module
 module Middleman::Cli
  # The CLI Config class
--- a/middleman-cli/lib/middleman-cli/console.rb
+++ b/middleman-cli/lib/middleman-cli/console.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # CLI Module
 module Middleman::Cli
  # The CLI Console class
--- a/middleman-cli/lib/middleman-cli/extension.rb
+++ b/middleman-cli/lib/middleman-cli/extension.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # CLI Module
 module Middleman::Cli
  # A thor task for creating new projects
--- a/middleman-cli/lib/middleman-cli/init.rb
+++ b/middleman-cli/lib/middleman-cli/init.rb
@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # CLI Module
 module Middleman::Cli
  # A thor task for creating new projects
  class Init < Thor::Group
    include Thor::Actions

-    GIT_CMD = 'git'.freeze
+    GIT_CMD = 'git'

    check_unknown_options!

@ -32,9 +34,11 @@ module Middleman::Cli
      require 'tmpdir'

      unless git_present?
-        msg =  'You need to install the git command line tool to initialize a new project. '
-        msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
-        say msg, :red
+        msg_array = [
+          'You need to install the git command line tool to initialize a new project. ',
+          "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
+        ]
+        say msg_array.join, :red
        exit 1
      end

--- a/middleman-cli/lib/middleman-cli/server.rb
+++ b/middleman-cli/lib/middleman-cli/server.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # CLI Module
 module Middleman::Cli
  # Server thor task
--- a/middleman-cli/lib/middleman-core/cli.rb
+++ b/middleman-cli/lib/middleman-core/cli.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # Backwards compat
 require 'middleman-cli'
--- a/middleman-core/Rakefile
+++ b/middleman-core/Rakefile
@ -1,3 +1,5 @@
-RAKE_ROOT = __FILE__.freeze
+# frozen_string_literal: true
+
+RAKE_ROOT = __FILE__
 GEM_NAME = ENV['NAME'] || 'middleman-core'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
--- a/middleman-core/features/support/env.rb
+++ b/middleman-core/features/support/env.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['TEST'] = 'true'

 require 'active_support/all'
--- a/middleman-core/features/support/preserve_mime_types.rb
+++ b/middleman-core/features/support/preserve_mime_types.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Around('@preserve_mime_types') do |_scenario, block|
  mime_types = ::Rack::Mime::MIME_TYPES.clone

--- a/middleman-core/fixtures/asset-hash-app/config.rb
+++ b/middleman-core/fixtures/asset-hash-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :asset_hash

 activate :relative_assets
--- a/middleman-core/fixtures/asset-hash-minified-app/config.rb
+++ b/middleman-core/fixtures/asset-hash-minified-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 configure :build do
  # Minify JavaScript on build
  activate :minify_javascript
--- a/middleman-core/fixtures/asset-hash-prefix/config.rb
+++ b/middleman-core/fixtures/asset-hash-prefix/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :asset_hash,
         prefix: 'myprefix-'

--- a/middleman-core/fixtures/asset-hash-remove-filename/config.rb
+++ b/middleman-core/fixtures/asset-hash-remove-filename/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :asset_hash,
         rename_proc: lambda do |path, _basename, digest, extension, _options|
           "#{path}#{digest}#{extension}"
--- a/middleman-core/fixtures/asset-hash-source-map/config.rb
+++ b/middleman-core/fixtures/asset-hash-source-map/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :asset_hash

 activate :relative_assets
--- a/middleman-core/fixtures/asset-host-app/config.rb
+++ b/middleman-core/fixtures/asset-host-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :asset_host, host: 'http://assets1.example.com'
--- a/middleman-core/fixtures/auto-css-app/config.rb
+++ b/middleman-core/fixtures/auto-css-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %w[
  /auto-css.html
  /auto-css
--- a/middleman-core/fixtures/auto-js-app/config.rb
+++ b/middleman-core/fixtures/auto-js-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %w[
  /auto-js.html
  /auto-js
--- a/middleman-core/fixtures/auto-js-directory-index-app/config.rb
+++ b/middleman-core/fixtures/auto-js-directory-index-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :directory_indexes
--- a/middleman-core/fixtures/automatic-directory-matcher-app/config.rb
+++ b/middleman-core/fixtures/automatic-directory-matcher-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :automatic_directory_matcher, '--'
--- a/middleman-core/fixtures/basic-data-app/config.rb
+++ b/middleman-core/fixtures/basic-data-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 data.store :static_array, ::YAML.load_file(File.expand_path('static_array.yml', File.dirname(__FILE__)))
 data.store :static_hash, ::YAML.load_file(File.expand_path('static_hash.yml', File.dirname(__FILE__)))
--- a/middleman-core/fixtures/build-with-errors-app/config.rb
+++ b/middleman-core/fixtures/build-with-errors-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :layout, false
--- a/middleman-core/fixtures/capture-html-app/config.rb
+++ b/middleman-core/fixtures/capture-html-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'slim'

 page '/capture_html_erb.html', layout: :capture_html
--- a/middleman-core/fixtures/clean-app/config-complications.rb
+++ b/middleman-core/fixtures/clean-app/config-complications.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy '/fake.html', '/real.html', layout: false

 ignore '/should_be_ignored.html'
--- a/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb
+++ b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :build_dir, '.build'

 ignore '/should_be_ignored.html'
--- a/middleman-core/fixtures/clean-app/config-hidden-dir-before.rb
+++ b/middleman-core/fixtures/clean-app/config-hidden-dir-before.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :build_dir, '.build'
--- a/middleman-core/fixtures/clean-app/config.rb
+++ b/middleman-core/fixtures/clean-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy '/fake.html', '/real.html', layout: false

 ignore '/should_be_ignored.html'
--- a/middleman-core/fixtures/clean-dir-app/config.rb
+++ b/middleman-core/fixtures/clean-dir-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :directory_indexes
--- a/middleman-core/fixtures/clean-nested-app/config.rb
+++ b/middleman-core/fixtures/clean-nested-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :build_dir, 'sub/dir'
--- a/middleman-core/fixtures/content-for-app/config.rb
+++ b/middleman-core/fixtures/content-for-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'slim'

 page '/content_for_erb.html', layout: :content_for
--- a/middleman-core/fixtures/custom-layout-app/config.rb
+++ b/middleman-core/fixtures/custom-layout-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :erb, layout_engine: :str
--- a/middleman-core/fixtures/custom-src-app/config.rb
+++ b/middleman-core/fixtures/custom-src-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :source, 'src'
--- a/middleman-core/fixtures/data-app/config.rb
+++ b/middleman-core/fixtures/data-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 data.pages.each do |p|
  proxy p.from, p.to
 end
--- a/middleman-core/fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb
+++ b/middleman-core/fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 files.watch :source, path: File.join(root, '..', 'external'),
                     destination_dir: 'my_dir'
--- a/middleman-core/fixtures/dynamic-pages-app/config.rb
+++ b/middleman-core/fixtures/dynamic-pages-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy '/fake.html', '/real.html', layout: false
 proxy 'fake2.html', '/real.html', layout: false
 proxy 'fake3.html', 'real.html', layout: false
--- a/middleman-core/fixtures/extension-api-deprecations-app/config.rb
+++ b/middleman-core/fixtures/extension-api-deprecations-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LayoutDisabler < Middleman::Extension
  def initialize(app, options_hash = {}, &block)
    super
--- a/middleman-core/fixtures/extension-hooks-app/config.rb
+++ b/middleman-core/fixtures/extension-hooks-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :layout, false

 class MyFeature < Middleman::Extension
--- a/middleman-core/fixtures/external-helpers/config.rb
+++ b/middleman-core/fixtures/external-helpers/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lib/hello_helper'
 helpers HelloHelper

--- a/middleman-core/fixtures/external-helpers/helpers/derp.rb
+++ b/middleman-core/fixtures/external-helpers/helpers/derp.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Derp
  def three
    'Three'
--- a/middleman-core/fixtures/external-helpers/helpers/four_helpers.rb
+++ b/middleman-core/fixtures/external-helpers/helpers/four_helpers.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FourHelpers
  def four
    'Four'
--- a/middleman-core/fixtures/external-helpers/helpers/one_helper.rb
+++ b/middleman-core/fixtures/external-helpers/helpers/one_helper.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OneHelper
  def one
    'One'
--- a/middleman-core/fixtures/external-helpers/helpers/yet_another_thingy.rb
+++ b/middleman-core/fixtures/external-helpers/helpers/yet_another_thingy.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module YetAnotherThingy
  def two
    'Two'
--- a/middleman-core/fixtures/external-helpers/lib/hello_helper.rb
+++ b/middleman-core/fixtures/external-helpers/lib/hello_helper.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HelloHelper
  def hello
    'Hello World'
--- a/middleman-core/fixtures/external-pipeline-error/config.rb
+++ b/middleman-core/fixtures/external-pipeline-error/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :external_pipeline,
         name: :failing,
         command: 'mv does-not-exist tmp/file.js',
--- a/middleman-core/fixtures/feature-params-app/config.rb
+++ b/middleman-core/fixtures/feature-params-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :layout, false

 class ExtensionA < ::Middleman::Extension
--- a/middleman-core/fixtures/frontmatter-app/config.rb
+++ b/middleman-core/fixtures/frontmatter-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 config[:frontmatter_delims][:yaml] << %w[\\--- \\---]
--- a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb
+++ b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ignore '*.frontmatter'

 # Reads neighbor for every file on every refresh.
--- a/middleman-core/fixtures/frontmatter-settings-app/config.rb
+++ b/middleman-core/fixtures/frontmatter-settings-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Proxy ignored.html, which should ignore itself through a frontmatter
 proxy 'proxied.html', 'ignored.html'
 page 'override_layout.html', layout: :alternate
--- a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb
+++ b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Proxy ignored.html, which should ignore itself through a frontmatter
 proxy 'proxied.html', 'ignored.html'
 proxy 'proxied_with_frontmatter.html', 'ignored.html'
--- a/middleman-core/fixtures/glob-app/config.rb
+++ b/middleman-core/fixtures/glob-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 page '/index.html', layout: false
--- a/middleman-core/fixtures/gzip-app/config.rb
+++ b/middleman-core/fixtures/gzip-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :gzip
--- a/middleman-core/fixtures/i-8859-1-app/config.rb
+++ b/middleman-core/fixtures/i-8859-1-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :encoding, 'ISO-8859-1'
--- a/middleman-core/fixtures/i18n-default-app/config.rb
+++ b/middleman-core/fixtures/i18n-default-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :i18n
--- a/middleman-core/fixtures/i18n-force-locale/config.rb
+++ b/middleman-core/fixtures/i18n-force-locale/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %i[en es].each do |locale|
  proxy "/#{locale}/index.html", 'index.html', ignore: true, lang: locale
 end
--- a/middleman-core/fixtures/i18n-mixed-sources/config.rb
+++ b/middleman-core/fixtures/i18n-mixed-sources/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :i18n, mount_at_root: :en, langs: %i[en es]
--- a/middleman-core/fixtures/import-app/config.rb
+++ b/middleman-core/fixtures/import-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 import_file File.expand_path('static.html', root), '/static2.html'

 import_path File.expand_path('bower_components/', root)
--- a/middleman-core/fixtures/indexable-app/config.rb
+++ b/middleman-core/fixtures/indexable-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :directory_indexes
 page '/leave_me_alone.html', directory_index: false

--- a/middleman-core/fixtures/large-build-app/config.rb
+++ b/middleman-core/fixtures/large-build-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 page '/spaces in file.html', layout: false

 config[:port] = 5555
--- a/middleman-core/fixtures/lorem-app/config.rb
+++ b/middleman-core/fixtures/lorem-app/config.rb
@ -1 +1,2 @@
+# frozen_string_literal: true
 # activate :minify_css
--- a/middleman-core/fixtures/manual-layout-missing/config.rb
+++ b/middleman-core/fixtures/manual-layout-missing/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :layout, :custom
--- a/middleman-core/fixtures/manual-layout-override/config.rb
+++ b/middleman-core/fixtures/manual-layout-override/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :layout, :custom

 page '/', layout: :another
--- a/middleman-core/fixtures/manual-layout/config.rb
+++ b/middleman-core/fixtures/manual-layout/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :layout, :custom
--- a/middleman-core/fixtures/markdown-app/config.rb
+++ b/middleman-core/fixtures/markdown-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :markdown, smartypants: true
--- a/middleman-core/fixtures/markdown-frontmatter-options-app/config.rb
+++ b/middleman-core/fixtures/markdown-frontmatter-options-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :markdown, smartypants: true
--- a/middleman-core/fixtures/missing-tilt-library-app/config.rb
+++ b/middleman-core/fixtures/missing-tilt-library-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 ignore 'danger-zone/*'
 ignore '*.textile'
--- a/middleman-core/fixtures/more-extensionless-text-files-app/config.rb
+++ b/middleman-core/fixtures/more-extensionless-text-files-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :directory_indexes
--- a/middleman-core/fixtures/more-frontmatter-settings-app/config.rb
+++ b/middleman-core/fixtures/more-frontmatter-settings-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :directory_indexes

 # Proxy ignored.html, which should ignore itself through a frontmatter
--- a/middleman-core/fixtures/more-traversal-app/config.rb
+++ b/middleman-core/fixtures/more-traversal-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :directory_indexes

 proxy '/sub/fake.html', '/proxied.html', ignore: true
--- a/middleman-core/fixtures/multiple-data-sources-app/config.rb
+++ b/middleman-core/fixtures/multiple-data-sources-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 files.watch :data, path: File.join(root, 'data0'), priority: 100
 files.watch :data, path: File.join(root, 'data1')
 files.watch :data, path: File.join(root, 'data2')
--- a/middleman-core/fixtures/multiple-sources-app/config.rb
+++ b/middleman-core/fixtures/multiple-sources-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 files.watch :source, path: File.join(root, 'source0'), priority: 100
 files.watch :source, path: File.join(root, 'source1')
 files.watch :source, path: File.join(root, 'source2')
--- a/middleman-core/fixtures/multiple-sources-with-destination-dir/config.rb
+++ b/middleman-core/fixtures/multiple-sources-with-destination-dir/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 files.watch :source, path: File.join(root, 'external'),
                     destination_dir: 'external'
--- a/middleman-core/fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
+++ b/middleman-core/fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 files.watch :source, path: File.join(root, 'source2'),
                     destination_dir: 'source2'
--- a/middleman-core/fixtures/multiple-sources-without-destination-dir/config.rb
+++ b/middleman-core/fixtures/multiple-sources-without-destination-dir/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 files.watch :source, path: File.join(root, 'external')
--- a/middleman-core/fixtures/nested-data-app/config.rb
+++ b/middleman-core/fixtures/nested-data-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :layout, false
--- a/middleman-core/fixtures/nested-layout-app/config.rb
+++ b/middleman-core/fixtures/nested-layout-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 set :layout, :inner
--- a/middleman-core/fixtures/padrino-helpers-app/config.rb
+++ b/middleman-core/fixtures/padrino-helpers-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 helpers do
  def title
    content_tag :h1 do
--- a/middleman-core/fixtures/page-classes-app/config.rb
+++ b/middleman-core/fixtures/page-classes-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 page '/sub1/page-classes.html', layout: false
 page '/sub1/sub2/page-classes.html', layout: false
--- a/middleman-core/fixtures/page-helper-layout-block-app/config.rb
+++ b/middleman-core/fixtures/page-helper-layout-block-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 page '/path/*', layout: 'alt'

 # Doesn't work, and shouldn't
--- a/middleman-core/fixtures/page-id-app/config-proc.rb
+++ b/middleman-core/fixtures/page-id-app/config-proc.rb
@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 %w[1 2 3].each do |n|
  proxy "/#{n}.html", '/index.html', id: "page#{n}"
 end

 page '/overwrites/*', id: :"something-else"

-config[:page_id_generator] = ->(path) { path + '-foo' }
+config[:page_id_generator] = ->(path) { "#{path}-foo" }
--- a/middleman-core/fixtures/page-id-app/config.rb
+++ b/middleman-core/fixtures/page-id-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %w[1 2 3].each do |n|
  proxy "/#{n}.html", '/index.html', id: "page#{n}"
 end
--- a/middleman-core/fixtures/proxy-pages-app/config.rb
+++ b/middleman-core/fixtures/proxy-pages-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy '/fake.html', '/real.html', layout: false
 proxy 'fake2.html', '/real.html', layout: false
 proxy 'fake3.html', 'real.html', layout: false
--- a/middleman-core/fixtures/redirect-app/config.rb
+++ b/middleman-core/fixtures/redirect-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 redirect 'external.html', to: 'http://example.com'
--- a/middleman-core/fixtures/relative-assets-app/config.rb
+++ b/middleman-core/fixtures/relative-assets-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :fonts_dir, 'fonts'

 configure :build do
--- a/middleman-core/fixtures/sass-assets-path-app/config.rb
+++ b/middleman-core/fixtures/sass-assets-path-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :sass_assets_paths, [
  File.join(root, 'assets', 'stylesheets'),
  File.join(root, 'my-vendor', 'stylesheets')
--- a/middleman-core/fixtures/traversal-app/config.rb
+++ b/middleman-core/fixtures/traversal-app/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy '/sub/fake.html', '/proxied.html', ignore: true
 proxy '/sub/fake2.html', '/proxied.html', ignore: true

--- a/middleman-core/fixtures/v4-extension-callbacks/config.rb
+++ b/middleman-core/fixtures/v4-extension-callbacks/config.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ExtensionOne < ::Middleman::Extension
  helpers do
    def extension_two_was_activated
--- a/middleman-core/fixtures/wildcard-app/config.rb
+++ b/middleman-core/fixtures/wildcard-app/config.rb
@ -1 +1,3 @@
+# frozen_string_literal: true
+
 page '/admin/*', layout: :admin
--- a/middleman-core/fixtures/wildcard-directory-index-app/config.rb
+++ b/middleman-core/fixtures/wildcard-directory-index-app/config.rb
@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 activate :directory_indexes
 page '/admin/*', layout: :admin
--- a/middleman-core/lib/middleman-core.rb
+++ b/middleman-core/lib/middleman-core.rb
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Setup our load paths
 libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
--- a/Show More
+++ b/Show More