passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/about_command.rb

@@ -25,173 +25,173 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class AboutCommand < Command
-	def self.help
-		puts "Usage: passenger-config about <SUBCOMMAND>"
-		puts
-		puts "  Show information about #{PROGRAM_NAME}."
-		puts
-		puts "Available subcommands:"
-		puts "  root                     Show #{PROGRAM_NAME}'s root."
-		puts "  ruby-libdir              Show #{PROGRAM_NAME}'s Ruby library directory."
-		puts "  includedir               Show the Nginx runtime library headers directory."
-		puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
-		puts "  nginx-libs               Show Nginx runtime library flags."
-		puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
-		puts "  compiled                 Check whether runtime libraries are compiled."
-		puts "  custom-packaged          Check whether Phusion Passenger is custom"
-		puts "                           packaged."
-		puts "  installed-from-release-package  Check whether this installation came from"
-		puts "                                  an official release package."
-		puts "  make-locations-ini       Generate a locations.ini based on the current"
-		puts "                           install paths."
-		puts "  detect-apache2           Autodetect Apache installations."
-		puts "  ruby-command             Show the correct command for invoking the Ruby"
-		puts "                           interpreter."
-		puts "  rubyext-compat-id        Show the Ruby extension binary compatibility ID."
-		puts "  cxx-compat-id            Show the C++ binary compatibility ID."
-		puts "  version                  Show the version number."
-	end
+    class AboutCommand < Command
+      def self.help
+        puts "Usage: passenger-config about <SUBCOMMAND>"
+        puts
+        puts "  Show information about #{PROGRAM_NAME}."
+        puts
+        puts "Available subcommands:"
+        puts "  root                     Show #{PROGRAM_NAME}'s root."
+        puts "  ruby-libdir              Show #{PROGRAM_NAME}'s Ruby library directory."
+        puts "  includedir               Show the Nginx runtime library headers directory."
+        puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
+        puts "  nginx-libs               Show Nginx runtime library flags."
+        puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
+        puts "  compiled                 Check whether runtime libraries are compiled."
+        puts "  custom-packaged          Check whether Phusion Passenger is custom"
+        puts "                           packaged."
+        puts "  installed-from-release-package  Check whether this installation came from"
+        puts "                                  an official release package."
+        puts "  make-locations-ini       Generate a locations.ini based on the current"
+        puts "                           install paths."
+        puts "  detect-apache2           Autodetect Apache installations."
+        puts "  ruby-command             Show the correct command for invoking the Ruby"
+        puts "                           interpreter."
+        puts "  rubyext-compat-id        Show the Ruby extension binary compatibility ID."
+        puts "  cxx-compat-id            Show the C++ binary compatibility ID."
+        puts "  version                  Show the version number."
+      end
 
-	def run
-		PhusionPassenger.require_passenger_lib 'platform_info'
-		PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+      def run
+        PhusionPassenger.require_passenger_lib 'platform_info'
+        PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 
-		subcommand = @argv[0].to_s.dup
-		# Compatibility with version <= 4.0.29: accept both
-		# 'subcommand' and '--subcommand'.
-		subcommand = "--#{subcommand}" if subcommand !~ /^--/
+        subcommand = @argv[0].to_s.dup
+        # Compatibility with version <= 4.0.29: accept both
+        # 'subcommand' and '--subcommand'.
+        subcommand = "--#{subcommand}" if subcommand !~ /^--/
 
