passenger 6.1.4 → 6.1.5

data/build/oxt_tests.rb

@@ -30,7 +30,7 @@ TEST_OXT_OBJECTS = {
   "#{TEST_OUTPUT_DIR}oxt/backtrace_test.o" => "test/oxt/backtrace_test.cpp",
   "#{TEST_OUTPUT_DIR}oxt/spin_lock_test.o" => "test/oxt/spin_lock_test.cpp",
   "#{TEST_OUTPUT_DIR}oxt/dynamic_thread_group_test.o" => "test/oxt/dynamic_thread_group_test.cpp",
-  "#{TEST_OUTPUT_DIR}oxt/syscall_interruption_test.o" => "test/oxt/syscall_interruption_test.cpp"
+  "#{TEST_OUTPUT_DIR}oxt/syscall_interruption_test.o" => "test/oxt/syscall_interruption_test.cpp",
 }
 
 # Define compilation tasks for object files.
@@ -39,26 +39,26 @@ TEST_OXT_OBJECTS.each_pair do |object, source|
     object,
     source,
     lambda { {
-      :include_paths => [
+      include_paths: [
         "test/support",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
       ],
-      :flags => TEST_COMMON_CFLAGS
+      flags: TEST_COMMON_CFLAGS,
     } }
   )
 end
 
 # Define compilation task for the test executable.
-dependencies = TEST_OXT_OBJECTS.keys + [TEST_BOOST_OXT_LIBRARY]
+dependencies = TEST_OXT_OBJECTS.keys + [ TEST_BOOST_OXT_LIBRARY ]
 file(TEST_OXT_TARGET => dependencies) do
   flags = [
     TEST_BOOST_OXT_LIBRARY,
-    PlatformInfo.portability_cxx_ldflags
+    PlatformInfo.portability_cxx_ldflags,
   ]
   create_cxx_executable(
     TEST_OXT_TARGET,
     TEST_OXT_OBJECTS.keys,
-    :flags => flags
+    flags: flags
   )
 end
 

data/build/packaging.rb

@@ -36,11 +36,11 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
     if !File.directory?(filename)
       if preprocess && filename =~ /\.erb$/
         real_filename = filename.sub(/\.erb$/, '')
-        FileUtils.install(filename, "#{destination_dir}/#{real_filename}", :preserve => true)
+        FileUtils.install(filename, "#{destination_dir}/#{real_filename}", preserve: true)
         Preprocessor.new.start(filename, "#{destination_dir}/#{real_filename}",
           variables)
       else
-        FileUtils.install(filename, "#{destination_dir}/#{filename}", :preserve => true)
+        FileUtils.install(filename, "#{destination_dir}/#{filename}", preserve: true)
       end
     end
     if STDOUT.tty?
@@ -53,7 +53,7 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
   end
 end
 
-task :clobber => 'package:clean'
+task clobber: 'package:clean'
 
 task 'package:set_official' do
   ENV['OFFICIAL_RELEASE'] = '1'
@@ -117,7 +117,7 @@ def change_shebang(filename, value)
 end
 
 desc "Create a fakeroot, useful for building native packages"
-task :fakeroot => [:apache2, :nginx, 'nginx:as_dynamic_module', :doc] do
+task fakeroot: [ :apache2, :nginx, 'nginx:as_dynamic_module', :doc ] do
   require 'rbconfig'
   include RbConfig
 
