passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -22,132 +22,132 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Utils
-
-module AnsiColors
-	RESET    = "\e[0m".freeze
-	BOLD     = "\e[1m".freeze
-	DGRAY    = "\e[90m".freeze
-	RED      = "\e[31m".freeze
-	ORANGE   = "\e[38;5;214m".freeze
-	GREEN    = "\e[32m".freeze
-	YELLOW   = "\e[33m".freeze
-	WHITE    = "\e[37m".freeze
-	BLACK_BG = "\e[40m".freeze
-	BLUE_BG  = "\e[44m".freeze
-	DEFAULT_TERMINAL_COLOR = "#{RESET}#{WHITE}#{BLACK_BG}".freeze
-
-	extend self  # Make methods available as class methods.
-
-	def self.new(type = :auto)
-		return AnsiColorsPrinter.new(type)
-	end
-
-	def self.included(klass)
-		# When included into another class, make sure that Utils
-		# methods are made private.
-		public_instance_methods(false).each do |method_name|
-			klass.send(:private, method_name)
-		end
-	end
-
-	def ansi_colorize(text)
-		text = text.gsub(%r{<b>(.*?)</b>}m, "#{BOLD}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<dgray>(.*?)</dgray>}m, "#{BOLD}#{DGRAY}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<red>(.*?)</red>}m, "#{BOLD}#{RED}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<orange>(.*?)</orange>}m, "#{BOLD}#{ORANGE}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<green>(.*?)</green>}m, "#{BOLD}#{GREEN}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<yellow>(.*?)</yellow>}m, "#{BOLD}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
-		text.gsub!(%r{<banner>(.*?)</banner>}m, "#{BOLD}#{BLUE_BG}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
-		return text
-	end
-
-	def strip_color_tags(text)
-		text = text.gsub(%r{<b>(.*?)</b>}m, "\\1")
-		text = text.gsub(%r{<dgray>(.*?)</dgray>}m, "\\1")
-		text.gsub!(%r{<red>(.*?)</red>}m, "\\1")
-		text.gsub!(%r{<orange>(.*?)</orange>}m, "\\1")
-		text.gsub!(%r{<green>(.*?)</green>}m, "\\1")
-		text.gsub!(%r{<yellow>(.*?)</yellow>}m, "\\1")
-		text.gsub!(%r{<banner>(.*?)</banner>}m, "\\1")
-		return text
-	end
-end
-
-class AnsiColorsPrinter
-	def initialize(enabled = :auto)
-		@enabled = enabled
-	end
-
-	def reset
-		return maybe_colorize(AnsiColors::RESET)
-	end
-
-	def bold
-		return maybe_colorize(AnsiColors::BOLD)
-	end
-
-	def dgray
-		return maybe_colorize(AnsiColors::DGRAY)
-	end
-
-	def red
-		return maybe_colorize(AnsiColors::RED)
-	end
-
-	def orange
-		return maybe_colorize(AnsiColors::ORANGE)
-	end
-
-	def green
-		return maybe_colorize(AnsiColors::GREEN)
-	end
-
-	def yellow
-		return maybe_colorize(AnsiColors::YELLOW)
-	end
-
-	def white
-		return maybe_colorize(AnsiColors::WHITE)
-	end
-
-	def black_bg
-		return maybe_colorize(AnsiColors::BLACK_BG)
-	end
-
-	def blue_bg
-		return maybe_colorize(AnsiColors::BLUE_BG)
-	end
-
-	def default_terminal_color
-		return maybe_colorize(AnsiColors::DEFAULT_TERMINAL_COLOR)
-	end
-
-	def ansi_colorize(text)
-		if should_output_color?
-			return AnsiColors.ansi_colorize(text)
-		else
-			return AnsiColors.strip_color_tags(text)
-		end
-	end
-
-private
-	def maybe_colorize(ansi_color)
-		if should_output_color?
-			return ansi_color
-		else
-			return ""
-		end
-	end
-
-	def should_output_color?
-		if @enabled == :auto
-			return STDOUT.tty?
-		else
-			return @enabled
-		end
-	end
-end
-
-end # module Utils
+  module Utils
+
+    module AnsiColors
+      RESET    = "\e[0m".freeze
+      BOLD     = "\e[1m".freeze
+      DGRAY    = "\e[90m".freeze
+      RED      = "\e[31m".freeze
+      ORANGE   = "\e[38;5;214m".freeze
+      GREEN    = "\e[32m".freeze
+      YELLOW   = "\e[33m".freeze
+      WHITE    = "\e[37m".freeze
+      BLACK_BG = "\e[40m".freeze
+      BLUE_BG  = "\e[44m".freeze
+      DEFAULT_TERMINAL_COLOR = "#{RESET}#{WHITE}#{BLACK_BG}".freeze
+
+      extend self  # Make methods available as class methods.
+
+      def self.new(type = :auto)
+        return AnsiColorsPrinter.new(type)
+      end
+
+      def self.included(klass)
+        # When included into another class, make sure that Utils
+        # methods are made private.
+        public_instance_methods(false).each do |method_name|
+          klass.send(:private, method_name)
+        end
+      end
+
+      def ansi_colorize(text)
+        text = text.gsub(%r{<b>(.*?)</b>}m, "#{BOLD}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<dgray>(.*?)</dgray>}m, "#{BOLD}#{DGRAY}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<red>(.*?)</red>}m, "#{BOLD}#{RED}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<orange>(.*?)</orange>}m, "#{BOLD}#{ORANGE}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<green>(.*?)</green>}m, "#{BOLD}#{GREEN}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<yellow>(.*?)</yellow>}m, "#{BOLD}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<banner>(.*?)</banner>}m, "#{BOLD}#{BLUE_BG}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
+        return text
+      end
+
+      def strip_color_tags(text)
+        text = text.gsub(%r{<b>(.*?)</b>}m, "\\1")
+        text = text.gsub(%r{<dgray>(.*?)</dgray>}m, "\\1")
+        text.gsub!(%r{<red>(.*?)</red>}m, "\\1")
+        text.gsub!(%r{<orange>(.*?)</orange>}m, "\\1")
+        text.gsub!(%r{<green>(.*?)</green>}m, "\\1")
+        text.gsub!(%r{<yellow>(.*?)</yellow>}m, "\\1")
+        text.gsub!(%r{<banner>(.*?)</banner>}m, "\\1")
+        return text
+      end
+    end
+
+    class AnsiColorsPrinter
+      def initialize(enabled = :auto)
+        @enabled = enabled
+      end
+
+      def reset
+        return maybe_colorize(AnsiColors::RESET)
+      end
+
+      def bold
+        return maybe_colorize(AnsiColors::BOLD)
+      end
+
+      def dgray
+        return maybe_colorize(AnsiColors::DGRAY)
+      end
+
+      def red
+        return maybe_colorize(AnsiColors::RED)
+      end
+
+      def orange
+        return maybe_colorize(AnsiColors::ORANGE)
+      end
+
+      def green
+        return maybe_colorize(AnsiColors::GREEN)
+      end
+
+      def yellow
+        return maybe_colorize(AnsiColors::YELLOW)
+      end
+
+      def white
+        return maybe_colorize(AnsiColors::WHITE)
+      end
+
+      def black_bg
+        return maybe_colorize(AnsiColors::BLACK_BG)
+      end
+
+      def blue_bg
+        return maybe_colorize(AnsiColors::BLUE_BG)
+      end
+
+      def default_terminal_color
+        return maybe_colorize(AnsiColors::DEFAULT_TERMINAL_COLOR)
+      end
+
+      def ansi_colorize(text)
+        if should_output_color?
+          return AnsiColors.ansi_colorize(text)
+        else
+          return AnsiColors.strip_color_tags(text)
+        end
+      end
+
+    private
+      def maybe_colorize(ansi_color)
+        if should_output_color?
+          return ansi_color
+        else
+          return ""
+        end
+      end
+
+      def should_output_color?
+        if @enabled == :auto
+          return STDOUT.tty?
+        else
+          return @enabled
+        end
+      end
+    end
+
+  end # module Utils
 end # module PhusionPassenger

data/lib/phusion_passenger/utils/download.rb

@@ -27,200 +27,200 @@ PhusionPassenger.require_passenger_lib 'utils/shellwords'
 require 'fileutils'
 
 module PhusionPassenger
-module Utils
-
-module Download
-	extend self    # Make methods available as class methods.
-
-	def self.included(klass)
-		# When included into another class, make sure that Utils
-		# methods are made private.
-		public_instance_methods(false).each do |method_name|
-			klass.send(:private, method_name)
-		end
-	end
-
-	# Downloads a file from the given URL and saves it to the given filename.
-	# Returns whether the download succeeded.
-	# 
-	# Options:
-	#
-	#   show_progress: whether to show download progress. Default: false.
-	#   logger: the logger to use. If not given, this function will log to STDERR.
-	#   cacert: a CA certificate file to use for verifying SSL websites.
-	#           The default is to use the download tool's down CA database.
-	#   use_cache: Whether to copy the file from the download cache, if available.
-	#              Default: false.
-	#   connect_timeout: The maximum amount of time to spend on DNS lookup
-	#                    and establishing the TCP connection. Set to nil to
-	#                    disable this timeout. Default: 4.
-	#   idle_timeout: The maximum idle read time. Set to nil to set this timeout
-	#                 to the default wget value, 900. Set to nil to disable this
-	#                 timeout. Default: 5.
-	#   total_timeout: The maximum amount of time spent on the whole download
-	#                  operation, including connection time. Only has effect on curl.
-	#                  Set to nil to disable this timeout. Default: nil.
-	def download(url, output, options = {})
-		options = {
-			:connect_timeout => 4,
-			:idle_timeout    => 5
-		}.merge(options)
-		logger = options[:logger] || Logger.new(STDERR)
-
-		if options[:use_cache] && cache_dir = PhusionPassenger.download_cache_dir
-			basename = basename_from_url(url)
-			if File.exist?("#{cache_dir}/#{basename}")
-				logger.info "Copying #{basename} from #{cache_dir}..."
-				FileUtils.cp("#{cache_dir}/#{basename}", output)
-				return true
-			end
-		end
-
-		if PlatformInfo.find_command("curl")
-			return download_with_curl(logger, url, output, options)
-		elsif PlatformInfo.find_command("wget")
-			return download_with_wget(logger, url, output, options)
-		else
-			logger.error "Could not download #{url}: no download tool found (curl or wget required)"
-			return false
-		end
-	end
-
-private
-	def basename_from_url(url)
-		return url.sub(/.*\//, '')
-	end
-
-	def download_with_curl(logger, url, output, options)
-		command = ["curl", "-f", "-L", "-o", output]
-		if options[:show_progress]
-			command << "-#"
-		else
-			command << "-s"
-			command << "-S"
-		end
-		if options[:cacert]
-			command << "--cacert"
-			command << options[:cacert]
-		end
-		if options[:connect_timeout]
-			command << "--connect-timeout"
-			command << options[:connect_timeout].to_s
-		end
-		if options[:idle_timeout]
-			command << "--speed-time"
-			command << options[:idle_timeout].to_s
-			command << "--speed-limit"
-			command << "1"
-		end
-		if options[:total_timeout]
-			command << "--max-time"
-			command << options[:total_timeout].to_s
-		end
-		command << url
-		command_str = Shellwords.join(command)
-		logger.info("Invoking: #{command_str}")
-
-		if options[:show_progress]
-			# If curl errors out we don't want it to display 'curl: ' prefixes,
-			# so we parse its output.
-			begin
-				io = IO.popen("#{command_str} 2>&1", "r")
-			rescue SystemCallError => e
-				logger.error("Could not invoke curl: #{e}")
-				return false
-			end
-			begin
-				non_empty_line_encountered = false
-				while !io.eof?
-					# We split on "\r" because progress bar lines do not contain "\n".
-					data = io.gets("\r")
-					data = remove_curl_output_prefix(data)
-
-					# If an error occurs then the first few lines may be empty.
-					# Skip those.
-					if !non_empty_line_encountered && data =~ /\A\n+/
-						data.gsub!(/\A\n+/, '')
-					end
-
-					non_empty_line_encountered = true
-					STDERR.write(data)
-					STDERR.flush
-				end
-			ensure
-				io.close
-			end
-			result = $?.exitstatus == 0
-		else
-			begin
-				output = `#{command_str} 2>&1`
-			rescue SystemCallError => e
-				logger.error("Could not invoke curl: #{e}")
-				return false
-			end
-			result = $?.exitstatus == 0
-			if !result
-				output = remove_curl_output_prefix(output)
-				output.chomp!
-				logger.error("Could not download #{url}: #{output}")
-			end
-		end
-
-		return result
-	end
-
-	def remove_curl_output_prefix(line)
-		return line.gsub(/^curl: (\([0-9]+\) )?/, '')
-	end
-
-	def download_with_wget(logger, url, output, options)
-		command = ["wget", "--tries=1", "-O", output]
-		if !options[:show_progress]
-			command << "-nv"
-		end
-		if options[:cacert]
-			command << "--ca-certificate=#{options[:cacert]}"
-		end
-		if options[:connect_timeout]
-			command << "--dns-timeout=#{options[:connect_timeout]}"
-			command << "--connect-timeout=#{options[:connect_timeout]}"
-		end
-		if options[:idle_timeout]
-			command << "--timeout=#{options[:idle_timeout]}"
-		end
-		command << url
-		command_str = Shellwords.join(command)
-		logger.info("Invoking: #{command_str}")
-
-		if options[:show_progress]
-			begin
-				result = system(*command)
-			rescue SystemCallError => e
-				logger.error("Could not invoke wget: #{e}")
-				return false
-			end
-			if !result
-				logger.error("Could not download #{url}: #{output}")
-			end
-		else
-			begin
-				output = `#{command_str} 2>&1`
-			rescue SystemCallError => e
-				logger.error("Could not invoke wget: #{e}")
-				return false
-			end
-			result = $?.exitstatus == 0
-			if !result
-				# Error output may begin with "<URL>:\n" which is redundant.
-				output.gsub!(/\A#{Regexp.escape url}:\n/, '')
-				output.chomp!
-				logger.error("Could not download #{url}: #{output}")
-			end
-		end
-
-		return result
-	end
-end
-
-end # module Utils
+  module Utils
+
+    module Download
+      extend self    # Make methods available as class methods.
+
+      def self.included(klass)
+        # When included into another class, make sure that Utils
+        # methods are made private.
+        public_instance_methods(false).each do |method_name|
+          klass.send(:private, method_name)
+        end
+      end
+
+      # Downloads a file from the given URL and saves it to the given filename.
+      # Returns whether the download succeeded.
+      #
+      # Options:
+      #
+      #   show_progress: whether to show download progress. Default: false.
+      #   logger: the logger to use. If not given, this function will log to STDERR.
+      #   cacert: a CA certificate file to use for verifying SSL websites.
+      #           The default is to use the download tool's down CA database.
+      #   use_cache: Whether to copy the file from the download cache, if available.
+      #              Default: false.
+      #   connect_timeout: The maximum amount of time to spend on DNS lookup
+      #                    and establishing the TCP connection. Set to nil to
+      #                    disable this timeout. Default: 4.
+      #   idle_timeout: The maximum idle read time. Set to nil to set this timeout
+      #                 to the default wget value, 900. Set to nil to disable this
+      #                 timeout. Default: 5.
+      #   total_timeout: The maximum amount of time spent on the whole download
+      #                  operation, including connection time. Only has effect on curl.
+      #                  Set to nil to disable this timeout. Default: nil.
+      def download(url, output, options = {})
+        options = {
+          :connect_timeout => 4,
+          :idle_timeout    => 5
+        }.merge(options)
+        logger = options[:logger] || Logger.new(STDERR)
+
+        if options[:use_cache] && cache_dir = PhusionPassenger.download_cache_dir
+          basename = basename_from_url(url)
+          if File.exist?("#{cache_dir}/#{basename}")
+            logger.info "Copying #{basename} from #{cache_dir}..."
+            FileUtils.cp("#{cache_dir}/#{basename}", output)
+            return true
+          end
+        end
+
+        if PlatformInfo.find_command("curl")
+          return download_with_curl(logger, url, output, options)
+        elsif PlatformInfo.find_command("wget")
+          return download_with_wget(logger, url, output, options)
+        else
+          logger.error "Could not download #{url}: no download tool found (curl or wget required)"
+          return false
+        end
+      end
+
+    private
+      def basename_from_url(url)
+        return url.sub(/.*\//, '')
+      end
+
+      def download_with_curl(logger, url, output, options)
+        command = ["curl", "-f", "-L", "-o", output]
+        if options[:show_progress]
+          command << "-#"
+        else
+          command << "-s"
+          command << "-S"
+        end
+        if options[:cacert]
+          command << "--cacert"
+          command << options[:cacert]
+        end
+        if options[:connect_timeout]
+          command << "--connect-timeout"
+          command << options[:connect_timeout].to_s
+        end
+        if options[:idle_timeout]
+          command << "--speed-time"
+          command << options[:idle_timeout].to_s
+          command << "--speed-limit"
+          command << "1"
+        end
+        if options[:total_timeout]
+          command << "--max-time"
+          command << options[:total_timeout].to_s
+        end
+        command << url
+        command_str = Shellwords.join(command)
+        logger.info("Invoking: #{command_str}")
+
+        if options[:show_progress]
+          # If curl errors out we don't want it to display 'curl: ' prefixes,
+          # so we parse its output.
+          begin
+            io = IO.popen("#{command_str} 2>&1", "r")
+          rescue SystemCallError => e
+            logger.error("Could not invoke curl: #{e}")
+            return false
+          end
+          begin
+            non_empty_line_encountered = false
+            while !io.eof?
+              # We split on "\r" because progress bar lines do not contain "\n".
+              data = io.gets("\r")
+              data = remove_curl_output_prefix(data)
+
+              # If an error occurs then the first few lines may be empty.
+              # Skip those.
+              if !non_empty_line_encountered && data =~ /\A\n+/
+                data.gsub!(/\A\n+/, '')
+              end
+
+              non_empty_line_encountered = true
+              STDERR.write(data)
+              STDERR.flush
+            end
+          ensure
+            io.close
+          end
+          result = $?.exitstatus == 0
+        else
+          begin
+            output = `#{command_str} 2>&1`
+          rescue SystemCallError => e
+            logger.error("Could not invoke curl: #{e}")
+            return false
+          end
+          result = $?.exitstatus == 0
+          if !result
+            output = remove_curl_output_prefix(output)
+            output.chomp!
+            logger.error("Could not download #{url}: #{output}")
+          end
+        end
+
+        return result
+      end
+
+      def remove_curl_output_prefix(line)
+        return line.gsub(/^curl: (\([0-9]+\) )?/, '')
+      end
+
+      def download_with_wget(logger, url, output, options)
+        command = ["wget", "--tries=1", "-O", output]
+        if !options[:show_progress]
+          command << "-nv"
+        end
+        if options[:cacert]
+          command << "--ca-certificate=#{options[:cacert]}"
+        end
+        if options[:connect_timeout]
+          command << "--dns-timeout=#{options[:connect_timeout]}"
+          command << "--connect-timeout=#{options[:connect_timeout]}"
+        end
+        if options[:idle_timeout]
+          command << "--timeout=#{options[:idle_timeout]}"
+        end
+        command << url
+        command_str = Shellwords.join(command)
+        logger.info("Invoking: #{command_str}")
+
+        if options[:show_progress]
+          begin
+            result = system(*command)
+          rescue SystemCallError => e
+            logger.error("Could not invoke wget: #{e}")
+            return false
+          end
+          if !result
+            logger.error("Could not download #{url}: #{output}")
+          end
+        else
+          begin
+            output = `#{command_str} 2>&1`
+          rescue SystemCallError => e
+            logger.error("Could not invoke wget: #{e}")
+            return false
+          end
+          result = $?.exitstatus == 0
+          if !result
+            # Error output may begin with "<URL>:\n" which is redundant.
+            output.gsub!(/\A#{Regexp.escape url}:\n/, '')
+            output.chomp!
+            logger.error("Could not download #{url}: #{output}")
+          end
+        end
+
+        return result
+      end
+    end
+
+  end # module Utils
 end # module PhusionPassenger