-		case subcommand
-		when "--root"
-			puts PhusionPassenger.install_spec
-		when "--ruby-libdir"
-			puts PhusionPassenger.ruby_libdir
-		when "--includedir"
-			puts PhusionPassenger.include_dir
-		when "--nginx-addon-dir"
-			puts PhusionPassenger.nginx_module_source_dir
-		when "--nginx-libs"
-			puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
-		when "--resourcesdir"
-			puts PhusionPassenger.resources_dir
-		when "--compiled"
-			common_library.link_objects.each do |filename|
-				if !File.exist?(filename)
-					exit 1
-				end
-			end
-			if File.exist?("#{PhusionPassenger.lib_dir}/common/libboost_oxt.a")
-				exit 0
-			else
-				exit 1
-			end
-		when "--custom-packaged"
-			if PhusionPassenger.custom_packaged?
-				exit 0
-			else
-				exit 1
-			end
-		when "--installed-from-release-package"
-			if PhusionPassenger.installed_from_release_package?
-				exit 0
-			else
-				exit 1
-			end
-		when "--make-locations-ini"
-			if @argv[1] =~ /^--for-(native-)?packaging-method=(.*)/
-				packaging_method = $2
-			else
-				packaging_method = nil
-			end
+        case subcommand
+        when "--root"
+          puts PhusionPassenger.install_spec
+        when "--ruby-libdir"
+          puts PhusionPassenger.ruby_libdir
+        when "--includedir"
+          puts PhusionPassenger.include_dir
+        when "--nginx-addon-dir"
+          puts PhusionPassenger.nginx_module_source_dir
+        when "--nginx-libs"
+          puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
+        when "--resourcesdir"
+          puts PhusionPassenger.resources_dir
+        when "--compiled"
+          common_library.link_objects.each do |filename|
+            if !File.exist?(filename)
+              exit 1
+            end
+          end
+          if File.exist?("#{PhusionPassenger.lib_dir}/common/libboost_oxt.a")
+            exit 0
+          else
+            exit 1
+          end
+        when "--custom-packaged"
+          if PhusionPassenger.custom_packaged?
+            exit 0
+          else
+            exit 1
+          end
+        when "--installed-from-release-package"
+          if PhusionPassenger.installed_from_release_package?
+            exit 0
+          else
+            exit 1
+          end
+        when "--make-locations-ini"
+          if @argv[1] =~ /^--for-(native-)?packaging-method=(.*)/
+            packaging_method = $2
+          else
+            packaging_method = nil
+          end
 
-			puts "[locations]"
-			if packaging_method
-				puts "packaging_method=#{packaging_method}"
-			else
-				if PhusionPassenger.custom_packaged?
-					puts "packaging_method=#{PhusionPassenger.packaging_method}"
-				else
-					puts "packaging_method=unknown"
-				end
-			end
-			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
-				puts "#{field}=#{PhusionPassenger.send(field)}"
-			end
-			PhusionPassenger::OPTIONAL_LOCATIONS_INI_FIELDS.each do |field|
-				value = PhusionPassenger.send(field)
-				puts "#{field}=#{value}" if value
-			end
-		when "--detect-apache2"
-			PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
-			detector = PhusionPassenger::PlatformInfo::ApacheDetector.new(STDOUT)
-			STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
-			STDOUT.flush
-			begin
-				detector.detect_all
-				detector.report
-			ensure
-				detector.finish
-				STDOUT.write(Utils::AnsiColors::RESET)
-				STDOUT.flush
-			end
-		when "--ruby-command"
-			PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-			ruby = PhusionPassenger::PlatformInfo.ruby_command
-			puts "passenger-config was invoked through the following Ruby interpreter:"
-			puts "  Command: #{ruby}"
-			STDOUT.write "  Version: "
-			STDOUT.flush
-			system("/bin/sh -c '#{ruby} -v'")
-			puts "  To use in Apache: PassengerRuby #{ruby}"
-			puts "  To use in Nginx : passenger_ruby #{ruby}"
-			puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
-			puts
+          puts "[locations]"
+          if packaging_method
+            puts "packaging_method=#{packaging_method}"
+          else
+            if PhusionPassenger.custom_packaged?
+              puts "packaging_method=#{PhusionPassenger.packaging_method}"
+            else
+              puts "packaging_method=unknown"
+            end
+          end
+          PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
+            puts "#{field}=#{PhusionPassenger.send(field)}"
+          end
+          PhusionPassenger::OPTIONAL_LOCATIONS_INI_FIELDS.each do |field|
+            value = PhusionPassenger.send(field)
+            puts "#{field}=#{value}" if value
+          end
+        when "--detect-apache2"
+          PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
+          detector = PhusionPassenger::PlatformInfo::ApacheDetector.new(STDOUT)
+          STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
+          STDOUT.flush
+          begin
+            detector.detect_all
+            detector.report
+          ensure
+            detector.finish
+            STDOUT.write(Utils::AnsiColors::RESET)
+            STDOUT.flush
+          end
+        when "--ruby-command"
+          PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+          ruby = PhusionPassenger::PlatformInfo.ruby_command
+          puts "passenger-config was invoked through the following Ruby interpreter:"
+          puts "  Command: #{ruby}"
+          STDOUT.write "  Version: "
+          STDOUT.flush
+          system("/bin/sh -c '#{ruby} -v'")
+          puts "  To use in Apache: PassengerRuby #{ruby}"
+          puts "  To use in Nginx : passenger_ruby #{ruby}"
+          puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
+          puts
 