@@ -212,18 +212,18 @@ task :fakeroot => [:apache2, :nginx, 'nginx:as_dynamic_module', :doc] do
   headers = []
   Dir["src/nginx_module/**/*.[ch]"].each do |filename|
     File.read(filename).split("\n").grep(%r{#include "cxx_supportlib/(.+)"}) do |match|
-      headers << ["src/cxx_supportlib/#{$1}", "cxx_supportlib/#{$1}"]
+      headers << [ "src/cxx_supportlib/#{$1}", "cxx_supportlib/#{$1}" ]
     end
   end
   # Manually add headers that could not be inferred through
   # the above code
   headers.concat([
-    ["src/cxx_supportlib/Exceptions.h", "cxx_supportlib/Exceptions.h"],
-    ["src/cxx_supportlib/AppTypeDetector/CBindings.h", "cxx_supportlib/AppTypeDetector/CBindings.h"],
-    ["src/cxx_supportlib/WrapperRegistry/CBindings.h", "cxx_supportlib/WrapperRegistry/CBindings.h"],
-    ["src/cxx_supportlib/JsonTools/CBindings.h", "cxx_supportlib/JsonTools/CBindings.h"],
-    ["src/cxx_supportlib/vendor-modified/modp_b64.h", "cxx_supportlib/vendor-modified/modp_b64.h"],
-    ["src/cxx_supportlib/vendor-modified/modp_b64_data.h", "cxx_supportlib/vendor-modified/modp_b64_data.h"]
+    [ "src/cxx_supportlib/Exceptions.h", "cxx_supportlib/Exceptions.h" ],
+    [ "src/cxx_supportlib/AppTypeDetector/CBindings.h", "cxx_supportlib/AppTypeDetector/CBindings.h" ],
+    [ "src/cxx_supportlib/WrapperRegistry/CBindings.h", "cxx_supportlib/WrapperRegistry/CBindings.h" ],
+    [ "src/cxx_supportlib/JsonTools/CBindings.h", "cxx_supportlib/JsonTools/CBindings.h" ],
+    [ "src/cxx_supportlib/vendor-modified/modp_b64.h", "cxx_supportlib/vendor-modified/modp_b64.h" ],
+    [ "src/cxx_supportlib/vendor-modified/modp_b64_data.h", "cxx_supportlib/vendor-modified/modp_b64_data.h" ],
   ])
   headers.each do |header|
     target = "#{fake_include_dir}/#{header[1]}"

data/build/ruby_extension.rb

@@ -38,12 +38,12 @@ else
   source_dir  = "src/ruby_native_extension"
   NATIVE_SUPPORT_TARGET = File.join(output_dir, output_name)
 
-  task :native_support => NATIVE_SUPPORT_TARGET
-  task :clean => 'native_support:clean'
+  task native_support: NATIVE_SUPPORT_TARGET
+  task clean: 'native_support:clean'
 
   dependencies = [
     File.join(output_dir, "Makefile"),
-    "#{source_dir}/passenger_native_support.c"
+    "#{source_dir}/passenger_native_support.c",
   ]
   file(NATIVE_SUPPORT_TARGET => dependencies) do
     sh "mkdir -p '#{output_dir}'" if !File.exist?(output_dir)

data/build/ruby_tests.rb

@@ -24,7 +24,7 @@
 
 ### Ruby components tests ###
 
-dependencies = [NATIVE_SUPPORT_TARGET, AGENT_TARGET].compact
+dependencies = [ NATIVE_SUPPORT_TARGET, AGENT_TARGET ].compact
 desc "Run unit tests for the Ruby libraries"
 task 'test:ruby' => dependencies do
   if maybe_grep = string_option('E')

data/build/schema_printer.rb

@@ -26,12 +26,12 @@ SCHEMA_PRINTER_TARGET = "#{AGENT_OUTPUT_DIR}SchemaPrinter"
 SCHEMA_PRINTER_MAIN_OBJECT = "#{AGENT_OUTPUT_DIR}SchemaPrinterMain.o"
 SCHEMA_PRINTER_OBJECTS = {
   SCHEMA_PRINTER_MAIN_OBJECT =>
-    "src/schema_printer/SchemaPrinterMain.cpp"
+    "src/schema_printer/SchemaPrinterMain.cpp",
 }
 
 dependencies = [
   'src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder',
-  CXX_DEPENDENCY_MAP['src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder']
+  CXX_DEPENDENCY_MAP['src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder'],
 ].flatten.compact
 file('src/schema_printer/SchemaPrinterMain.cpp' => dependencies) do
   source = 'src/schema_printer/SchemaPrinterMain.cpp'
@@ -45,18 +45,18 @@ SCHEMA_PRINTER_OBJECTS.each_pair do |object, source|
     object,
     source,
     lambda { {
-      :include_paths => [
+      include_paths: [
         "src/agent",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
       ],
-      :flags => [
+      flags: [
         agent_cflags,
         libev_cflags,
         libuv_cflags,
         PlatformInfo.curl_flags,
         PlatformInfo.openssl_extra_cflags,
-        PlatformInfo.zlib_flags
-      ]
+        PlatformInfo.zlib_flags,
+      ],
     } }
   )
 end
@@ -69,7 +69,7 @@ dependencies = SCHEMA_PRINTER_OBJECTS.keys + [
   LIBBOOST_OXT,
   schema_printer_libs.link_objects,
   LIBEV_TARGET,
-  LIBUV_TARGET
+  LIBUV_TARGET,
 ].flatten.compact
 file(SCHEMA_PRINTER_TARGET => dependencies) do
   sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
@@ -77,26 +77,26 @@ file(SCHEMA_PRINTER_TARGET => dependencies) do
     [
       schema_printer_libs.link_objects_as_string,
       SCHEMA_PRINTER_OBJECTS.keys,
-      LIBBOOST_OXT_LINKARG
+      LIBBOOST_OXT_LINKARG,
     ],
-    :flags => [
+    flags: [
       libev_libs,
       libuv_libs,
       PlatformInfo.curl_libs,
       PlatformInfo.zlib_libs,
       PlatformInfo.crypto_libs,
       PlatformInfo.portability_cxx_ldflags,
-      agent_ldflags
+      agent_ldflags,
     ]
   )
 end
 
 desc 'Update dev/configkit-schemas/index.json'
-task :configkit_schemas_index => SCHEMA_PRINTER_TARGET do
+task configkit_schemas_index: SCHEMA_PRINTER_TARGET do
   sh "#{SCHEMA_PRINTER_TARGET} > dev/configkit-schemas/index.json"
 end
 
 desc 'Update ConfigKit schema inline comments'
-task :configkit_schemas_inline_comments => :configkit_schemas_index do
+task configkit_schemas_inline_comments: :configkit_schemas_index do
   sh './dev/configkit-schemas/update_schema_inline_comments.rb'
 end

data/build/support/cplusplus.rb

@@ -65,10 +65,10 @@ def build_compiler_flags_from_options_or_flags(options_or_flags)
     end
 
     if flags = options[:flags]
-      result.concat([flags].flatten)
+      result.concat([ flags ].flatten)
     end
 
-    result.flatten.reject{ |x| x.nil? || x.empty? }.join(" ")
+    result.flatten.reject { |x| x.nil? || x.empty? }.join(" ")
   elsif options_or_flags.is_a?(String)
     options_or_flags
   elsif options_or_flags.respond_to?(:call)
@@ -81,13 +81,13 @@ def build_compiler_flags_from_options_or_flags(options_or_flags)
 end
 
 def generate_compilation_task_dependencies(source, options = nil)
-  result = [source]
+  result = [ source ]
   if dependencies = CXX_DEPENDENCY_MAP[source]
     result.concat(dependencies)
   end
   options = maybe_eval_lambda(options)
   if options && options[:deps]
-    result.concat([options[:deps]].flatten.compact)
+    result.concat([ options[:deps] ].flatten.compact)
   end
   result
 end
@@ -105,14 +105,14 @@ def compile_cxx(object, source, options_or_flags = nil)
 end
 
 def create_c_executable(target, objects, options_or_flags = nil)
-  objects = [objects].flatten.join(" ")
+  objects = [ objects ].flatten.join(" ")
   flags = build_compiler_flags_from_options_or_flags(options_or_flags)
   ensure_target_directory_exists(target)
   run_compiler("#{cc} -o #{target} #{objects} #{EXTRA_PRE_C_LDFLAGS} #{flags} #{extra_c_ldflags}")
 end
 
 def create_cxx_executable(target, objects, options_or_flags = nil)
-  objects = [objects].flatten.join(" ")
+  objects = [ objects ].flatten.join(" ")
   flags = build_compiler_flags_from_options_or_flags(options_or_flags)
   ensure_target_directory_exists(target)
   run_compiler("#{cxx} -o #{target} #{objects} #{EXTRA_PRE_CXX_LDFLAGS} #{flags} #{extra_cxx_ldflags}")
@@ -125,7 +125,7 @@ def create_static_library(target, objects)
   #   ar: foo.a: Inappropriate file type or format
   #
   # So here we delete the ar file before creating it, which bypasses this problem.
-  objects = [objects].flatten.join(" ")
+  objects = [ objects ].flatten.join(" ")
   ensure_target_directory_exists(target)
   sh "rm -rf #{target}"
   sh "ar cru #{target} #{objects}"
@@ -143,7 +143,7 @@ def create_shared_library(target, objects, options_or_flags = nil)
   else
     fPIC = "-fPIC"
   end
-  objects = [objects].flatten.join(" ")
+  objects = [ objects ].flatten.join(" ")
   flags = build_compiler_flags_from_options_or_flags(options_or_flags)
   ensure_target_directory_exists(target)
   run_compiler("#{cxx} #{shlib_flag} #{objects} #{fPIC} -o #{target} #{flags}")