passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/standalone/command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,48 +22,52 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Standalone
+  module Standalone
 
-class Command
-	def initialize(argv)
-		@argv = argv.dup
-		@options = self.class.create_default_options
-	end
+    class Command
+      def initialize(argv)
+        @argv = argv.dup
+        @options = self.class.create_default_options
+      end
 
-private
-	def self.create_default_options
-		return {}
-	end
+    private
+      def self.create_default_options
+        return {}
+      end
 
-	def parse_options
-		load_and_merge_default_options(@options)
-		@parser = self.class.create_option_parser(@options)
-		begin
-			@original_argv = @argv.dup
-			@parser.parse!(@argv)
-		rescue OptionParser::ParseError => e
-			STDERR.puts "*** ERROR: #{e}"
-			abort @parser.to_s
-		end
-		if @options[:help]
-			puts @parser
-			exit
-		end
-	end
+      def parse_options
+        load_and_merge_global_options(@options)
+        @parsed_options = {}
+        @parser = self.class.create_option_parser(@parsed_options)
+        begin
+          @original_argv = @argv.dup
+          @parser.parse!(@argv)
+          @options.merge!(@parsed_options)
+        rescue OptionParser::ParseError => e
+          STDERR.puts "*** ERROR: #{e}"
+          abort @parser.to_s
+        end
+        if @options[:help]
+          puts @parser
+          exit
+        end
+      end
 
-	def load_and_merge_default_options(options)
-		path = ConfigUtils.global_config_file_path
-		if File.exist?(path)
-			begin
-				global_options = ConfigUtils.load_config_file(path)
-			rescue ConfigUtils::ConfigLoadError => e
-				STDERR.puts "*** Warning: #{e.message}"
-				return
-			end
-			@options.merge!(global_options)
-		end
-	end
-end
+      def load_and_merge_global_options(options)
+        path = ConfigUtils.global_config_file_path
+        if File.exist?(path)
+          begin
+            @global_options = ConfigUtils.load_config_file(path)
+          rescue ConfigUtils::ConfigLoadError => e
+            STDERR.puts "*** Warning: #{e.message}"
+            return
+          end
+          @options.merge!(@global_options)
+        else
+          @global_options = {}
+        end
+      end
+    end
 
-end # module STandalone
+  end # module Standalone
 end # module PhusionPassenger

data/lib/phusion_passenger/standalone/config_utils.rb

@@ -22,66 +22,66 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Standalone
+  module Standalone
 
-module ConfigUtils
-	extend self    # Make methods available as class methods.
+    module ConfigUtils
+      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
+      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
 
-	class ConfigLoadError < StandardError
-	end
+      class ConfigLoadError < StandardError
+      end
 
-	def global_config_file_path
-		@global_config_file_path ||= File.join(PhusionPassenger.home_dir,
-			USER_NAMESPACE_DIRNAME, "standalone", "config.json")
-	end
+      def global_config_file_path
+        @global_config_file_path ||= File.join(PhusionPassenger.home_dir,
+          USER_NAMESPACE_DIRNAME, "standalone", "config.json")
+      end
 
-	def load_local_config_file!(app_dir, options)
-		config_file = File.join(app_dir, "Passengerfile.json")
-		if !File.exist?(config_file)
-			config_file = File.join(app_dir, "passenger-standalone.json")
-		end
-		if File.exist?(config_file)
-			local_options = load_config_file(config_file)
-			options.merge!(local_options)
-		end
-	end
+      def load_local_config_file!(app_dir, options)
+        config_file = File.join(app_dir, "Passengerfile.json")
+        if !File.exist?(config_file)
+          config_file = File.join(app_dir, "passenger-standalone.json")
+        end
+        if File.exist?(config_file)
+          local_options = load_config_file(config_file)
+          options.merge!(local_options)
+        end
+      end
 
-	def load_config_file(filename)
-		if !defined?(PhusionPassenger::Utils::JSON)
-			PhusionPassenger.require_passenger_lib 'utils/json'
-		end
-		begin
-			data = File.open(filename, "r:utf-8") do |f|
-				f.read
-			end
-		rescue SystemCallError => e
-			raise ConfigLoadError, "cannot load config file #{filename} (#{e})"
-		end
+      def load_config_file(filename)
+        if !defined?(PhusionPassenger::Utils::JSON)
+          PhusionPassenger.require_passenger_lib 'utils/json'
+        end
+        begin
+          data = File.open(filename, "r:utf-8") do |f|
+            f.read
+          end
+        rescue SystemCallError => e
+          raise ConfigLoadError, "cannot load config file #{filename} (#{e})"
+        end
 
