passenger 6.1.4 → 6.1.5

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

@@ -32,9 +32,9 @@ module PhusionPassenger
     def self.detect_language_extension(language)
       case language
       when :c
-        return "c"
+        "c"
       when :cxx
-        return "cpp"
+        "cpp"
       else
         raise ArgumentError, "Unsupported language #{language.inspect}"
       end
@@ -44,9 +44,9 @@ module PhusionPassenger
     def self.detect_compiler_type_name(language)
       case language
       when :c
-        return "C"
+        "C"
       when :cxx
-        return "C++"
+        "C++"
       else
         raise ArgumentError, "Unsupported language #{language.inspect}"
       end
@@ -56,17 +56,17 @@ module PhusionPassenger
     def self.create_compiler_command(language, flags1, flags2, link = false)
       case language
       when :c
-        result  = [cc, link ? ENV['EXTRA_PRE_LDFLAGS'] : nil,
+        result  = [ cc, link ? ENV['EXTRA_PRE_LDFLAGS'] : nil,
           ENV['EXTRA_PRE_CFLAGS'], flags1, flags2, ENV['EXTRA_CFLAGS'],
-          ENV['EXTRA_LDFLAGS']]
+          ENV['EXTRA_LDFLAGS'] ]
       when :cxx
-        result  = [cxx, link ? ENV['EXTRA_PRE_LDFLAGS'] : nil,
+        result  = [ cxx, link ? ENV['EXTRA_PRE_LDFLAGS'] : nil,
           ENV['EXTRA_PRE_CXXFLAGS'], flags1, flags2, ENV['EXTRA_CXXFLAGS'],
-          ENV['EXTRA_LDFLAGS']]
+          ENV['EXTRA_LDFLAGS'] ]
       else
         raise ArgumentError, "Unsupported language #{language.inspect}"
       end
-      return result.compact.join(" ").strip
+      result.compact.join(" ").strip
     end
     private_class_method :create_compiler_command
 
@@ -96,20 +96,20 @@ module PhusionPassenger
       end
       if result.nil?
         log("Command could not be executed! #{exec_error_reason}".strip)
-        return false
+        false
       elsif result
         log("Check succeeded")
         if capture_output
-          return { :result => true, :output => output }
+          { result: true, output: output }
         else
-          return true
+          true
         end
       else
         log("Check failed with exit status #{$?.exitstatus}")
         if capture_output == :always
-          return { :result => false, :output => output }
+          { result: false, output: output }
         else
-          return false
+          false
         end
       end
     end
@@ -135,20 +135,20 @@ module PhusionPassenger
     private_class_method :cc_or_cxx_supports_feliminate_unused_debug?
 
     def self.cc_or_cxx_supports_blocks?(language)
-      command = create_compiler_command(language,"-E -dM",'- </dev/null')
+      command = create_compiler_command(language, "-E -dM", '- </dev/null')
       result = `#{command}`
-      return result.include? "__BLOCKS__"
+      result.include? "__BLOCKS__"
     end
     private_class_method :cc_or_cxx_supports_blocks?
 
   public
     def self.cc
-      return string_env('CC', default_cc)
+      string_env('CC', default_cc)
     end
     memoize :cc
 
     def self.cxx
-      return string_env('CXX', default_cxx)
+      string_env('CXX', default_cxx)
     end
     memoize :cxx
 
@@ -164,17 +164,17 @@ module PhusionPassenger
       # compiled with GCC.
       # https://code.google.com/p/phusion-passenger/issues/detail?id=950
       if PlatformInfo.find_command('cc')
-        return 'cc'
+        'cc'
       else
-        return 'gcc'
+        'gcc'
       end
     end
 
     def self.default_cxx
       if PlatformInfo.find_command('c++')
-        return 'c++'
+        'c++'
       else
-        return 'g++'
+        'g++'
       end
     end
 
@@ -217,9 +217,9 @@ module PhusionPassenger
     def self.find_header(header_name, language, flags = nil)
       extension = detect_language_extension(language)
       create_temp_file("passenger-compile-check.#{extension}") do |filename, f|
-        source = %Q{
+        source = %Q(
           #include <#{header_name}>
-        }
+        )
         f.puts(source)
         f.close
         begin
@@ -228,7 +228,7 @@ module PhusionPassenger
             flags)
           if result = run_compiler("Checking for #{header_name}", command, filename, source, true)
             result[:output] =~ /^#include <...> search starts here:$(.+?)^End of search list\.$/m
