passenger 6.1.3 → 6.1.5

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/ruby.rb

@@ -24,7 +24,7 @@ define 'ruby-dev' do
     end
   end
 
-  if ruby_command =~ %r(^/usr/bin/ruby) || ruby_command =~ %r(^/System/Library/Frameworks/Ruby.framework)
+  if ruby_command =~ %r{^/usr/bin/ruby} || ruby_command =~ %r{^/System/Library/Frameworks/Ruby.framework}
     # Only tell user to install the headers with the system's package manager
     # if Ruby itself was installed with the package manager.
     on :debian do
@@ -57,13 +57,13 @@ define 'ruby-openssl' do
   define_checker do
     begin
       require 'openssl'
-      { :found => true }
+      { found: true }
     rescue LoadError
       false
     end
   end
 
-  if ruby_command =~ %r(^/usr/bin/ruby)
+  if ruby_command =~ %r{^/usr/bin/ruby}
     # Only tell user to install ruby-openssl with the system's package manager
     # if Ruby itself was installed with the package manager.
     on :debian do
@@ -78,7 +78,7 @@ define 'rubygems' do
   define_checker do
     begin
       require 'rubygems'
-      { :found => true }
+      { found: true }
     rescue LoadError
       false
     end
@@ -86,7 +86,7 @@ define 'rubygems' do
 
   install_instructions "Please download it from <b>#{website}</b>. " +
     "Extract the tarball, and run <b>ruby setup.rb</b>"
-  if ruby_command =~ %r(^/usr/bin/ruby)
+  if ruby_command =~ %r{^/usr/bin/ruby}
     # Only tell user to install RubyGems with the system's package manager
     # if Ruby itself was installed with the package manager.
     #
@@ -121,7 +121,7 @@ define 'rake' do
     end
   end
 
-  if ruby_command =~ %r(^/usr/bin/ruby)
+  if ruby_command =~ %r{^/usr/bin/ruby}
     # Only tell user to install Rake with the system's package manager
     # if Ruby itself was installed with the package manager.
     on :debian do
@@ -131,7 +131,7 @@ define 'rake' do
       urpmi "rake"
     end
     on :redhat do
-      yum_install "rubygem-rake", :epel => true
+      yum_install "rubygem-rake", epel: true
     end
   end
   on :other_platforms do

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/utilities.rb

@@ -12,4 +12,4 @@ define 'download-tool' do
   on :other_platforms do
     install_instructions "Please install either wget (http://www.gnu.org/software/wget/) or curl (http://curl.haxx.se/)."
   end
-end
+end

data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -33,9 +34,9 @@ module PhusionPassenger
     def self.linux_distro
       tags = linux_distro_tags
       if tags
-        return tags.first
+        tags.first
       else
-        return nil
+        nil
       end
     end
 
@@ -49,36 +50,36 @@ module PhusionPassenger
       end
       lsb_release = read_file("/etc/lsb-release")
       if lsb_release =~ /Ubuntu/
-        return [:ubuntu, :debian]
+        [ :ubuntu, :debian ]
       elsif File.exist?("/etc/debian_version")
-        return [:debian]
+        [ :debian ]
       elsif File.exist?("/etc/redhat-release")
         redhat_release = read_file("/etc/redhat-release")
         if redhat_release =~ /CentOS|AlmaLinux|Rocky Linux/
           # For now treat all non-RHEL enterprise linux distros the same
-          return [:centos, :redhat]
+          [ :centos, :redhat ]
         elsif redhat_release =~ /Fedora/
-          return [:fedora, :redhat]
+          [ :fedora, :redhat ]
         elsif redhat_release =~ /Mandriva/
-          return [:mandriva, :redhat]
+          [ :mandriva, :redhat ]
         else
           # On official RHEL distros, the content is in the form of
           # "Red Hat Enterprise Linux Server release 5.1 (Tikanga)"
-          return [:rhel, :redhat]
+          [ :rhel, :redhat ]
         end
       elsif File.exist?("/etc/system-release")
         system_release = read_file("/etc/system-release")
         if system_release =~ /Amazon Linux/
-          return [:amazon, :redhat]
+          [ :amazon, :redhat ]
         else
-          return [:unknown]
+          [ :unknown ]
         end
       elsif File.exist?("/etc/suse-release")
-        return [:suse]
+        [ :suse ]
       elsif File.exist?("/etc/gentoo-release")
-        return [:gentoo]
+        [ :gentoo ]
       else
-        return [:unknown]
+        [ :unknown ]
       end
       # TODO: Slackware
     end

data/src/ruby_supportlib/phusion_passenger/platform_info/networking.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2017-2025 Asynchronous B.V.
 #
@@ -73,18 +74,18 @@ module PhusionPassenger
       case os_name_simple
       when 'linux'
         {
-          :ipv4 => default_network_interface_linux_for_ip_type(:ipv4),
-          :ipv6 => default_network_interface_linux_for_ip_type(:ipv6)
+          ipv4: default_network_interface_linux_for_ip_type(:ipv4),
+          ipv6: default_network_interface_linux_for_ip_type(:ipv6),
         }
       when 'macosx', 'freebsd'
         {
-          :ipv4 => default_network_interface_bsd_for_ip_type(:ipv4),
-          :ipv6 => default_network_interface_bsd_for_ip_type(:ipv6)
+          ipv4: default_network_interface_bsd_for_ip_type(:ipv4),
+          ipv6: default_network_interface_bsd_for_ip_type(:ipv6),
         }
       else
         {
-          :ipv4 => :unknown,
-          :ipv6 => :unknown
+          ipv4: :unknown,
+          ipv6: :unknown,
         }
       end
     end
@@ -106,11 +107,11 @@ module PhusionPassenger
             device = elems[1].sub(/:$/, '')
             flags = parse_bsd_or_linux_ifconfig_flags(elems[2])
             current_iface = {
-              :device => device,
-              :type   => flags.include?(:loopback) ? :loopback : :unknown,
-              :flags  => flags,
-              :ipv4   => [],
-              :ipv6   => []
+              device: device,
+              type: flags.include?(:loopback) ? :loopback : :unknown,
+              flags: flags,
+              ipv4: [],
+              ipv6: [],
             }
             result[device] = current_iface
 
@@ -125,11 +126,11 @@ module PhusionPassenger
               actual_iface = current_iface
             else
               actual_iface = (result[device] ||= {
-                :device => device,
-                :type   => :unknown,
-                :flags  => [],
-                :ipv4   => [],
-                :ipv6   => []
+                device: device,
+                type: :unknown,
+                flags: [],
+                ipv4: [],
+                ipv6: [],
               })
             end
             actual_iface[:ipv4] << ip
@@ -146,11 +147,11 @@ module PhusionPassenger
         next if !File.directory?(path)
         device = File.basename(path)
         iface = (result[device] ||= {
-          :device => device,
-          :type   => :unknown,
-          :flags  => [],
-          :ipv4   => [],
-          :ipv6   => []
+          device: device,
+          type: :unknown,
+          flags: [],
+          ipv4: [],
+          ipv6: [],
         })
 
         if iface[:type] == :unknown && File.exist?("#{path}/type")
@@ -212,11 +213,11 @@ module PhusionPassenger
           device = elems[0].chomp(':')
           flags = parse_bsd_or_linux_ifconfig_flags(elems[1])
           current_interface = {
-            :device => device,
-            :type   => flags.include?(:loopback) ? :loopback : :unknown,
-            :flags  => flags,
-            :ipv4   => [],
-            :ipv6   => []
+            device: device,
+            type: flags.include?(:loopback) ? :loopback : :unknown,
+            flags: flags,
+            ipv4: [],
+            ipv6: [],
           }
           result << current_interface
 

data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb

@@ -79,7 +79,7 @@ module PhusionPassenger
       when 'linux'
         # Parse LSB (applicable to e.g. Ubuntu)
         if read_file('/etc/lsb-release') =~ /DISTRIB_RELEASE=(.+)/