-		begin
-			config = PhusionPassenger::Utils::JSON.parse(data)
-		rescue => e
-			raise ConfigLoadError, "cannot parse config file #{filename} (#{e})"
-		end
-		if !config.is_a?(Hash)
-			raise ConfigLoadError, "cannot parse config file #{filename} (it does not contain an object)"
-		end
+        begin
+          config = PhusionPassenger::Utils::JSON.parse(data)
+        rescue => e
+          raise ConfigLoadError, "cannot parse config file #{filename} (#{e})"
+        end
+        if !config.is_a?(Hash)
+          raise ConfigLoadError, "cannot parse config file #{filename} (it does not contain an object)"
+        end
 
-		result = {}
-		config.each_pair do |key, val|
-			result[key.to_sym] = val
-		end
-		return result
-	end
-end
+        result = {}
+        config.each_pair do |key, val|
+          result[key.to_sym] = val
+        end
+        return result
+      end
+    end
 
-end # module Standalone
+  end # module Standalone
 end # module PhusionPassenger

data/lib/phusion_passenger/standalone/control_utils.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,67 +22,46 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Standalone
+  module Standalone
 
-module ControlUtils
-	extend self    # Make methods available as class methods.
+    module ControlUtils
+      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
+      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 require_daemon_controller
-		return if defined?(DaemonController)
-		begin
-			require 'daemon_controller'
-			begin
-				require 'daemon_controller/version'
-				too_old = DaemonController::VERSION_STRING < '1.1.0'
-			rescue LoadError
-				too_old = true
-			end
-			if too_old
-				PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-				gem_command = PlatformInfo.gem_command(:sudo => true)
-				abort "Your version of daemon_controller is too old. " +
-					"You must install 1.1.0 or later. Please upgrade:\n\n" +
-					" #{gem_command} uninstall FooBarWidget-daemon_controller\n" +
-					" #{gem_command} install daemon_controller"
-			end
-		rescue LoadError
-			PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-			gem_command = PlatformInfo.gem_command(:sudo => true)
-			abort "Please install daemon_controller first:\n\n" +
-				" #{gem_command} install daemon_controller"
-		end
-	end
+      def require_daemon_controller
+        return if defined?(PhusionPassenger::DaemonController)
+        PhusionPassenger.require_passenger_lib 'vendor/daemon_controller'
+      end
 
-	def warn_pid_file_not_found(options)
-		if options[:pid_file]
-			STDERR.puts "According to the PID file '#{options[:pid_file]}',"
-			STDERR.puts "#{PROGRAM_NAME} Standalone doesn't seem to be running."
-		else
-			STDERR.puts "#{PROGRAM_NAME} Standalone doesn't seem to be running, " +
-				"because its PID file"
-			STDERR.puts "could not be found."
-		end
-		STDERR.puts
-		STDERR.puts "If you know that #{PROGRAM_NAME} Standalone *is* running then one of these"
-		STDERR.puts "might be the cause of this error:"
-		STDERR.puts
-		STDERR.puts " * The #{PROGRAM_NAME} Standalone instance that you want to stop isn't running"
-		STDERR.puts "   on port #{options[:port]}, but on another port. If this is the case then you"
-		STDERR.puts "   should specify the right port with --port."
-		STDERR.puts "   If the instance is listening on a Unix socket file instead of a TCP port,"
-		STDERR.puts "   then please specify the PID file's filename with --pid-file."
-		STDERR.puts " * The instance that you want to stop has stored its PID file in a non-standard"
-		STDERR.puts "   location. In this case please specify the right PID file with --pid-file."
-	end
-end
+      def warn_pid_file_not_found(options)
+        if options[:pid_file]
+          STDERR.puts "According to the PID file '#{options[:pid_file]}',"
+          STDERR.puts "#{PROGRAM_NAME} Standalone doesn't seem to be running."
+        else
+          STDERR.puts "#{PROGRAM_NAME} Standalone doesn't seem to be running, " +
+            "because its PID file"
+          STDERR.puts "could not be found."
+        end
+        STDERR.puts
+        STDERR.puts "If you know that #{PROGRAM_NAME} Standalone *is* running then one of these"
+        STDERR.puts "might be the cause of this error:"
+        STDERR.puts
+        STDERR.puts " * The #{PROGRAM_NAME} Standalone instance that you want to stop isn't running"
+        STDERR.puts "   on port #{options[:port]}, but on another port. If this is the case then you"
+        STDERR.puts "   should specify the right port with --port."
+        STDERR.puts "   If the instance is listening on a Unix socket file instead of a TCP port,"
+        STDERR.puts "   then please specify the PID file's filename with --pid-file."
+        STDERR.puts " * The instance that you want to stop has stored its PID file in a non-standard"
+        STDERR.puts "   location. In this case please specify the right PID file with --pid-file."
+      end
+    end
 
-end
+  end
 end

data/lib/phusion_passenger/standalone/main.rb