-            search_paths = $1.to_s.strip.split("\n").map{ |line| line.strip }
+            search_paths = $1.to_s.strip.split("\n").map { |line| line.strip }
             search_paths.each do |dir|
               if File.file?("#{dir}/#{header_name}")
                 return "#{dir}/#{header_name}"
@@ -333,13 +333,13 @@ module PhusionPassenger
 
     # Checks whether the compiler supports "-arch #{arch}".
     def self.compiler_supports_architecture?(arch)
-      return try_compile("Checking for C compiler '-arch' support",
+      try_compile("Checking for C compiler '-arch' support",
         :c, '', "-arch #{arch}")
     end
 
     def self.cc_supports_visibility_flag?
       return false if os_name_simple == "aix"
-      return try_compile("Checking for C compiler '-fvisibility' support",
+      try_compile("Checking for C compiler '-fvisibility' support",
         :c, '', '-fvisibility=hidden')
     end
     memoize :cc_supports_visibility_flag?, true
@@ -360,62 +360,62 @@ module PhusionPassenger
 
     def self.cxx_supports_visibility_flag?
       return false if os_name_simple == "aix"
-      return try_compile("Checking for C++ compiler '-fvisibility' support",
+      try_compile("Checking for C++ compiler '-fvisibility' support",
         :cxx, '', '-fvisibility=hidden')
     end
     memoize :cxx_supports_visibility_flag?, true
 
     def self.cc_supports_wno_attributes_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C compiler '-Wno-attributes' support",
         :c, '', '-Wno-attributes')
     end
     memoize :cc_supports_wno_attributes_flag?, true
 
     def self.cxx_supports_wno_attributes_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-attributes' support",
         :cxx, '', '-Wno-attributes')
     end
     memoize :cxx_supports_wno_attributes_flag?, true
 
     def self.cc_supports_wno_missing_field_initializers_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C compiler '-Wno-missing-field-initializers' support",
         :c, '', '-Wno-missing-field-initializers')
     end
     memoize :cc_supports_wno_missing_field_initializers_flag?, true
 
     def self.cxx_supports_wno_missing_field_initializers_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-missing-field-initializers' support",
         :cxx, '', '-Wno-missing-field-initializers')
     end
     memoize :cxx_supports_wno_missing_field_initializers_flag?, true
 
     def self.cc_supports_wno_unknown_pragmas_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C compiler '-Wno-unknown-pragmas' support",
         :c, '', '-Wno-unknown-pragmas')
     end
     memoize :cc_supports_wno_unknown_pragmas_flag?, true
 
     def self.cxx_supports_wno_unknown_pragmas_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-unknown-pragmas' support",
         :cxx, '', '-Wno-unknown-pragmas')
     end
     memoize :cxx_supports_wno_unknown_pragmas_flag?, true
 
     def self.cxx_supports_wno_unused_local_typedefs_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-unused-local-typedefs' support",
         :cxx, '', '-Wno-unused-local-typedefs')
     end
     memoize :cxx_supports_wno_unused_local_typedefs_flag?, true
 
     def self.cxx_supports_wno_format_nonliteral_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-format-nonliteral' support",
         :cxx, '', '-Wno-format-nonliteral')
     end
@@ -436,13 +436,13 @@ module PhusionPassenger
     memoize :cxx_supports_fno_optimize_sibling_calls_flag?
 
     def self.cc_supports_no_tls_direct_seg_refs_option?