-			ruby = PhusionPassenger::PlatformInfo.find_command('ruby')
-			if ruby && !ruby.include?("rvm/rubies/")
-				# If this is an RVM Ruby executable then we don't show it. We want people to
-				# use the RVM wrapper scripts only.
-				puts "The following Ruby interpreter was found first in $PATH:"
-				puts "  Command: #{ruby}"
-				STDOUT.write "  Version: "
-				STDOUT.flush
-				system("/bin/sh -c '#{ruby} -v'")
-				puts "  To use in Apache: PassengerRuby #{ruby}"
-				puts "  To use in Nginx : passenger_ruby #{ruby}"
-				puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
-			elsif !ruby.include?("rvm/rubies/")
-				puts "No Ruby interpreter found in $PATH."
-			end
-			puts
-			puts "## Notes for RVM users"
-			puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
-		when "--rubyext-compat-id"
-			PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
-			puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id
-		when "--cxx-compat-id"
-			PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
-			puts PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
-		when "--version"
-			puts PhusionPassenger::VERSION_STRING
-		when "--help"
-			self.class.help
-		else
-			self.class.help
-			exit 1
-		end
-	end
+          ruby = PhusionPassenger::PlatformInfo.find_command('ruby')
+          if ruby && !ruby.include?("rvm/rubies/")
+            # If this is an RVM Ruby executable then we don't show it. We want people to
+            # use the RVM wrapper scripts only.
+            puts "The following Ruby interpreter was found first in $PATH:"
+            puts "  Command: #{ruby}"
+            STDOUT.write "  Version: "
+            STDOUT.flush
+            system("/bin/sh -c '#{ruby} -v'")
+            puts "  To use in Apache: PassengerRuby #{ruby}"
+            puts "  To use in Nginx : passenger_ruby #{ruby}"
+            puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
+          elsif !ruby.include?("rvm/rubies/")
+            puts "No Ruby interpreter found in $PATH."
+          end
+          puts
+          puts "## Notes for RVM users"
+          puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
+        when "--rubyext-compat-id"
+          PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+          puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id
+        when "--cxx-compat-id"
+          PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+          puts PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
+        when "--version"
+          puts PhusionPassenger::VERSION_STRING
+        when "--help"
+          self.class.help
+        else
+          self.class.help
+          exit 1
+        end
+      end
 
-private
-	def common_library
-		PhusionPassenger.require_passenger_lib 'common_library'
-		return COMMON_LIBRARY.
-			only(*NGINX_LIBS_SELECTOR).
-			set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
-	end
-end
+    private
+      def common_library
+        PhusionPassenger.require_passenger_lib 'common_library'
+        return COMMON_LIBRARY.
+          only(*NGINX_LIBS_SELECTOR).
+          set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/admin_command_command.rb

@@ -31,145 +31,145 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class AdminCommandCommand < Command
-	include PhusionPassenger::Config::Utils
+    class AdminCommandCommand < Command
+      include PhusionPassenger::Config::Utils
 
-	def self.create_default_options
-		return { :socket => "server_admin" }
-	end
+      def self.create_default_options
+        return { :socket => "server_admin" }
+      end
 