@@ -25,89 +25,89 @@ PhusionPassenger.require_passenger_lib 'constants'
 
 module PhusionPassenger
 
-# Core of the `passenger` command (Passenger Standalone). Dispatches a subcommand to a specific class.
-module Standalone
-	KNOWN_COMMANDS = [
-		["start", "StartCommand"],
-		["stop", "StopCommand"],
-		["status", "StatusCommand"],
-		["version", "VersionCommand"]
-	]
+  # Core of the `passenger` command (Passenger Standalone). Dispatches a subcommand to a specific class.
+  module Standalone
+    KNOWN_COMMANDS = [
+      ["start", "StartCommand"],
+      ["stop", "StopCommand"],
+      ["status", "StatusCommand"],
+      ["version", "VersionCommand"]
+    ]
 
-	def self.run!(argv)
-		if argv.empty?
-			help
-			exit
-		end
+    def self.run!(argv)
+      if argv.empty?
+        help
+        exit
+      end
 
-		command_class, new_argv = lookup_command_class_by_argv(argv)
-		if help_requested?(argv)
-			help
-		elsif version_requested?(argv)
-			show_version
-		elsif command_class
-			command = command_class.new(new_argv)
-			command.run
-		else
-			help
-			abort
-		end
-	end
+      command_class, new_argv = lookup_command_class_by_argv(argv)
+      if help_requested?(argv)
+        help
+      elsif version_requested?(argv)
+        show_version
+      elsif command_class
+        command = command_class.new(new_argv)
+        command.run
+      else
+        help
+        abort
+      end
+    end
 
-	def self.help
-		puts "#{PROGRAM_NAME} Standalone, the easiest way to run web apps."
-		puts
-		puts "Available commands:"
-		puts
-		puts "  passenger start      Start #{PROGRAM_NAME} Standalone."
-		puts "  passenger stop       Stop a #{PROGRAM_NAME} instance."
-		puts "  passenger status     Show the status of a running #{PROGRAM_NAME} instance."
-		puts
-		puts "Run 'passenger <COMMAND> --help' for more information about each command."
-	end
+    def self.help
+      puts "#{PROGRAM_NAME} Standalone, the easiest way to run web apps."
+      puts
+      puts "Available commands:"
+      puts
+      puts "  passenger start      Start #{PROGRAM_NAME} Standalone."
+      puts "  passenger stop       Stop a #{PROGRAM_NAME} instance."
+      puts "  passenger status     Show the status of a running #{PROGRAM_NAME} instance."
+      puts
+      puts "Run 'passenger <COMMAND> --help' for more information about each command."
+    end
 
-private
-	def self.help_requested?(argv)
-		return argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
-	end
+  private
+    def self.help_requested?(argv)
+      return argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
+    end
 
-	def self.version_requested?(argv)
-		return argv.size == 1 && (argv[0] == "--version" || argv[0] == "-v")
-	end
+    def self.version_requested?(argv)
+      return argv.size == 1 && (argv[0] == "--version" || argv[0] == "-v")
+    end
 
-	def self.show_version
-		command_class, new_argv = lookup_command_class_by_argv(["version"])
-		command_class.new(new_argv).run
-	end
+    def self.show_version
+      command_class, new_argv = lookup_command_class_by_argv(["version"])
+      command_class.new(new_argv).run
+    end
 
-	def self.lookup_command_class_by_argv(argv)
-		return nil if argv.empty?
+    def self.lookup_command_class_by_argv(argv)
+      return nil if argv.empty?
 
-		# Convert "passenger help <COMMAND>" to "passenger <COMMAND> --help".
-		if argv.size == 2 && argv[0] == "help"
-			argv = [argv[1], "--help"]
-		end
+      # Convert "passenger help <COMMAND>" to "passenger <COMMAND> --help".
+      if argv.size == 2 && argv[0] == "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]
-			end
-		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]
+        end
+      end
 
-		return nil
-	end
+      return nil
+    end
 
-	def self.lookup_command_class_by_class_name(class_name)
-		base_name = class_name.gsub(/[A-Z]/) do |match|
-			"_" + match[0..0].downcase
-		end
-		base_name.sub!(/^_/, '')
-		base_name << ".rb"
-		PhusionPassenger.require_passenger_lib("standalone/#{base_name}")
-		return PhusionPassenger::Standalone.const_get(class_name)
-	end
-end
+    def self.lookup_command_class_by_class_name(class_name)
+      base_name = class_name.gsub(/[A-Z]/) do |match|
+        "_" + match[0..0].downcase
+      end
+      base_name.sub!(/^_/, '')
+      base_name << ".rb"
+      PhusionPassenger.require_passenger_lib("standalone/#{base_name}")
+      return PhusionPassenger::Standalone.const_get(class_name)
+    end
+  end
 
 end # module PhusionPassenger