-      return try_compile("Checking for C compiler '-mno-tls-direct-seg-refs' support",
+      try_compile("Checking for C compiler '-mno-tls-direct-seg-refs' support",
         :c, '', '-mno-tls-direct-seg-refs')
     end
     memoize :cc_supports_no_tls_direct_seg_refs_option?, true
 
     def self.cxx_supports_no_tls_direct_seg_refs_option?
-      return try_compile("Checking for C++ compiler '-mno-tls-direct-seg-refs' support",
+      try_compile("Checking for C++ compiler '-mno-tls-direct-seg-refs' support",
         :cxx, '', '-mno-tls-direct-seg-refs')
     end
     memoize :cxx_supports_no_tls_direct_seg_refs_option?, true
@@ -455,27 +455,27 @@ module PhusionPassenger
     memoize :compiler_supports_wno_ambiguous_member_template?, true
 
     def self.cc_supports_feliminate_unused_debug?
-      return cc_or_cxx_supports_feliminate_unused_debug?(:c)
+      cc_or_cxx_supports_feliminate_unused_debug?(:c)
     end
     memoize :cc_supports_feliminate_unused_debug?, true
 
     def self.cxx_supports_feliminate_unused_debug?
-      return cc_or_cxx_supports_feliminate_unused_debug?(:cxx)
+      cc_or_cxx_supports_feliminate_unused_debug?(:cxx)
     end
     memoize :cxx_supports_feliminate_unused_debug?, true
 
     def self.cc_block_support_ok?
-      return (os_name_simple != 'macosx' || cc_or_cxx_supports_blocks?(:c) || os_version >= "10.13" )
+      (os_name_simple != 'macosx' || cc_or_cxx_supports_blocks?(:c) || os_version >= "10.13")
     end
     memoize :cc_block_support_ok?, true
 
     def self.cxx_block_support_ok?
-      return (os_name_simple != 'macosx' || cc_or_cxx_supports_blocks?(:cxx) || os_version >= "10.13" )
+      (os_name_simple != 'macosx' || cc_or_cxx_supports_blocks?(:cxx) || os_version >= "10.13")
     end
     memoize :cxx_block_support_ok?, true
 
     def self.cxx_supports_wno_vla_cxx_extension_flag?
-      return try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-vla-cxx-extension' support",
         :cxx, '', '-Wno-vla-cxx-extension')
     end
@@ -489,18 +489,18 @@ module PhusionPassenger
     # Warnings should be suppressed with -Wno-attributes.
     def self.cc_visibility_flag_generates_warnings?
       if os_name_simple == "linux" && `#{cc} -v 2>&1` =~ /gcc version (.*?)/
-        return $1 <= "4.1.2"
+        $1 <= "4.1.2"
       else
-        return false
+        false
       end
     end
     memoize :cc_visibility_flag_generates_warnings?, true
 
     def self.cxx_visibility_flag_generates_warnings?
       if os_name_simple == "linux" && `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
-        return $1 <= "4.1.2"
+        $1 <= "4.1.2"
       else
-        return false
+        false
       end
     end
     memoize :cxx_visibility_flag_generates_warnings?, true
@@ -532,39 +532,39 @@ module PhusionPassenger
         };
       }
       if try_compile("Checking for C++ -std=gnu++14 compiler flag", :cxx, source, '-std=gnu++14')
-        return "-std=gnu++14"
+        "-std=gnu++14"
       elsif try_compile("Checking for C++ -std=c++14 compiler flag", :cxx, source, '-std=c++14')
-        return "-std=c++14"
+        "-std=c++14"
       else
-        return nil
+        nil
       end
     end
     memoize :cxx_14_flag, true
 
     def self.has_rt_library?
-      return try_link("Checking for -lrt support",
+      try_link("Checking for -lrt support",
         :c, "int main() { return 0; }\n", '-lrt')
     end
     memoize :has_rt_library?, true
 
     def self.has_math_library?
-      return try_link("Checking for -lmath support",
+      try_link("Checking for -lmath support",
         :c, "int main() { return 0; }\n", '-lmath')
     end
     memoize :has_math_library?, true
 
     def self.has_dl_library?
-      return try_link("Checking for -ldl support",
+      try_link("Checking for -ldl support",
         :c, "int main() { return 0; }\n", '-ldl')
     end
     memoize :has_dl_library?, true
 
     def self.has_accept4?
-      return try_compile("Checking for accept4()", :c, %Q{
+      try_compile("Checking for accept4()", :c, %Q(
         #define _GNU_SOURCE
         #include <sys/socket.h>
         static void *foo = accept4;
-      })
+      ))
     end
     memoize :has_accept4?, true
 
@@ -606,9 +606,9 @@ module PhusionPassenger
 
     def self.export_dynamic_flags
       if os_name_simple == "linux"
-        return '-rdynamic'
+        '-rdynamic'
       else
-        return nil
+        nil
       end
     end
 
@@ -622,28 +622,28 @@ module PhusionPassenger
 
 
     def self.make
-      return string_env('MAKE', find_command('make'))
+      string_env('MAKE', find_command('make'))
     end
     memoize :make, true
 
     def self.gnu_make
       if result = string_env('GMAKE')
-        return result
+        result
       else
         result = find_command('gmake')
         if !result
           result = find_command('make')
           if result
             if `#{result} --version 2>&1` =~ /GNU/
-              return result
+              result
             else
-              return nil
+              nil
             end
           else
-            return nil
+            nil
           end
         else
-          return result
+          result
         end
       end
     end
@@ -652,9 +652,9 @@ module PhusionPassenger
     def self.xcode_select_version
       if find_command('xcode-select')
         `xcode-select --version` =~ /version (.+)\./
-        return $1
+        $1
       else
-        return nil
+        nil
       end
     end
   end

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

@@ -34,12 +34,12 @@ module PhusionPassenger
       suffix = ' -lcrypto'
       if os_name_simple == "macosx"
         if os_version < '10.13'
-          return prefix
+          prefix
         else
-          return "#{prefix} #{openssl_extra_ldflags} #{suffix}"
+          "#{prefix} #{openssl_extra_ldflags} #{suffix}"
         end
       else
-        return suffix
+        suffix
       end
     end
     memoize :crypto_libs
@@ -47,12 +47,12 @@ module PhusionPassenger
     def self.crypto_extra_cflags
       if os_name_simple == "macosx"
         if os_version < '10.13'
-          return ' -Wno-deprecated-declarations'
+          ' -Wno-deprecated-declarations'
         else
-          return " -Wno-deprecated-declarations #{openssl_extra_cflags}"
+          " -Wno-deprecated-declarations #{openssl_extra_cflags}"
         end
       else
-        return ''
+        ''
       end
     end
     memoize :crypto_extra_cflags

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

@@ -30,14 +30,14 @@ module PhusionPassenger
     def self.curl_flags
       result = `(curl-config --cflags) 2>/dev/null`.strip
       if result.empty?
-        return nil
+        nil
       else
         version = `curl-config --vernum`.strip
         if version >= '070c01'
           # Curl >= 7.12.1 supports curl_easy_reset()
           result << " -DHAS_CURL_EASY_RESET"
         end
-        return result
+        result
       end
     end
     memoize :curl_flags
@@ -48,16 +48,16 @@ module PhusionPassenger
         result << ' -framework Foundation -framework SystemConfiguration'
       end
       if result.empty?
-        return nil
+        nil
       else
-        return result
+        result
       end
     end
     memoize :curl_libs
 
     def self.curl_supports_ssl?
       features = `(curl-config --feature) 2>/dev/null`
-      return features =~ /SSL/
+      features =~ /SSL/
     end
     memoize :curl_supports_ssl?
   end

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

@@ -32,28 +32,28 @@ module PhusionPassenger
     # Extra flags that should always be passed to the C compiler
     # when linking, to be included last in the command string.
     def self.portability_c_ldflags
-      return portability_c_or_cxx_ldflags(:c)
+      portability_c_or_cxx_ldflags(:c)
     end
     memoize :portability_c_ldflags
 
     # Extra flags that should always be passed to the C++ compiler
     # when linking, to be included last in the command string.
     def self.portability_cxx_ldflags
-      return portability_c_or_cxx_ldflags(:cxx)
+      portability_c_or_cxx_ldflags(:cxx)
     end
     memoize :portability_cxx_ldflags
 
     # Extra compiler flags that should always be passed to the C compiler,
     # last in the command string.
     def self.default_extra_cflags
-      return default_extra_c_or_cxxflags(:cc)
+      default_extra_c_or_cxxflags(:cc)
     end
     memoize :default_extra_cflags, true
 
     # Extra compiler flags that should always be passed to the C++ compiler,
     # last in the command string.
     def self.default_extra_cxxflags
-      return default_extra_c_or_cxxflags(:cxx)
+      default_extra_c_or_cxxflags(:cxx)
     end
     memoize :default_extra_cxxflags, true
 
@@ -61,8 +61,8 @@ module PhusionPassenger
     def self.check_hash_map(flags)
       hash_namespace = nil
       ok = false
-      ['__gnu_cxx', '', 'std', 'stdext'].each do |namespace|
-        ['hash_map', 'ext/hash_map'].each do |hash_map_header|
+      [ '__gnu_cxx', '', 'std', 'stdext' ].each do |namespace|
+        [ 'hash_map', 'ext/hash_map' ].each do |hash_map_header|
           ok = try_compile("Checking for #{hash_map_header}", :cxx, %Q{
             #include <#{hash_map_header}>
             int
@@ -81,9 +81,9 @@ module PhusionPassenger
         end
         break if ok
       end
-      ['ext/hash_fun.h', 'functional', 'tr1/functional',
+      [ 'ext/hash_fun.h', 'functional', 'tr1/functional',
        'ext/stl_hash_fun.h', 'hash_fun.h', 'stl_hash_fun.h',
-       'stl/_hash_fun.h'].each do |hash_function_header|
+       'stl/_hash_fun.h' ].each do |hash_function_header|
         ok = try_compile("Checking for #{hash_function_header}", :cxx, %Q{
           #include <#{hash_function_header}>
           int
@@ -186,7 +186,7 @@ module PhusionPassenger
         flags << '-O'
       end
 
-      return flags.join(' ')
+      flags.join(' ')
     end
     private_class_method :default_extra_c_or_cxxflags
 
@@ -201,7 +201,7 @@ module PhusionPassenger
       result << '-lrt' if has_rt_library?
       result << '-lmath' if has_math_library?
       result << '-ldl' if has_dl_library?
-      return result.join(' ')
+      result.join(' ')
     end
     private_class_method :portability_c_or_cxx_ldflags
   end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/linux'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
@@ -200,7 +201,7 @@ module PhusionPassenger
         def check_for_ruby_library(name)
           begin
             require(name)
-            { :found => true }
+            { found: true }
           rescue LoadError
             if defined?(Gem)
               false
@@ -208,7 +209,7 @@ module PhusionPassenger
               begin
                 require 'rubygems'
                 require(name)
-                { :found => true }
+                { found: true }
               rescue LoadError
                 false
               end
@@ -291,7 +292,7 @@ module PhusionPassenger
         end
 
         def gem_command
-          PlatformInfo.gem_command(:sudo => true) || 'gem'
+          PlatformInfo.gem_command(sudo: true) || 'gem'
         end
 
         def find_command(command, *args)
@@ -334,7 +335,7 @@ module PhusionPassenger
               raise "Cannot find depcheck spec #{identifier.inspect}" if !dep
               puts_header "Checking for #{dep.name}..."
               result = dep.check
-              result = { :found => false } if !result
+              result = { found: false } if !result
 
               if result[:found] && !result[:error]
                 puts_detail "Found: <green>yes</green>"
@@ -355,7 +356,7 @@ module PhusionPassenger
               end
             end
 
-            return @missing_dependencies.empty?
+            @missing_dependencies.empty?
           ensure
             PlatformInfo.log_implementation = old_log_impl
           end

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

@@ -7,7 +7,7 @@ define 'apache2' do
       {
         :found => true,
         "Location of httpd" => PlatformInfo.httpd,
-        "Apache version"    => PlatformInfo.httpd_version
+        "Apache version"    => PlatformInfo.httpd_version,
       }
     else
       false
@@ -15,7 +15,7 @@ define 'apache2' do
   end
 
   on :ubuntu do
-    if `#{PlatformInfo::uname_command} -a`.include? 'precise'
+    if `#{PlatformInfo.uname_command} -a`.include? 'precise'
       apt_get_install "apache2-mpm-worker"
     else
       apt_get_install "apache2"
@@ -43,7 +43,7 @@ define 'apache2-dev' do
     if PlatformInfo.apxs2
       {
         :found => true,
-        "Location of apxs2" => PlatformInfo.apxs2
+        "Location of apxs2" => PlatformInfo.apxs2,
       }
     else
       false
@@ -51,14 +51,14 @@ define 'apache2-dev' do
   end
 
   on :ubuntu do
-    if `#{PlatformInfo::uname_command} -a`.include? 'precise'
+    if `#{PlatformInfo.uname_command} -a`.include? 'precise'
       apt_get_install "apache2-threaded-dev"
     else
       apt_get_install "apache2-dev"
     end
   end
   on :debian do
-    if PlatformInfo::os_version >= '9.4'
+    if PlatformInfo.os_version >= '9.4'
       apt_get_install "apache2-dev"
     else
       apt_get_install "apache2-threaded-dev"
@@ -87,7 +87,7 @@ define 'apr-dev' do
       {
         :found     => true,
         "Location" => PlatformInfo.apr_config,
-        "Version"  => `#{PlatformInfo.apr_config} --version`.strip
+        "Version"  => `#{PlatformInfo.apr_config} --version`.strip,
       }
     else
       false
@@ -120,7 +120,7 @@ define 'apu-dev' do
       {
         :found     => true,
         "Location" => PlatformInfo.apu_config,
-        "Version"  => `#{PlatformInfo.apu_config} --version`.strip
+        "Version"  => `#{PlatformInfo.apu_config} --version`.strip,
       }
     else
       false

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

@@ -22,7 +22,7 @@ define 'libcurl-dev' do
   website "http://curl.haxx.se/libcurl"
   define_checker do
     PhusionPassenger.require_passenger_lib 'platform_info/curl'
-    result = { :found => false }
+    result = { found: false }
 
     if !(curl_config = PlatformInfo.find_command('curl-config'))
       result[:error] = "Cannot find the `curl-config` command."