-          version = $1.delete(%q['"])
+          version = $1.delete(%q('"))
           return VersionComparer.new(version) if !version.empty?
         end
 
@@ -106,9 +106,9 @@ module PhusionPassenger
     # The current platform's shared library extension ('so' on most Unices).
     def self.library_extension
       if os_name_simple == "macosx"
-        return "bundle"
+        "bundle"
       else
-        return "so"
+        "so"
       end
     end
 
@@ -120,11 +120,11 @@ module PhusionPassenger
       if result = find_command("uname")
         result
       elsif File.exist?("/bin/uname")
-        return "/bin/uname"
+        "/bin/uname"
       elsif File.exist?("/usr/bin/uname")
-        return "/usr/bin/uname"
+        "/usr/bin/uname"
       else
-        return nil
+        nil
       end
     end
 
@@ -162,21 +162,21 @@ module PhusionPassenger
         if major >= 11 || (major == 10 && minor >= 16)
           # Since Big Sur aarch64 is supported, and default on m1 macs.
           if `#{uname_command} -m` =~ /arm64/
-            ["arm64", "x86_64"]
+            [ "arm64", "x86_64" ]
           elsif `sysctl -in sysctl.proc_translated` == "1"
-            ["arm64", "x86_64"]
+            [ "arm64", "x86_64" ]
           else
-            ["x86_64", "arm64"]
+            [ "x86_64", "arm64" ]
           end
         elsif minor == 15
           # Since Catalina x86 is gone.
-          ["x86_64"]
+          [ "x86_64" ]
         elsif minor >= 6
           # Since Snow Leopard x86_64 is the default on intel macs.
-          ["x86_64", "x86"]
+          [ "x86_64", "x86" ]
         else
           # Before Snow Leopard x86 was the default.
-          ["x86", "x86_64"]
+          [ "x86", "x86_64" ]
         end
       else
         uname = uname_command
@@ -199,13 +199,13 @@ module PhusionPassenger
           # a CPU that supports both x86 and x86_64, but we're not gonna
           # go through the trouble of checking that. The main architecture
           # is what we usually care about.
-          ["x86"]
+          [ "x86" ]
         elsif arch == "x86_64"
           # I don't think there's a single x86_64 CPU out there
           # that doesn't support x86 as well.
-          ["x86_64", "x86"]
+          [ "x86_64", "x86" ]
         else
-          [arch]
+          [ arch ]
         end
       end
     end
@@ -217,7 +217,7 @@ module PhusionPassenger
     end
 
     def self.requires_no_tls_direct_seg_refs?
-      return File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
+      File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
     end
     memoize :requires_no_tls_direct_seg_refs?, true
 

data/src/ruby_supportlib/phusion_passenger/platform_info/pcre.rb

@@ -40,7 +40,7 @@ module PhusionPassenger
           cflags = "-I/opt/local/include"
         end
       end
-      return "#{cflags} -DPCRE2_CODE_UNIT_WIDTH=8"
+      "#{cflags} -DPCRE2_CODE_UNIT_WIDTH=8"
     end
     memoize :pcre_extra_cflags
 

data/src/ruby_supportlib/phusion_passenger/platform_info/ruby.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -143,7 +144,7 @@ module PhusionPassenger
           exit 1
         end
       else
-        return ruby_executable
+        ruby_executable
       end
     end
     memoize :ruby_command
@@ -160,7 +161,7 @@ module PhusionPassenger
     def self.ruby_supports_fork?
       # MRI >= 1.9.2's respond_to? returns false for methods
       # that are not implemented.
-      return Process.respond_to?(:fork) &&
+      Process.respond_to?(:fork) &&
         RUBY_ENGINE != "jruby" &&
         RUBY_ENGINE != "macruby" &&
         rb_config['target_os'] !~ /mswin|windows|mingw/
@@ -170,7 +171,7 @@ module PhusionPassenger
     # be available for the current Ruby implementation.
     def self.passenger_needs_ruby_dev_header?
       # Too much of a trouble for JRuby. We can do without it.
-      return RUBY_ENGINE != "jruby"
+      RUBY_ENGINE != "jruby"
     end
 
     # Returns the correct 'gem' command for this Ruby interpreter.
@@ -181,7 +182,7 @@ module PhusionPassenger
       if options[:sudo] && gem_install_requires_sudo?
         command = "#{ruby_sudo_command} #{command}"
       end
-      return command
+      command
     end
     memoize :gem_command
 
@@ -189,9 +190,9 @@ module PhusionPassenger
     def self.gem_install_requires_sudo?
       `#{gem_command} env` =~ /INSTALLATION DIRECTORY: (.+)/
       if install_dir = $1
-        return !File.writable?(install_dir)
+        !File.writable?(install_dir)
       else
-        return nil
+        nil
       end
     end
     memoize :gem_install_requires_sudo?
@@ -203,7 +204,7 @@ module PhusionPassenger
     # The return value may not be the actual correct invocation
     # for Rake. Use `rake_command` for that.
     def self.rake
-      return locate_ruby_tool('rake')
+      locate_ruby_tool('rake')
     end
     memoize :rake
 
@@ -219,14 +220,14 @@ module PhusionPassenger
     # belongs to the current Ruby interpreter. Returns nil if it
     # doesn't exist.
     def self.rspec
-      return locate_ruby_tool('rspec')
+      locate_ruby_tool('rspec')
     end
     memoize :rspec
 
     # Returns whether the current Ruby interpreter is managed by RVM.
     def self.in_rvm?
       bindir = rb_config['bindir']
-      return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
+      bindir.include?('/.rvm/') || bindir.include?('/rvm/')
     end
 
     # If the current Ruby interpreter is managed by RVM, returns all
@@ -238,7 +239,7 @@ module PhusionPassenger
     def self.rvm_paths
       if in_rvm?
         result = []
-        [ENV['rvm_path'], "#{PhusionPassenger.home_dir}/.rvm", "/usr/local/rvm"].each do |path|
+        [ ENV['rvm_path'], "#{PhusionPassenger.home_dir}/.rvm", "/usr/local/rvm" ].each do |path|
           next if path.nil?
           rubies_path = File.join(path, 'rubies')
           wrappers_path = File.join(path, 'wrappers')
@@ -257,10 +258,10 @@ module PhusionPassenger
             "'rvm get head && rvm reload && rvm repair all'."
           exit 1
         else
-          return result
+          result
         end
       else
-        return nil
+        nil
       end
     end
     memoize :rvm_paths
@@ -289,7 +290,7 @@ module PhusionPassenger
         # will modify $GEM_HOME to the --path directory. That's
         # why we need to parse the version of $GEM_HOME *before*
         # `bundle exec` had modified it.
-        [GEM_HOME, BUNDLER_ORIG_GEM_HOME].each do |gem_home|
+        [ GEM_HOME, BUNDLER_ORIG_GEM_HOME ].each do |gem_home|
           if gem_home && gem_home =~ %r{rvm/gems/(.+)}
             return $1.sub(/\/.*/, '')
           end
@@ -297,7 +298,7 @@ module PhusionPassenger
 
         # User might have explicitly set GEM_HOME to a custom directory,
         # or might have nuked $GEM_HOME. Extract info from $GEM_PATH.
-        [GEM_PATH, BUNDLER_ORIG_GEM_PATH].each do |gem_path|
+        [ GEM_PATH, BUNDLER_ORIG_GEM_PATH ].each do |gem_path|
           if gem_path
             gem_path.split(':').each do |gem_path_part|
               if gem_path_part =~ %r{rvm/gems/(.+)}
@@ -330,7 +331,7 @@ module PhusionPassenger
           "doesn't help, please contact this program's author for support."
         exit 1
       end
-      return nil
+      nil
     end
     memoize :rvm_ruby_string
 
@@ -342,16 +343,16 @@ module PhusionPassenger
     def self.rvm_installation_mode
       if in_rvm?
         if ENV['rvm_path'] =~ /\.rvm/
-          return :single
+          :single
         else
           if GEM_HOME =~ /\.rvm/
-            return :mixed
+            :mixed
           else
-            return :multi
+            :multi
           end
         end
       else
-        return nil
+        nil
       end
     end
 
@@ -359,9 +360,9 @@ module PhusionPassenger
     # Ruby interpreter is managed by RVM.
     def self.ruby_sudo_command
       if in_rvm?
-        return "rvmsudo"
+        "rvmsudo"
       else
-        return "sudo"
+        "sudo"
       end
     end
 
@@ -382,9 +383,9 @@ module PhusionPassenger
         result = "rvmsudo "
         result << "#{args} " if args
         result << shell
-        return result
+        result
       else
-        return "sudo -s #{args}".strip
+        "sudo -s #{args}".strip
       end
     end
 
@@ -414,7 +415,7 @@ module PhusionPassenger
           result = locate_ruby_tool_by_basename(transform_according_to_ruby_exec_format(name) + exeext)
         end
       end
-      return result
+      result
     end
 
     # Locates a Ruby tool command, e.g. 'gem', 'rake', 'bundle', etc. Instead of
@@ -445,7 +446,7 @@ module PhusionPassenger
   private
     def self.locate_ruby_tool_by_basename(name)
       if os_name_simple == "macosx" &&
-         ruby_command =~ %r(\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z)
+         ruby_command =~ %r{\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z}
         # On OS X we must look for Ruby binaries in /usr/bin.
         # RubyGems puts executables (e.g. 'rake') in there, not in
         # /System/Libraries/(...)/bin.
@@ -496,7 +497,7 @@ module PhusionPassenger
         return f.readline =~ /ruby/
       end
     rescue EOFError
-      return false
+      false
     end
     private_class_method :is_ruby_program?
 
@@ -508,9 +509,9 @@ module PhusionPassenger
       install_name = rb_config['RUBY_INSTALL_NAME']
       if install_name.include?('ruby')
         format = install_name.sub('ruby', '%s')
-        return sprintf(format, name)
+        sprintf(format, name)
       else
-        return name
+        name
       end
     end
     private_class_method :transform_according_to_ruby_exec_format

data/src/ruby_supportlib/phusion_passenger/platform_info/zlib.rb

@@ -28,11 +28,11 @@ module PhusionPassenger
 
   module PlatformInfo
     def self.zlib_flags
-      return nil
+      nil
     end
 
     def self.zlib_libs
-      return '-lz'
+      '-lz'
     end
   end