From 1f37d846a91e4048367f6185371ec0abb523712c Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 13 Aug 2017 22:02:48 +0900 Subject: Use frozen string literal in guides/ --- .rubocop.yml | 1 + guides/Rakefile | 2 ++ guides/bug_report_templates/action_controller_gem.rb | 2 ++ guides/bug_report_templates/action_controller_master.rb | 2 ++ guides/bug_report_templates/active_job_gem.rb | 2 ++ guides/bug_report_templates/active_job_master.rb | 2 ++ guides/bug_report_templates/active_record_gem.rb | 2 ++ guides/bug_report_templates/active_record_master.rb | 2 ++ guides/bug_report_templates/active_record_migrations_gem.rb | 2 ++ guides/bug_report_templates/active_record_migrations_master.rb | 2 ++ guides/bug_report_templates/benchmark.rb | 2 ++ guides/bug_report_templates/generic_gem.rb | 2 ++ guides/bug_report_templates/generic_master.rb | 2 ++ guides/rails_guides.rb | 2 ++ guides/rails_guides/generator.rb | 2 ++ guides/rails_guides/helpers.rb | 2 ++ guides/rails_guides/indexer.rb | 2 ++ guides/rails_guides/kindle.rb | 1 + guides/rails_guides/levenshtein.rb | 2 ++ guides/rails_guides/markdown.rb | 2 ++ guides/rails_guides/markdown/renderer.rb | 2 ++ guides/w3c_validator.rb | 2 ++ 22 files changed, 42 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index b21013dba9..f1107acb93 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -92,6 +92,7 @@ Style/FrozenStringLiteralComment: - 'actionmailer/**/*' - 'actionview/**/*' - 'actionpack/**/*' + - 'guides/**/*' Exclude: - 'actionview/test/**/*.builder' - 'actionview/test/**/*.ruby' diff --git a/guides/Rakefile b/guides/Rakefile index 3a6f10040f..84e18e0972 100644 --- a/guides/Rakefile +++ b/guides/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :guides do desc 'Generate guides (for authors), use ONLY=foo to process just "foo.md"' task generate: "generate:html" diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb index 8b7aa893fd..4d8d8db3e5 100644 --- a/guides/bug_report_templates/action_controller_gem.rb +++ b/guides/bug_report_templates/action_controller_gem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb index 3dd66c95ec..1f862e07da 100644 --- a/guides/bug_report_templates/action_controller_master.rb +++ b/guides/bug_report_templates/action_controller_master.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_job_gem.rb b/guides/bug_report_templates/active_job_gem.rb index 252b270a0c..af777a86ef 100644 --- a/guides/bug_report_templates/active_job_gem.rb +++ b/guides/bug_report_templates/active_job_gem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb index 7591470440..39fb3f60a6 100644 --- a/guides/bug_report_templates/active_job_master.rb +++ b/guides/bug_report_templates/active_job_master.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb index 61d4e8d395..168e2dcc66 100644 --- a/guides/bug_report_templates/active_record_gem.rb +++ b/guides/bug_report_templates/active_record_gem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb index 8bbc1ef19e..cbd2cff2b8 100644 --- a/guides/bug_report_templates/active_record_master.rb +++ b/guides/bug_report_templates/active_record_master.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb index 00ba3c1cd6..b931ed0beb 100644 --- a/guides/bug_report_templates/active_record_migrations_gem.rb +++ b/guides/bug_report_templates/active_record_migrations_gem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb index 52c9028b0f..2c009c0563 100644 --- a/guides/bug_report_templates/active_record_migrations_master.rb +++ b/guides/bug_report_templates/active_record_migrations_master.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb index a0b541d012..d0f5a634bc 100644 --- a/guides/bug_report_templates/benchmark.rb +++ b/guides/bug_report_templates/benchmark.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb index 4dcd04ea27..c990bda005 100644 --- a/guides/bug_report_templates/generic_gem.rb +++ b/guides/bug_report_templates/generic_gem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb index ed45726e92..1a9b99b624 100644 --- a/guides/bug_report_templates/generic_master.rb +++ b/guides/bug_report_templates/generic_master.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "bundler/inline" rescue LoadError => e diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb index 0f611c8f2b..f2d4d6f647 100644 --- a/guides/rails_guides.rb +++ b/guides/rails_guides.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + $:.unshift __dir__ as_lib = File.expand_path("../activesupport/lib", __dir__) diff --git a/guides/rails_guides/generator.rb b/guides/rails_guides/generator.rb index 35f014747c..7205f37be7 100644 --- a/guides/rails_guides/generator.rb +++ b/guides/rails_guides/generator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "set" require "fileutils" diff --git a/guides/rails_guides/helpers.rb b/guides/rails_guides/helpers.rb index 520aa7f7cc..a6970fb90c 100644 --- a/guides/rails_guides/helpers.rb +++ b/guides/rails_guides/helpers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "yaml" module RailsGuides diff --git a/guides/rails_guides/indexer.rb b/guides/rails_guides/indexer.rb index c58b6b85a2..c707464cdf 100644 --- a/guides/rails_guides/indexer.rb +++ b/guides/rails_guides/indexer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "active_support/core_ext/object/blank" require "active_support/core_ext/string/inflections" diff --git a/guides/rails_guides/kindle.rb b/guides/rails_guides/kindle.rb index 9536d0bd3b..87a369a15a 100644 --- a/guides/rails_guides/kindle.rb +++ b/guides/rails_guides/kindle.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require "kindlerb" require "nokogiri" diff --git a/guides/rails_guides/levenshtein.rb b/guides/rails_guides/levenshtein.rb index 40c6a5c372..bafa6bfe9d 100644 --- a/guides/rails_guides/levenshtein.rb +++ b/guides/rails_guides/levenshtein.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module RailsGuides module Levenshtein # This code is based directly on the Text gem implementation. diff --git a/guides/rails_guides/markdown.rb b/guides/rails_guides/markdown.rb index 02d58601c4..84f95eec68 100644 --- a/guides/rails_guides/markdown.rb +++ b/guides/rails_guides/markdown.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "redcarpet" require "nokogiri" require "rails_guides/markdown/renderer" diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb index 7ac3d417a4..1f2fe91ea1 100644 --- a/guides/rails_guides/markdown/renderer.rb +++ b/guides/rails_guides/markdown/renderer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module RailsGuides class Markdown class Renderer < Redcarpet::Render::HTML diff --git a/guides/w3c_validator.rb b/guides/w3c_validator.rb index 4671e040ca..f38b6c2639 100644 --- a/guides/w3c_validator.rb +++ b/guides/w3c_validator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # --------------------------------------------------------------------------- # # This script validates the generated guides against the W3C Validator. -- cgit v1.2.3 From ef2016f8885ccd30c37ca97e76786503325f4e81 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 13 Aug 2017 21:41:05 +0900 Subject: Use frozen string literal in tasks/ --- .rubocop.yml | 1 + tasks/release.rb | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index f1107acb93..f84014d83a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -93,6 +93,7 @@ Style/FrozenStringLiteralComment: - 'actionview/**/*' - 'actionpack/**/*' - 'guides/**/*' + - 'tasks/**/*' Exclude: - 'actionview/test/**/*.builder' - 'actionview/test/**/*.ruby' diff --git a/tasks/release.rb b/tasks/release.rb index 6ff37fb415..aa8ba44c1a 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FRAMEWORKS = %w( activesupport activemodel activerecord actionview actionpack activejob actionmailer actioncable activestorage railties ) FRAMEWORK_NAMES = Hash.new { |h, k| k.split(/(?<=active|action)/).map(&:capitalize).join(" ") } @@ -72,9 +74,9 @@ npm_version = version.gsub(/\./).with_index { |s, i| i >= 2 ? "-" : s } task gem => %w(update_versions pkg) do cmd = "" - cmd << "cd #{framework} && " unless framework == "rails" - cmd << "bundle exec rake package && " unless framework == "rails" - cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/" + cmd += "cd #{framework} && " unless framework == "rails" + cmd += "bundle exec rake package && " unless framework == "rails" + cmd += "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/" sh cmd end @@ -104,7 +106,7 @@ namespace :changelog do current_contents = File.read(fname) header = "## Rails #{version} (#{Date.today.strftime('%B %d, %Y')}) ##\n\n" - header << "* No changes.\n\n\n" if current_contents =~ /\A##/ + header += "* No changes.\n\n\n" if current_contents =~ /\A##/ contents = header + current_contents File.open(fname, "wb") { |f| f.write contents } end -- cgit v1.2.3 From 7d85e0f95cbc75fe0a6f10d1b9c575e415868857 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 13 Aug 2017 21:55:53 +0900 Subject: Use frozen string literal in tools/ --- .rubocop.yml | 1 + tools/console | 2 ++ tools/profile | 2 ++ tools/test.rb | 2 ++ 4 files changed, 7 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index f84014d83a..cc725637ee 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -94,6 +94,7 @@ Style/FrozenStringLiteralComment: - 'actionpack/**/*' - 'guides/**/*' - 'tasks/**/*' + - 'tools/**/*' Exclude: - 'actionview/test/**/*.builder' - 'actionview/test/**/*.ruby' diff --git a/tools/console b/tools/console index 58c76fb1b6..ee08e22502 100755 --- a/tools/console +++ b/tools/console @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require "bundler" Bundler.setup diff --git a/tools/profile b/tools/profile index 01e513c67a..6fb571f43b 100755 --- a/tools/profile +++ b/tools/profile @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + # Profile require calls giving information about the time and the files that are called # when loading the provided file. # diff --git a/tools/test.rb b/tools/test.rb index 774e4ec6c7..1fd3ee30eb 100644 --- a/tools/test.rb +++ b/tools/test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + $: << File.expand_path("test", COMPONENT_ROOT) require "bundler" -- cgit v1.2.3 From 0ea00bb5b0d57c635350231eeeb2336b7cbcc4b8 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 13 Aug 2017 22:07:54 +0900 Subject: Use frozen string literal in ci/ --- .rubocop.yml | 1 + ci/travis.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index cc725637ee..ac8623638c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -92,6 +92,7 @@ Style/FrozenStringLiteralComment: - 'actionmailer/**/*' - 'actionview/**/*' - 'actionpack/**/*' + - 'ci/**/*' - 'guides/**/*' - 'tasks/**/*' - 'tools/**/*' diff --git a/ci/travis.rb b/ci/travis.rb index 2313bece60..b124358789 100755 --- a/ci/travis.rb +++ b/ci/travis.rb @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require "fileutils" include FileUtils -- cgit v1.2.3 From d17264d93f4278319e60ee20c4e29dc54be343e4 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 13 Aug 2017 22:14:22 +0900 Subject: Use frozen string literal in root files --- .rubocop.yml | 14 +------------- Gemfile | 2 ++ Rakefile | 2 ++ rails.gemspec | 2 ++ version.rb | 2 ++ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ac8623638c..88d52c68be 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -83,20 +83,8 @@ Style/FrozenStringLiteralComment: Enabled: true EnforcedStyle: always Include: - - 'activesupport/**/*' - - 'activemodel/**/*' - - 'actioncable/**/*' - - 'activejob/**/*' - - 'activerecord/**/*' - - 'activestorage/**/*' - - 'actionmailer/**/*' - - 'actionview/**/*' - - 'actionpack/**/*' - - 'ci/**/*' - - 'guides/**/*' - - 'tasks/**/*' - - 'tools/**/*' Exclude: + - 'railties/**/*' - 'actionview/test/**/*.builder' - 'actionview/test/**/*.ruby' - 'actionpack/test/**/*.builder' diff --git a/Gemfile b/Gemfile index 5e7d9b5b2e..7fc8aa7552 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } diff --git a/Rakefile b/Rakefile index 1421851900..a67f8fd028 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "net/http" $:.unshift __dir__ diff --git a/rails.gemspec b/rails.gemspec index 31eee025bf..4b57377871 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -1,3 +1,5 @@ +# frozen_string_literal: true + version = File.read(File.expand_path("RAILS_VERSION", __dir__)).strip Gem::Specification.new do |s| diff --git a/version.rb b/version.rb index 7bacf2e0ba..92b5e0392a 100644 --- a/version.rb +++ b/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Rails # Returns the version of the currently loaded Rails as a Gem::Version def self.gem_version -- cgit v1.2.3