passenger 6.1.4 → 6.1.5

data/src/ruby_supportlib/phusion_passenger/config/install_agent_command.rb

@@ -36,16 +36,16 @@ module PhusionPassenger
     class InstallAgentCommand < Command
       def run
         @options = {
-          :log_level => Logger::INFO,
-          :colorize => :auto,
-          :force => false,
-          :force_tip => true,
-          :compile => true,
-          :download_args => [
+          log_level: Logger::INFO,
+          colorize: :auto,
+          force: false,
+          force_tip: true,
+          compile: true,
+          download_args: [
             "--no-error-colors",
-            "--no-compilation-tip"
+            "--no-compilation-tip",
           ],
-          :compile_args => []
+          compile_args: [],
         }
         parse_options
         initialize_objects
@@ -165,9 +165,9 @@ module PhusionPassenger
         end
         begin
           DownloadAgentCommand.new(@options[:download_args]).run
-          return true
+          true
         rescue SystemExit => e
-          return e.success?
+          e.success?
         end
       end
 

data/src/ruby_supportlib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -39,19 +39,19 @@ module PhusionPassenger
     class InstallStandaloneRuntimeCommand < Command
       def run
         @options = {
-          :log_level => Logger::INFO,
-          :colorize => :auto,
-          :force => false,
-          :force_tip => true,
-          :compile => true,
-          :install_agent => true,
-          :install_agent_args => [],
-          :download_args => [
+          log_level: Logger::INFO,
+          colorize: :auto,
+          force: false,
+          force_tip: true,
+          compile: true,
+          install_agent: true,
+          install_agent_args: [],
+          download_args: [
             "--no-error-colors",
-            "--no-compilation-tip"
+            "--no-compilation-tip",
           ],
-          :engine => "nginx",
-          :compile_args => []
+          engine: "nginx",
+          compile_args: [],
         }
         parse_options
         initialize_objects
@@ -283,7 +283,7 @@ module PhusionPassenger
       end
 
       def boolean_option(env_name)
-        ["true", "on", "yes", "1"].include?(ENV[env_name])
+        [ "true", "on", "yes", "1" ].include?(ENV[env_name])
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/config/installation_utils.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2014-2025 Asynchronous B.V.
@@ -60,23 +61,23 @@ module PhusionPassenger
             if result == false
               print_installation_error_header
               render_template 'installation_utils/support_binaries_dir_not_writable_despite_running_as_root',
-                :dir => PhusionPassenger.support_binaries_dir,
-                :myself => myself
+                dir: PhusionPassenger.support_binaries_dir,
+                myself: myself
             else
               render_template 'installation_utils/unexpected_filesystem_problem',
-                :dir => PhusionPassenger.support_binaries_dir,
-                :exception => result
+                dir: PhusionPassenger.support_binaries_dir,
+                exception: result
             end
             abort
           else
-            return find_or_create_writable_user_support_binaries_dir!
+            find_or_create_writable_user_support_binaries_dir!
           end
         else
           if Process.euid == 0
             mkdir_p_preserve_parent_owner(PhusionPassenger.support_binaries_dir)
-            return PhusionPassenger.support_binaries_dir
+            PhusionPassenger.support_binaries_dir
           else
-            return find_or_create_writable_user_support_binaries_dir!
+            find_or_create_writable_user_support_binaries_dir!
           end
         end
       end
@@ -101,7 +102,7 @@ module PhusionPassenger
           puts "---------------------------------------"
           puts
           render_template 'installation_utils/download_tool_missing',
-            :runner => runner
+            runner: runner
           abort
         end
       end
@@ -121,14 +122,14 @@ module PhusionPassenger
       end
 
       def rake
-        return "env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command}"
+        "env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command}"
       end
 
       def run_rake_task!(target)
         total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1 2>&1`.split("\n").size - 1
         partial_backlog = String.new
         logfile = PhusionPassenger::Utils::TmpIO.new("passenger-install-log",
-          :mode => File::WRONLY, :unlink_immediately => false)
+          mode: File::WRONLY, unlink_immediately: false)
 
         begin
           command = "#{rake} #{target} --trace STDERR_TO_STDOUT=1 2>&1"
@@ -173,13 +174,13 @@ module PhusionPassenger
         begin
           File.new(filename, "w").close
           @logger.debug "Yes" if @logger
-          return true
+          true
         rescue Errno::EACCES
           @logger.debug "No" if @logger
-          return false
+          false
         rescue SystemCallError => e
           @logger.warn "Unable to check whether we can write to #{path}: #{e}" if @logger
-          return e
+          e
         ensure
           File.unlink(filename) rescue nil
         end
@@ -192,7 +193,7 @@ module PhusionPassenger
         result = directory_writable?(PhusionPassenger.user_support_binaries_dir)
         case result
         when true
-          return PhusionPassenger.user_support_binaries_dir
+          PhusionPassenger.user_support_binaries_dir
         when false
           print_installation_error_header
           render_template 'installation_utils/user_support_binaries_dir_not_writable'
@@ -200,8 +201,8 @@ module PhusionPassenger
         else
           print_installation_error_header
           render_template 'installation_utils/unexpected_filesystem_problem',
-            :dir => PhusionPassenger.support_binaries_dir,
-            :exception => result
+            dir: PhusionPassenger.support_binaries_dir,
+            exception: result
           abort
         end
       end
@@ -213,14 +214,14 @@ module PhusionPassenger
         rescue Errno::EACCES
           print_installation_error_header
           render_template 'installation_utils/cannot_create_user_support_binaries_dir',
-            :dir => dir,
-            :myself => myself
+            dir: dir,
+            myself: myself
           abort
         rescue SystemCallError => e
           print_installation_error_header
           render_template 'installation_utils/unexpected_filesystem_problem',
-            :dir => dir,
-            :exception => e
+            dir: dir,
+            exception: e
           abort
         end
       end
@@ -242,18 +243,18 @@ module PhusionPassenger
       end
 
       def myself
-        return `whoami`.strip
+        `whoami`.strip
       end
 
       def render_template(name, options = {})
-        options.merge!(:colors => @colors || PhusionPassenger::Utils::AnsiColors.new)
+        options.merge!(colors: @colors || PhusionPassenger::Utils::AnsiColors.new)
         # This check here is necessary for NginxEngineCompiler. NginxEngineCompiler
         # derives from AbstractInstaller but also includes InstallationUtils. We want
         # the AbstractInstaller methods to work when they call render_template.
         if !File.exist?("#{PhusionPassenger.resources_dir}/templates/#{name}.txt.erb")
           name = "config/#{name}"
         end
-        puts ConsoleTextTemplate.new({ :file => name }, options).result
+        puts ConsoleTextTemplate.new({ file: name }, options).result
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/config/main.rb

@@ -29,24 +29,24 @@ module PhusionPassenger
   # Core of the `passenger-config` command. Dispatches a subcommand to a specific class.
   module Config
     KNOWN_COMMANDS = [
-      ["detach-process", "DetachProcessCommand"],
-      ["restart-app", "RestartAppCommand"],
-      ["list-instances", "ListInstancesCommand"],
-      ["reopen-logs", "ReopenLogsCommand"],
-      ["api-call", "ApiCallCommand"],
-      ["validate-install", "ValidateInstallCommand"],
-      ["build-native-support", "BuildNativeSupportCommand"],
-
-      ["install-agent", "InstallAgentCommand"],
-      ["install-standalone-runtime", "InstallStandaloneRuntimeCommand"],
-      ["download-agent", "DownloadAgentCommand"],
-      ["download-nginx-engine", "DownloadNginxEngineCommand"],
-      ["compile-agent", "CompileAgentCommand"],
-      ["compile-nginx-engine", "CompileNginxEngineCommand"],
-
-      ["system-metrics", "SystemMetricsCommand"],
-      ["system-properties", "SystemPropertiesCommand"],
-      ["about", "AboutCommand"]
+      [ "detach-process", "DetachProcessCommand" ],
+      [ "restart-app", "RestartAppCommand" ],
+      [ "list-instances", "ListInstancesCommand" ],
+      [ "reopen-logs", "ReopenLogsCommand" ],
+      [ "api-call", "ApiCallCommand" ],
+      [ "validate-install", "ValidateInstallCommand" ],
+      [ "build-native-support", "BuildNativeSupportCommand" ],
+
+      [ "install-agent", "InstallAgentCommand" ],
+      [ "install-standalone-runtime", "InstallStandaloneRuntimeCommand" ],
+      [ "download-agent", "DownloadAgentCommand" ],
+      [ "download-nginx-engine", "DownloadNginxEngineCommand" ],
+      [ "compile-agent", "CompileAgentCommand" ],
+      [ "compile-nginx-engine", "CompileNginxEngineCommand" ],
+
+      [ "system-metrics", "SystemMetricsCommand" ],
+      [ "system-properties", "SystemPropertiesCommand" ],
+      [ "about", "AboutCommand" ],
     ]
 
     ABOUT_OPTIONS = [
@@ -65,7 +65,7 @@ module PhusionPassenger
       "ruby-libdir",
       "rubyext-compat-id",
       "cxx-compat-id",
-      "version"
+      "version",
     ]
 
     def self.run!(argv)
@@ -132,11 +132,11 @@ module PhusionPassenger
 
   private
     def self.help_requested?(argv)
-      return argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
+      argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
     end
 
     def self.help_all_requested?(argv)
-      return argv.size == 1 && (argv[0] == "--help-all" || argv[0] == "help-all")
+      argv.size == 1 && (argv[0] == "--help-all" || argv[0] == "help-all")
     end
 
     def self.lookup_command_class_by_argv(argv)
@@ -148,7 +148,7 @@ module PhusionPassenger
         name = argv[0].sub(/^--/, '')
         if ABOUT_OPTIONS.include?(name)
           command_class = lookup_command_class_by_class_name("AboutCommand")
-          return [command_class, argv]
+          return [ command_class, argv ]
         else
           return nil
         end
@@ -156,18 +156,18 @@ module PhusionPassenger
 
       # Convert "passenger-config help <COMMAND>" to "passenger-config <COMMAND> --help".
       if argv.size == 2 && argv[0] == "help"
-        argv = [argv[1], "--help"]
+        argv = [ argv[1], "--help" ]
       end
 
       KNOWN_COMMANDS.each do |props|
         if argv[0] == props[0]
           command_class = lookup_command_class_by_class_name(props[1])
           new_argv = argv[1 .. -1]
-          return [command_class, new_argv]
+          return [ command_class, new_argv ]
         end
       end
 
-      return nil
+      nil
     end
 
     def self.lookup_command_class_by_class_name(class_name)
@@ -177,7 +177,7 @@ module PhusionPassenger
       base_name.sub!(/^_/, '')
       base_name << ".rb"
       PhusionPassenger.require_passenger_lib("config/#{base_name}")
-      return PhusionPassenger::Config.const_get(class_name)
+      PhusionPassenger::Config.const_get(class_name)
     end
   end
 

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -1,4 +1,5 @@
 #  encoding: utf-8
+
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
@@ -80,7 +81,7 @@ module PhusionPassenger
           'depcheck_specs/compiler_toolchain',
           'depcheck_specs/ruby',
           'depcheck_specs/libs',
-          'depcheck_specs/utilities'
+          'depcheck_specs/utilities',
         ]
         ids = [
           'cc',
@@ -89,9 +90,9 @@ module PhusionPassenger
           'rake',
           'openssl-dev',
           'zlib-dev',
-          'pcre2-dev'
+          'pcre2-dev',
         ].compact
-        return [specs, ids]
+        [ specs, ids ]
       end
 
       def install_doc_url
@@ -232,7 +233,7 @@ module PhusionPassenger
           tarball  = "#{@working_dir}/#{basename}"
 
           options = {
-            :show_progress => @stdout.tty?
+            show_progress: @stdout.tty?,
           }
           if @connect_timeout && @connect_timeout != 0
             options[:connect_timeout] = @connect_timeout

data/src/ruby_supportlib/phusion_passenger/config/reopen_logs_command.rb

@@ -137,7 +137,7 @@ module PhusionPassenger
       end
 
       def should_ignore_error?(json)
-        return @options[:ignore_logs_not_available] && json["code"] == "NO_LOG_FILE"
+        @options[:ignore_logs_not_available] && json["code"] == "NO_LOG_FILE"
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb

@@ -224,8 +224,8 @@ module PhusionPassenger
           try_performing_full_admin_basic_auth(request, @instance)
           request.content_type = "application/json"
           request.body = PhusionPassenger::Utils::JSON.generate(
-            :name => group_name,
-            :restart_method => restart_method)
+            name: group_name,
+            restart_method: restart_method)
           response = @instance.http_request("agents.s/core_api", request)
           if response.code.to_i / 100 == 2
             response.body
@@ -255,9 +255,9 @@ module PhusionPassenger
         response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
           if RUBY_VERSION >= '2.3'
-            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+            JSON.parse(response.body, symbolize_names: true).to_a.map { |(key, value)| { name: key.to_s, app_root: value.dig(:app_root, 0, :value) } }
           else
-            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value[:app_root][0][:value]}}
+            JSON.parse(response.body, symbolize_names: true).to_a.map { |(key, value)| { name: key.to_s, app_root: value[:app_root][0][:value] } }
           end
         elsif response.code.to_i == 401
           if response["pool-empty"] == "true"

data/src/ruby_supportlib/phusion_passenger/config/system_properties_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2017-2025 Asynchronous B.V.
 #
@@ -41,14 +42,14 @@ module PhusionPassenger
         network_interfaces = PlatformInfo.network_interfaces
         default_network_interfaces = PlatformInfo.default_network_interfaces
         puts PhusionPassenger::Utils::JSON.generate(
-          :ipv4_addresses => ip_addresses(network_interfaces, :ipv4, default_network_interfaces),
-          :ipv6_addresses => ip_addresses(network_interfaces, :ipv6, default_network_interfaces),
-          :default_ipv4 => default_ip(network_interfaces, :ipv4, default_network_interfaces),
-          :default_ipv6 => default_ip(network_interfaces, :ipv6, default_network_interfaces),
-          :network_interfaces => network_interfaces,
-          :hostname => Socket.gethostname,
-          :fqdn => fqdn,
-          :os => os
+          ipv4_addresses: ip_addresses(network_interfaces, :ipv4, default_network_interfaces),
+          ipv6_addresses: ip_addresses(network_interfaces, :ipv6, default_network_interfaces),
+          default_ipv4: default_ip(network_interfaces, :ipv4, default_network_interfaces),
+          default_ipv6: default_ip(network_interfaces, :ipv6, default_network_interfaces),
+          network_interfaces: network_interfaces,
+          hostname: Socket.gethostname,
+          fqdn: fqdn,
+          os: os
         )
       end
 
@@ -91,11 +92,11 @@ module PhusionPassenger
 
       def os
         {
-          :simple_name => PlatformInfo.os_name_simple,
-          :full_name => PlatformInfo.os_name_full,
-          :version => PlatformInfo.os_version,
-          :linux_distro => PlatformInfo.linux_distro,
-          :linux_distro_tags => PlatformInfo.linux_distro_tags
+          simple_name: PlatformInfo.os_name_simple,
+          full_name: PlatformInfo.os_name_full,
+          version: PlatformInfo.os_version,
+          linux_distro: PlatformInfo.linux_distro,
+          linux_distro_tags: PlatformInfo.linux_distro_tags,
         }
       end
     end

data/src/ruby_supportlib/phusion_passenger/config/utils.rb

@@ -155,7 +155,7 @@ module PhusionPassenger
       end
 
       def is_enterprise?
-        return defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
+        defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
       end
     end