-	def run
-		parse_options
-		initialize_objects
-		select_passenger_instance
-		invoke
-	end
+      def run
+        parse_options
+        initialize_objects
+        select_passenger_instance
+        invoke
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config invoke-command <METHOD> <PATH> [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  Invoke an internal #{PROGRAM_NAME} admin command. #{PROGRAM_NAME} listens"
-			opts.separator "  on a local HTTP server for admin commands. Other `passenger-config` commands"
-			opts.separator "  are just shortcuts for sending specific HTTP requests to the"
-			opts.separator "  #{PROGRAM_NAME} admin HTTP server. `passenger-config invoke-command` allows"
-			opts.separator "  you to send requests directly."
-			opts.separator ""
-			opts.separator "  METHOD is an HTTP verb, like 'GET', 'POST', 'PUT' or 'DELETE'."
-			opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
-			opts.separator ""
-			opts.separator "  Example: passenger-config admin-command GET /server.json"
-			opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
-			opts.separator ""
-			opts.separator "  Example: passenger-config admin-command PUT /config.json \\"
-			opts.separator "           -d '{\"log_level\", 7}'"
-			opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
-			opts.separator "  given PUT data."
-			opts.separator ""
-			opts.separator "  Example: passenger-config admin-command POST /shutdown.json -a watchdog"
-			opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config invoke-command <METHOD> <PATH> [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Invoke an internal #{PROGRAM_NAME} admin command. #{PROGRAM_NAME} listens"
+          opts.separator "  on a local HTTP server for admin commands. Other `passenger-config` commands"
+          opts.separator "  are just shortcuts for sending specific HTTP requests to the"
+          opts.separator "  #{PROGRAM_NAME} admin HTTP server. `passenger-config invoke-command` allows"
+          opts.separator "  you to send requests directly."
+          opts.separator ""
+          opts.separator "  METHOD is an HTTP verb, like 'GET', 'POST', 'PUT' or 'DELETE'."
+          opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
+          opts.separator ""
+          opts.separator "  Example: passenger-config admin-command GET /server.json"
+          opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
+          opts.separator ""
+          opts.separator "  Example: passenger-config admin-command PUT /config.json \\"
+          opts.separator "           -d '{\"log_level\", 7}'"
+          opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
+          opts.separator "  given PUT data."
+          opts.separator ""
+          opts.separator "  Example: passenger-config admin-command POST /shutdown.json -a watchdog"
+          opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("-d", "--data DATA", String, "Specify HTTP request body data") do |value|
-				options[:data] = value
-			end
-			opts.on("-i", "--stdin", "Read HTTP request body data from stdin") do
-				options[:data_source] = :stdin
-			end
-			opts.on("-f", "--data-file PATH", String, "Read HTTP request body data from the given#{nl}" +
-				"file") do |value|
-				options[:data_source] = value
-			end
-			opts.on("-a", "--agent NAME", String, "The name of the socket to send the command#{nl}" +
-				"to. This specifies which agent the request#{nl}" +
-				"is sent to. Choices: watchdog,#{nl}" +
-				"server_admin, logging_admin.#{nl}" +
-				"Default: server_admin") do |val|
-				options[:socket] = val
-			end
-			opts.on("--show-headers", "Show HTTP response headers") do
-				options[:show_headers] = true
-			end
-			opts.on("--ignore-response-code", "Exit successfully even if a non-2xx response was returned") do
-				options[:ignore_response_code] = true
-			end
-			opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
-				options[:instance] = value
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("-d", "--data DATA", String, "Specify HTTP request body data") do |value|
+            options[:data] = value
+          end
+          opts.on("-i", "--stdin", "Read HTTP request body data from stdin") do
+            options[:data_source] = :stdin
+          end
+          opts.on("-f", "--data-file PATH", String, "Read HTTP request body data from the given#{nl}" +
+            "file") do |value|
+            options[:data_source] = value
+          end
+          opts.on("-a", "--agent NAME", String, "The name of the socket to send the command#{nl}" +
+            "to. This specifies which agent the request#{nl}" +
+            "is sent to. Choices: watchdog,#{nl}" +
+            "server_admin, logging_admin.#{nl}" +
+            "Default: server_admin") do |val|
+            options[:socket] = val
+          end
+          opts.on("--show-headers", "Show HTTP response headers") do
+            options[:show_headers] = true
+          end
+          opts.on("--ignore-response-code", "Exit successfully even if a non-2xx response was returned") do
+            options[:ignore_response_code] = true
+          end
+          opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
+            options[:instance] = value
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def initialize_objects
-		if @argv.size != 2
-			abort "You've passed to few arguments. See --help for more information."
-		end
+      def initialize_objects
+        if @argv.size != 2
+          abort "You've passed to few arguments. See --help for more information."
+        end
 
-		@method = @argv[0]
-		@path   = @argv[1]
+        @method = @argv[0]
+        @path   = @argv[1]
 
-		case @method.upcase
-		when "GET"
-			@request = Net::HTTP::Get.new(@path)
-		when "POST"
-			@request = Net::HTTP::Post.new(@path)
-		when "PUT"
-			@request = Net::HTTP::Put.new(@path)
-		when "DELETE"
-			@request = Net::HTTP::Delete.new(@path)
-		else
-			abort "Unknown method #{@method.inspect}. Please specify either GET, POST, PUT or DELETE."
-		end
-		if @path !~ /\A\//
-			abort "The path must start with a slash (/). See --help for more information."
-		end
+        case @method.upcase
+        when "GET"
+          @request = Net::HTTP::Get.new(@path)
+        when "POST"
+          @request = Net::HTTP::Post.new(@path)
+        when "PUT"
+          @request = Net::HTTP::Put.new(@path)
+        when "DELETE"
+          @request = Net::HTTP::Delete.new(@path)
+        else
+          abort "Unknown method #{@method.inspect}. Please specify either GET, POST, PUT or DELETE."
+        end
+        if @path !~ /\A\//
+          abort "The path must start with a slash (/). See --help for more information."
+        end
 
-		if @options[:data] && @options[:data_source]
-			abort "You cannot specify both --data and --stdin/--data-file. Please choose either one."
-		end
-		if @options[:data_source] == :stdin
-			STDIN.binmode
-			@options[:data] = STDIN.read
-		elsif @options[:data_source]
-			File.open(@options[:data_source], "rb") do |f|
-				@options[:data] = f.read
-			end
-		end
-	end
+        if @options[:data] && @options[:data_source]
+          abort "You cannot specify both --data and --stdin/--data-file. Please choose either one."
+        end
+        if @options[:data_source] == :stdin
+          STDIN.binmode
+          @options[:data] = STDIN.read
+        elsif @options[:data_source]
+          File.open(@options[:data_source], "rb") do |f|
+            @options[:data] = f.read
+          end
+        end
+      end
 
-	def invoke
-		password = obtain_full_admin_password(@instance)
-		@request.basic_auth("admin", password)
-		@request["connection"] = "close"
-		if @options[:data]
-			@request.content_type = "application/json"
-			@request.body = @options[:data]
-		end
-		response = @instance.http_request("agents.s/#{@options[:socket]}", @request)
-		if @options[:show_headers]
-			print_headers(response)
-		end
-		puts response.body
-		if !@options[:ignore_response_code] && response.code.to_i / 100 != 2
-			abort
-		end
-	end
+      def invoke
+        password = obtain_full_admin_password(@instance)
+        @request.basic_auth("admin", password)
+        @request["connection"] = "close"
+        if @options[:data]
+          @request.content_type = "application/json"
+          @request.body = @options[:data]
+        end
+        response = @instance.http_request("agents.s/#{@options[:socket]}", @request)
+        if @options[:show_headers]
+          print_headers(response)
+        end
+        puts response.body
+        if !@options[:ignore_response_code] && response.code.to_i / 100 != 2
+          abort
+        end
+      end
 
-	def print_headers(response)
-		puts "HTTP/1.1 #{response.message} #{response.code}"
-		response.each_header do |name, val|
-			puts "#{name}: #{val}"
-		end
-		puts
-	end
-end
+      def print_headers(response)
+        puts "HTTP/1.1 #{response.message} #{response.code}"
+        response.each_header do |name, val|
+          puts "#{name}: #{val}"
+        end
+        puts
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger