Deal with frozen string literals (#2620)

In future Ruby is going to encourage frozen string literals

Author: CamJN

.github/workflows/main.yml

@@ -55,7 +55,7 @@ jobs:
           cp test/config.json.github-ci-linux test/config.json
 
       - name: Build C++ tests
-        run: bundle exec drake -j4 test:cxx:build
+        run: bundle exec rake -m -j4 test:cxx:build
         timeout-minutes: 5
 
       - name: Run C++ tests
@@ -134,7 +134,7 @@ jobs:
           cp test/config.json.github-ci-linux test/config.json
 
       - name: Build C++ tests
-        run: bundle exec drake -j4 test:cxx:build
+        run: bundle exec rake -m -j4 test:cxx:build
         timeout-minutes: 5
 
       - name: Run C++ tests
@@ -240,7 +240,7 @@ jobs:
           sed "s|_USER_|$(whoami)|" test/config.json.github-ci-macos > test/config.json
 
       - name: Build C++ tests
-        run: bundle exec drake -j4 test:cxx:build
+        run: bundle exec rake -m -j4 test:cxx:build
         timeout-minutes: 5
 
       - name: Run C++ tests
@@ -397,7 +397,7 @@ jobs:
           SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
 
       - name: Test module installation as normal user
-        run: ./bin/passenger-install-apache2-module --auto --force-colors --rake-command 'bundle exec drake -j4'
+        run: ./bin/passenger-install-apache2-module --auto --force-colors --rake-command 'bundle exec rake -m -j4'
         timeout-minutes: 5
 
       - name: Teardown sccache
@@ -517,7 +517,7 @@ jobs:
           --force-colors
           --prefix=/tmp/nginx
           --auto-download
-          --rake-command 'bundle exec drake -j4'
+          --rake-command 'bundle exec rake -m -j4'
           --make-concurrency 4
         timeout-minutes: 5
 
@@ -596,7 +596,7 @@ jobs:
           echo "NGINX_ADDON_DIR=$NGINX_ADDON_DIR" >> "$GITHUB_ENV"
 
       - name: Compile module
-        run: bundle exec drake -j4 nginx:as_dynamic_module
+        run: bundle exec rake -m -j4 nginx:as_dynamic_module
         timeout-minutes: 5
 
       - name: Download Nginx source
@@ -674,11 +674,11 @@ jobs:
         timeout-minutes: 2
 
       - name: Compile prerequisites
-        run: bundle exec drake -j4 nginx
+        run: bundle exec rake -m -j4 nginx
         timeout-minutes: 5
 
       - name: Integration test
-        run: bundle exec drake -j4 test:integration:standalone
+        run: bundle exec rake -m -j4 test:integration:standalone
         timeout-minutes: 8
 
       - name: Teardown sccache
@@ -745,7 +745,7 @@ jobs:
         timeout-minutes: 2
 
       - name: Compile
-        run: bundle exec drake -j4 agent
+        run: bundle exec rake -m -j4 agent
         timeout-minutes: 5
 
       - name: Test
@@ -821,8 +821,8 @@ jobs:
       - name: Check whether formula is up-to-date
         run: >
           ./packaging/homebrew/verify-oss-formula-uptodate
-          -c homebrew-core.git
-          -r upstream
+          -c /opt/homebrew/Library/Taps/homebrew/homebrew-core
+          -r origin
         timeout-minutes: 5
 
       - name: Modify formula
@@ -840,7 +840,7 @@ jobs:
           -p .
           -f pkg/passenger.rb
           -t pkg/*.tar.gz
-        timeout-minutes: 6
+        timeout-minutes: 7
 
   source_packaging:
     name: Source packaging tests

CHANGELOG

@@ -1,5 +1,6 @@
 Release 6.1.1 (Not yet released)
 -------------
+ * [Ruby] Improve support for Ruby 4 and Frozen String Literals. Closes GH-2619.
  * [Ubuntu] Add packages for Ubuntu 25.10 "questing", remove packages for Ubuntu 25.04 "plucky".
  * Upgrade Boost from 1.87 -> 1.89.
  * [Nginx] Upgrades preferred Nginx to 1.28.0 from 1.26.3.

Gemfile

@@ -8,9 +8,10 @@ ruby '>= 2.5'
 gemspec
 
 group :development do
+  gem 'cgi'
+  gem 'logger'
   gem 'json'
   gem 'mime-types', '~> 3.5.1'
-  gem 'drake'
   gem 'rspec', '~> 3.12.0'
   gem 'rspec-collection_matchers'
   gem 'webrick', '~> 1.8.1'

Gemfile.lock

@@ -9,21 +9,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    comp_tree (1.1.3)
-    diff-lcs (1.5.1)
-    drake (0.9.2.0.3.1)
-      comp_tree (>= 1.1.3)
-    gpgme (2.0.24)
+    cgi (0.5.1)
+    diff-lcs (1.6.2)
+    gpgme (2.0.25)
       mini_portile2 (~> 2.7)
-    json (2.7.2)
+    json (2.18.0)
+    logger (1.7.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+    mime-types-data (3.2025.0924)
     mini_portile2 (2.8.9)
-    rack (3.1.8)
-    rackup (2.2.1)
+    rack (3.2.4)
+    rackup (2.3.1)
       rack (>= 3)
-    rake (13.2.1)
+    rake (13.3.1)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -47,9 +46,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  drake
+  cgi
   gpgme
   json
+  logger
   mime-types (~> 3.5.1)
   passenger!
   rspec (~> 3.12.0)

bin/passenger-install-apache2-module

@@ -421,7 +421,7 @@ private
         # Running apache2:clean deletes some object files needed
         # by passenger-install-nginx-module, so we ensure those
         # object files are compiled.
-        command << " nginx"
+        command += " nginx"
       end
       return sh(command)
     else
@@ -435,14 +435,14 @@ private
   end
 
   def config_snippet
-    result = "<IfModule mod_passenger.c>\n" +
-      "  PassengerRoot #{PhusionPassenger.install_spec}\n" +
-      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}\n"
+    result = ["<IfModule mod_passenger.c>",
+      "  PassengerRoot #{PhusionPassenger.install_spec}",
+      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}"]
     if PhusionPassenger.packaging_method == "rpm"
-      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg\n"
+      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg"
     end
     result << "</IfModule>"
-    result
+    result.join("\n")
   end
 
   def apache2_config_snippets
@@ -574,18 +574,14 @@ private
   end
 
   def remove_duplicate_comment_blocks(filename, begin_marker, end_marker)
-    contents = File.open(filename, "rb") do |f|
-      f.read
-    end
+    contents = File.binread(filename)
     regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
     if m = regexp.match(contents)
       offset = m.end(0)
-      rest = contents.slice!(m.end(0) .. -1)
+      rest = contents.slice!(offset .. -1)
       rest.gsub!(regexp, '')
       contents << rest
-      File.open(filename, "wb") do |f|
-        f.write(contents)
-      end
+      File.binwrite(filename, contents)
     end
   end
 
@@ -916,9 +912,9 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("-a", "--auto", String, "Automatically build the Apache module,\n" <<
-          "#{indent}without interactively asking for user\n" <<
-          "#{indent}input.") do
+  opts.on("-a", "--auto", String, ["Automatically build the Apache module,",
+          "#{indent}without interactively asking for user",
+          "#{indent}input."].join("\n")) do
     options[:auto] = true
   end
   opts.on("--apxs2-path PATH", String, "Path to 'apxs2' command.") do |value|
@@ -927,9 +923,9 @@ parser = OptionParser.new do |opts|
   opts.on("--apr-config-path PATH", String, "Path to 'apr-config' command.") do |value|
     ENV['APR_CONFIG'] = value
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--no-compile", "Skip compilation.") do

bin/passenger-install-nginx-module

@@ -525,10 +525,7 @@ private
   def insert_passenger_config_snippets(prefix)
     config_file = locate_nginx_config_file(prefix)
     contents = File.read(config_file)
-    contents.sub!(/^http \{/,
-      "http {\n" <<
-      "    passenger_root #{PhusionPassenger.install_spec};\n" <<
-      "    passenger_ruby #{PlatformInfo.ruby_command};\n")
+    contents.sub!(/^http \{/, "http {\n    passenger_root #{PhusionPassenger.install_spec};\n    passenger_ruby #{PlatformInfo.ruby_command};\n")
     File.open(config_file, 'w') do |f|
       f.write(contents)
     end
@@ -556,20 +553,20 @@ private
     ].compact.join(" ").strip
 
     command = "sh ./configure --prefix='#{prefix}' "
-    command << "--with-http_ssl_module "
-    command << "--with-http_v2_module "
-    command << "--with-http_realip_module "
-    command << "--with-http_gzip_static_module "
-    command << "--with-http_stub_status_module "
-    command << "--with-http_addition_module "
-    command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
-    command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
+    command += "--with-http_ssl_module "
+    command += "--with-http_v2_module "
+    command += "--with-http_realip_module "
+    command += "--with-http_gzip_static_module "
+    command += "--with-http_stub_status_module "
+    command += "--with-http_addition_module "
+    command += "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+    command += "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
     if @pcre_source_dir
-      command << "--with-pcre='#{@pcre_source_dir}' "
+      command += "--with-pcre='#{@pcre_source_dir}' "
     elsif !pcre_is_installed?
-      command << "--without-http_rewrite_module "
+      command += "--without-http_rewrite_module "
     end
-    command << "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
+    command += "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
     command.strip!
     return command
   end
@@ -583,11 +580,15 @@ private
           end
           Dir.chdir("#{safe_tmpdir}") do
             # Nginx checks for PCRE in multiple places...
-            system("(gcc -I/usr/local/include -I/usr/include/pcre2 " <<
-              "-I/usr/pkg/include -I/opt/local/include " <<
-              "-I/opt/homebrew/include " <<
-              "-DPCRE2_CODE_UNIT_WIDTH=8 " <<
-              "-c passenger-check.c) >/dev/null 2>/dev/null")
+            system(["gcc",
+                    "-I/usr/local/include",
+                    "-I/usr/include/pcre2",
+                    "-I/usr/pkg/include",
+                    "-I/opt/local/include",
+                    "-I/opt/homebrew/include",
+                    "-DPCRE2_CODE_UNIT_WIDTH=8",
+                    "-c", "passenger-check.c",
+                    ">/dev/null", "2>/dev/null"].join(' '))
           end
         ensure
           File.unlink("#{safe_tmpdir}/passenger-check.c") rescue nil
@@ -602,8 +603,7 @@ private
     # We do this instead of using #file, for Ruby 1.8.5 support.
     digest = Digest::SHA256.new
     File.open(path, "rb") do |f|
-      buf = ''
-      buf.force_encoding('binary') if buf.respond_to?(:force_encoding)
+      buf = String.new(encoding: Encoding::BINARY)
       while !f.eof?
         f.read(1024 * 16, buf)
         digest.update(buf)
@@ -625,33 +625,31 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("--auto", "Automatically confirm 'Press ENTER to\n" <<
-          "#{indent}continue' prompts.") do
+  opts.on("--auto", "Automatically confirm 'Press ENTER to\n#{indent}continue' prompts.") do
     options[:auto] = true
   end
-  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n" <<
-          "#{indent}of asking for it interactively.") do |dir|
+  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n#{indent}of asking for it interactively.") do |dir|
     options[:prefix] = dir
   end
-  opts.on("--auto-download", "Download and install Nginx automatically,\n" <<
-          "#{indent}instead of asking interactively whether to\n" <<
-          "#{indent}download+install or to use an existing\n" <<
-          "#{indent}Nginx source directory.") do
+  opts.on("--auto-download", ["Download and install Nginx automatically,",
+          "#{indent}instead of asking interactively whether to",
+          "#{indent}download+install or to use an existing",
+          "#{indent}Nginx source directory."].join("\n")) do
     options[:auto_download] = true
   end
-  opts.on("--nginx-source-dir=DIR", String, "Compile and install Nginx using the given\n" <<
-          "#{indent}Nginx source directory, instead of\n" <<
-          "#{indent}interactively asking to download+install\n" <<
-          "#{indent}or to use an existing Nginx source\n" <<
-          "#{indent}directory. Conflicts with --auto-download.") do |dir|
+  opts.on("--nginx-source-dir=DIR", String, ["Compile and install Nginx using the given",
+          "#{indent}Nginx source directory, instead of",
+          "#{indent}interactively asking to download+install",
+          "#{indent}or to use an existing Nginx source",
+          "#{indent}directory. Conflicts with --auto-download."].join("\n")) do |dir|
     options[:nginx_source_dir] = dir
   end
-  opts.on("--extra-configure-flags=STRING", String, "Pass these extra flags to Nginx's\n" <<
-          "#{indent}'configure' script, instead of asking for\n" <<
-          "#{indent}it interactively. Specify 'none' if you\n" <<
-          "#{indent}do not want to pass additional flags but do\n" <<
-          "#{indent}not want this installer to ask\n" <<
-          "#{indent}interactively either.") do |flags|
+  opts.on("--extra-configure-flags=STRING", String, ["Pass these extra flags to Nginx's",
+          "#{indent}'configure' script, instead of asking for",
+          "#{indent}it interactively. Specify 'none' if you",
+          "#{indent}do not want to pass additional flags but do",
+          "#{indent}not want this installer to ask",
+          "#{indent}interactively either."].join("\n")) do |flags|
     options[:extra_configure_flags] = flags
   end
   opts.on("--rake-command COMMAND", String, "Customize Rake command to use") do |value|
@@ -660,9 +658,9 @@ parser = OptionParser.new do |opts|
   opts.on("--make-concurrency N", Integer, "Use N parallel jobs when running 'make'.") do |n|
     options[:make_concurrency] = n
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--force-colors", "Display colors even if stdout is not a TTY") do