@@ -24,7 +24,7 @@ def start(iterations) milestone = 1 if milestone == 0 result = Benchmark.measure do iterations.times do |i| - cgi = Passenger::Railz::CGIFixed.new(headers, output, output) + cgi = PhusionPassenger::Railz::CGIFixed.new(headers, output, output) ::Dispatcher.dispatch(cgi, ::ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput) benchmark/dispatcher.rb @@ -34,7 +34,7 @@ require 'passenger/console_text_template' include PlatformInfo class Installer - include Passenger + include PhusionPassenger PASSENGER_WEBSITE = "http://www.modrails.com/" PHUSION_WEBSITE = "www.phusion.nl" bin/passenger-install-apache2-module @@ -42,12 +42,12 @@ begin end require 'passenger/spawn_manager' - spawn_manager = Passenger::SpawnManager.new + spawn_manager = PhusionPassenger::SpawnManager.new spawn_manager.start_synchronously(input) spawn_manager.cleanup rescue => e require 'passenger/utils' - include Passenger::Utils + include PhusionPassenger::Utils print_exception("spawn manager", e) exit 10 end bin/passenger-spawn-server @@ -21,7 +21,7 @@ $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib") $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext") require 'passenger/admin_tools/control_process' -include Passenger::AdminTools +include PhusionPassenger::AdminTools # ANSI color codes RESET = "\e[0m" bin/passenger-status @@ -27,8 +27,8 @@ require 'passenger/platform_info' require 'passenger/message_channel' require 'passenger/utils' -include Passenger -include Passenger::Utils +include PhusionPassenger +include PhusionPassenger::Utils include PlatformInfo # A thread or a process, depending on the Ruby VM implementation. bin/passenger-stress-test @@ -41,7 +41,7 @@ #include "Logging.h" #include "Utils.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -521,6 +521,6 @@ public: /** Convenient alias for Application smart pointer. */ typedef shared_ptr<Application> ApplicationPtr; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_APPLICATION_H_ */ ext/apache2/Application.h @@ -26,7 +26,7 @@ #include "Application.h" #include "PoolOptions.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -194,6 +194,6 @@ public: typedef shared_ptr<ApplicationPool> ApplicationPoolPtr; -}; // namespace Passenger +}; // namespace PhusionPassenger #endif /* _PASSENGER_APPLICATION_POOL_H_ */ ext/apache2/ApplicationPool.h @@ -43,7 +43,7 @@ #include "Exceptions.h" #include "Logging.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -576,7 +576,7 @@ private: m_serverExecutable.c_str(), #endif m_serverExecutable.c_str(), - toString(Passenger::getLogLevel()).c_str(), + toString(PhusionPassenger::getLogLevel()).c_str(), m_spawnServerCommand.c_str(), m_logFile.c_str(), m_rubyCommand.c_str(), @@ -772,6 +772,6 @@ public: typedef shared_ptr<ApplicationPoolServer> ApplicationPoolServerPtr; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_APPLICATION_POOL_SERVER_H_ */ ext/apache2/ApplicationPoolServer.h @@ -64,7 +64,7 @@ using namespace boost; using namespace std; using namespace oxt; -using namespace Passenger; +using namespace PhusionPassenger; class Server; class Client; @@ -221,7 +221,7 @@ public: const string &statusReportFIFO) : pool(spawnServerCommand, logFile, rubyCommand, user) { - Passenger::setLogLevel(logLevel); + PhusionPassenger::setLogLevel(logLevel); this->serverSocket = serverSocket; this->statusReportFIFO = statusReportFIFO; this->user = user; ext/apache2/ApplicationPoolServerExecutable.cpp @@ -19,7 +19,7 @@ */ #include "Bucket.h" -using namespace Passenger; +using namespace PhusionPassenger; static void bucket_destroy(void *data); static apr_status_t bucket_read(apr_bucket *a, const char **str, apr_size_t *len, apr_read_type_e block); ext/apache2/Bucket.cpp @@ -37,7 +37,7 @@ #include <apr_buckets.h> #include "Application.h" -apr_bucket *passenger_bucket_create(Passenger::Application::SessionPtr session, +apr_bucket *passenger_bucket_create(PhusionPassenger::Application::SessionPtr session, apr_file_t *pipe, apr_bucket_alloc_t *list); ext/apache2/Bucket.h @@ -23,7 +23,7 @@ #include "Configuration.h" #include "Utils.h" -using namespace Passenger; +using namespace PhusionPassenger; extern "C" module AP_MODULE_DECLARE_DATA passenger_module; ext/apache2/Configuration.cpp @@ -39,7 +39,7 @@ #include <set> #include <string> - namespace Passenger { + namespace PhusionPassenger { using namespace std; ext/apache2/Configuration.h @@ -35,7 +35,7 @@ #include <httpd.h> #include <http_core.h> -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace oxt; @@ -281,7 +281,7 @@ public: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_DIRECTORY_MAPPER_H_ */ ext/apache2/DirectoryMapper.h @@ -34,7 +34,7 @@ #include "Application.h" #include "Exceptions.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; @@ -98,6 +98,6 @@ public: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_DUMMY_SPAWN_MANAGER_H_ */ ext/apache2/DummySpawnManager.h @@ -29,7 +29,7 @@ * @defgroup Exceptions Exceptions */ -namespace Passenger { +namespace PhusionPassenger { using namespace std; @@ -235,6 +235,6 @@ public: virtual const char *what() const throw() { return msg.c_str(); } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_EXCEPTIONS_H_ */ ext/apache2/Exceptions.h @@ -30,7 +30,7 @@ #include "CachedFileStat.h" #include "SystemTime.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace oxt; @@ -107,6 +107,6 @@ public: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_FILE_CHECKER_H_ */ ext/apache2/FileChecker.h @@ -49,7 +49,7 @@ #include <apr_lib.h> using namespace std; -using namespace Passenger; +using namespace PhusionPassenger; extern "C" module AP_MODULE_DECLARE_DATA passenger_module; @@ -747,7 +747,7 @@ public: Hooks(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) { passenger_config_merge_all_servers(pconf, s); ServerConfig *config = getServerConfig(s); - Passenger::setLogLevel(config->logLevel); + PhusionPassenger::setLogLevel(config->logLevel); m_hasModRewrite = UNKNOWN; m_hasModDir = UNKNOWN; m_hasModAutoIndex = UNKNOWN; ext/apache2/Hooks.cpp @@ -21,7 +21,7 @@ #include <fstream> #include "Logging.h" -namespace Passenger { +namespace PhusionPassenger { unsigned int _logLevel = 0; ostream *_logStream = &cerr; @@ -56,5 +56,5 @@ setDebugFile(const char *logFile) { #endif } -} // namespace Passenger +} // namespace PhusionPassenger ext/apache2/Logging.cpp @@ -27,7 +27,7 @@ #include <sstream> #include <ctime> -namespace Passenger { +namespace PhusionPassenger { using namespace std; @@ -70,7 +70,7 @@ void setDebugFile(const char *logFile = NULL); /** * Write the given expression to the log stream. */ -#define P_LOG(expr) P_LOG_TO(expr, Passenger::_logStream) +#define P_LOG(expr) P_LOG_TO(expr, PhusionPassenger::_logStream) /** * Write the given expression, which represents a warning, @@ -93,8 +93,8 @@ void setDebugFile(const char *logFile = NULL); #ifdef PASSENGER_DEBUG #define P_TRACE(level, expr) \ do { \ - if (Passenger::_logLevel >= level) { \ - P_LOG_TO(expr, Passenger::_debugStream); \ + if (PhusionPassenger::_logLevel >= level) { \ + P_LOG_TO(expr, PhusionPassenger::_debugStream); \ } \ } while (false) @@ -111,7 +111,7 @@ void setDebugFile(const char *logFile = NULL); #define P_ASSERT(expr, result_if_failed, message) do { /* nothing */ } while (false) #endif -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_LOGGING_H_ */ ext/apache2/Logging.h @@ -42,7 +42,7 @@ #include "Exceptions.h" #include "Utils.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace oxt; @@ -599,6 +599,6 @@ public: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_MESSAGE_CHANNEL_H_ */ ext/apache2/MessageChannel.h @@ -23,7 +23,7 @@ #include <string> #include "Utils.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; @@ -277,7 +277,7 @@ private: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_SPAWN_OPTIONS_H_ */ ext/apache2/PoolOptions.h @@ -45,7 +45,7 @@ #include "Exceptions.h" #include "Logging.h" -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -541,6 +541,6 @@ public: /** Convenient alias for SpawnManager smart pointer. */ typedef shared_ptr<SpawnManager> SpawnManagerPtr; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_SPAWN_MANAGER_H_ */ ext/apache2/SpawnManager.h @@ -55,7 +55,7 @@ #include "SpawnManager.h" #endif -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -811,7 +811,7 @@ public: typedef shared_ptr<StandardApplicationPool> StandardApplicationPoolPtr; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_STANDARD_APPLICATION_POOL_H_ */ ext/apache2/StandardApplicationPool.h @@ -61,7 +61,7 @@ void passenger_system_time_release_forced_value(); #include <oxt/system_calls.hpp> #include "Exceptions.h" - namespace Passenger { + namespace PhusionPassenger { using namespace boost; @@ -97,7 +97,7 @@ void passenger_system_time_release_forced_value(); } }; - } // namespace Passenger + } // namespace PhusionPassenger #endif #endif /* _PASSENGER_SYSTEM_TIME_H_ */ ext/apache2/SystemTime.h @@ -24,7 +24,7 @@ #define SPAWN_SERVER_SCRIPT_NAME "passenger-spawn-server" -namespace Passenger { +namespace PhusionPassenger { int atoi(const string &s) { @@ -318,4 +318,4 @@ verifyWSGIDir(const string &dir, CachedMultiFileStat *mstat, unsigned int thrott return fileExists(temp.c_str(), mstat, throttleRate); } -} // namespace Passenger +} // namespace PhusionPassenger ext/apache2/Utils.cpp @@ -37,7 +37,7 @@ typedef struct CachedMultiFileStat CachedMultiFileStat; -namespace Passenger { +namespace PhusionPassenger { using namespace std; using namespace boost; @@ -359,7 +359,7 @@ public: } }; -} // namespace Passenger +} // namespace PhusionPassenger #endif /* _PASSENGER_UTILS_H_ */ ext/apache2/Utils.h @@ -268,7 +268,7 @@ Init_native_support() { struct sockaddr_un addr; /* */ - mPassenger = rb_define_module("Passenger"); // Do not remove the above comment. We want the Passenger module's rdoc to be empty. + mPassenger = rb_define_module("PhusionPassenger"); // Do not remove the above comment. We want the Passenger module's rdoc to be empty. /* * Utility functions for accessing system functionality. ext/passenger/native_support.c @@ -20,7 +20,7 @@ require 'socket' require 'fcntl' require 'passenger/message_channel' require 'passenger/utils' -module Passenger +module PhusionPassenger # The request handler is the layer which connects Apache with the underlying application's # request dispatcher (i.e. either Rails's Dispatcher class or Rack). @@ -169,13 +169,6 @@ class AbstractRequestHandler # Enter the request handler's main loop. def main_loop - if defined?(::Passenger::AbstractRequestHandler) - # Some applications have a model named 'Passenger'. - # So we temporarily remove it from the global namespace - # and restore it later. - phusion_passenger_namespace = ::Passenger - Object.send(:remove_const, :Passenger) - end reset_signal_handlers begin @graceful_termination_pipe = IO.pipe @@ -226,10 +219,6 @@ class AbstractRequestHandler @graceful_termination_pipe[0].close rescue nil @graceful_termination_pipe[1].close rescue nil revert_signal_handlers - if phusion_passenger_namespace - Object.send(:remove_const, :Passenger) rescue nil - Object.const_set(:Passenger, phusion_passenger_namespace) - end @main_loop_thread_lock.synchronize do @main_loop_running = false @main_loop_thread_cond.broadcast @@ -446,4 +435,4 @@ public PASSENGER_HEADER = determine_passenger_header end -end # module Passenger +end # module PhusionPassenger lib/passenger/abstract_request_handler.rb @@ -21,7 +21,7 @@ require 'set' require 'timeout' require 'passenger/message_channel' require 'passenger/utils' -module Passenger +module PhusionPassenger # An abstract base class for a server, with the following properties: # @@ -42,7 +42,7 @@ module Passenger # # Here's an example on using AbstractServer: # -# class MyServer < Passenger::AbstractServer +# class MyServer < PhusionPassenger::AbstractServer # def initialize # super() # define_message_handler(:hello, :handle_hello) @@ -346,4 +346,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/abstract_server.rb @@ -18,7 +18,7 @@ require 'passenger/utils' -module Passenger +module PhusionPassenger # This class maintains a collection of AbstractServer objects. One can add new # AbstractServer objects, or look up existing ones via a key. @@ -298,4 +298,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/abstract_server_collection.rb @@ -1,4 +1,4 @@ -module Passenger +module PhusionPassenger module AdminTools def self.tmpdir @@ -22,4 +22,4 @@ module AdminTools end end # module AdminTools -end # module Passenger +end # module PhusionPassenger lib/passenger/admin_tools.rb @@ -3,7 +3,7 @@ require 'fileutils' require 'passenger/admin_tools' require 'passenger/message_channel' -module Passenger +module PhusionPassenger module AdminTools class ControlProcess @@ -104,4 +104,4 @@ private end end # module AdminTools -end # module Passenger +end # module PhusionPassenger lib/passenger/admin_tools/control_process.rb @@ -18,7 +18,7 @@ require 'rubygems' require 'passenger/exceptions' -module Passenger +module PhusionPassenger # Represents a single application instance. class Application @@ -105,4 +105,4 @@ class Application end end -end # module Passenger +end # module PhusionPassenger lib/passenger/application.rb @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. require 'erb' -module Passenger +module PhusionPassenger class ConsoleTextTemplate TEMPLATE_DIR = "#{File.dirname(__FILE__)}/templates" @@ -58,4 +58,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/console_text_template.rb @@ -14,7 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -module Passenger +module PhusionPassenger DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60 DEFAULT_APP_SPAWNER_MAX_IDLE_TIME = 10 * 60 end lib/passenger/constants.rb @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. require 'passenger/platform_info' -module Passenger +module PhusionPassenger # Represents a dependency software that Passenger requires. It's used by the # installer to check whether all dependencies are available. A Dependency object @@ -323,4 +323,4 @@ module Dependencies # :nodoc: all end end -end # module Passenger +end # module PhusionPassenger lib/passenger/dependencies.rb @@ -16,7 +16,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -module Passenger +module PhusionPassenger # Indicates that there is no Ruby on Rails version installed that satisfies # a given Ruby on Rails Gem version specification. @@ -95,4 +95,4 @@ end class InvalidPath < StandardError end -end # module Passenger +end # module PhusionPassenger lib/passenger/exceptions.rb @@ -18,7 +18,7 @@ require 'erb' -module Passenger +module PhusionPassenger # A convenience utility class for rendering our error pages. class HTMLTemplate @@ -101,4 +101,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/html_template.rb @@ -16,7 +16,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -module Passenger +module PhusionPassenger # This class provides convenience methods for: # - sending and receiving raw data over an IO channel. @@ -220,4 +220,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/message_channel.rb @@ -24,7 +24,7 @@ require 'passenger/abstract_request_handler' require 'passenger/utils' require 'passenger/rack/request_handler' -module Passenger +module PhusionPassenger module Rack # Class for spawning Rack applications. @@ -112,4 +112,4 @@ private end end # module Rack -end # module Passenger +end # module PhusionPassenger lib/passenger/rack/application_spawner.rb @@ -15,7 +15,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. require 'passenger/abstract_request_handler' -module Passenger +module PhusionPassenger module Rack # A request handler for Rack applications. @@ -84,4 +84,4 @@ protected end end # module Rack -end # module Passenger +end # module PhusionPassenger lib/passenger/rack/request_handler.rb @@ -29,7 +29,7 @@ require 'passenger/rack/request_handler' require 'passenger/exceptions' require 'passenger/utils' -module Passenger +module PhusionPassenger module Railz # This class is capable of spawning instances of a single Ruby on Rails application. @@ -113,7 +113,7 @@ class ApplicationSpawner < AbstractServer return Application.new(@app_root, pid, socket_name, socket_type, owner_pipe) rescue SystemCallError, IOError, SocketError => e - raise Error, "The application spawner server exited unexpectedly" + raise Error, "The application spawner server exited unexpectedly: #{e}" end # Spawn an instance of the RoR application. When successful, an Application object @@ -191,9 +191,9 @@ class ApplicationSpawner < AbstractServer super begin unmarshal_and_raise_errors(server) - rescue IOError, SystemCallError, SocketError + rescue IOError, SystemCallError, SocketError => e stop - raise Error, "The application spawner server exited unexpectedly" + raise Error, "The application spawner server exited unexpectedly: #{e}" rescue stop raise @@ -341,4 +341,4 @@ private end end # module Railz -end # module Passenger +end # module PhusionPassenger lib/passenger/railz/application_spawner.rb @@ -26,7 +26,7 @@ require 'cgi' -module Passenger +module PhusionPassenger module Railz # Modifies CGI so that we can use it. Main thing it does is expose @@ -65,4 +65,4 @@ class CGIFixed < ::CGI end end # module Railz -end # module Passenger +end # module PhusionPassenger lib/passenger/railz/cgi_fixed.rb @@ -23,7 +23,7 @@ require 'passenger/railz/application_spawner' require 'passenger/exceptions' require 'passenger/constants' require 'passenger/utils' -module Passenger +module PhusionPassenger module Railz # This class is capable of spawning Ruby on Rails application instances @@ -329,4 +329,4 @@ private end end # module Railz -end # module Passenger +end # module PhusionPassenger lib/passenger/railz/framework_spawner.rb @@ -16,7 +16,7 @@ require 'passenger/abstract_request_handler' require 'passenger/railz/cgi_fixed' -module Passenger +module PhusionPassenger module Railz # A request handler for Ruby on Rails applications. @@ -58,4 +58,4 @@ private end end # module Railz -end # module Passenger +end # module PhusionPassenger lib/passenger/railz/request_handler.rb @@ -26,7 +26,7 @@ require 'passenger/utils' # Phusion Passenger. IN_PHUSION_PASSENGER = true -module Passenger +module PhusionPassenger # The spawn manager is capable of spawning Ruby on Rails or Rack application # instances. It acts like a simple fascade for the rest of the spawn manager @@ -367,4 +367,4 @@ private end end -end # module Passenger +end # module PhusionPassenger lib/passenger/spawn_manager.rb @@ -30,12 +30,12 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" require 'passenger/native_support' end -module Passenger +module PhusionPassenger # Utility functions. module Utils protected - GENUINE_PHUSION_PASSENGER_NAMESPACE = Passenger + GENUINE_PHUSION_PASSENGER_NAMESPACE = PhusionPassenger # Return the absolute version of +path+. This path is guaranteed to # to be "normal", i.e. it doesn't contain stuff like ".." or "/", @@ -349,7 +349,7 @@ protected end end -end # module Passenger +end # module PhusionPassenger class Exception def backtrace_string(current_location = nil) @@ -412,13 +412,13 @@ class ConditionVariable end class IO - if defined?(Passenger::NativeSupport) + if defined?(PhusionPassenger::NativeSupport) # ApplicationSpawner/FrameworkSpawner might temporarily undefine # the 'Passenger' module in order to avoid namespace collissions # with the spawned application. So we save the NativeSupport # module in a constant so that we can access it whether # our 'Passenger' module is defined or not. - NATIVE_SUPPORT = Passenger::NativeSupport + NATIVE_SUPPORT = PhusionPassenger::NativeSupport # Send an IO object (i.e. a file descriptor) over this IO channel. # This only works if this IO channel is a Unix socket. lib/passenger/utils.rb @@ -18,7 +18,7 @@ require 'socket' require 'passenger/application' require 'passenger/message_channel' require 'passenger/utils' -module Passenger +module PhusionPassenger module WSGI # Class for spawning WSGI applications. @@ -94,4 +94,4 @@ private end end # module WSGI -end # module Passenger +end # module PhusionPassenger lib/passenger/wsgi/application_spawner.rb @@ -19,7 +19,7 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib" require 'passenger/html_template' require 'passenger/spawn_manager' require 'passenger/platform_info' -include Passenger +include PhusionPassenger if !defined?(Mysql::Error) module Mysql misc/render_error_pages.rb @@ -4,7 +4,7 @@ require 'passenger/abstract_request_handler' require 'fileutils' -include Passenger +include PhusionPassenger describe AbstractRequestHandler do before :each do test/ruby/abstract_request_handler_spec.rb @@ -3,7 +3,7 @@ require 'support/test_helper' require 'passenger/abstract_server' require 'passenger/abstract_server_collection' -include Passenger +include PhusionPassenger describe AbstractServerCollection do before :each do test/ruby/abstract_server_collection_spec.rb @@ -1,7 +1,7 @@ require 'support/config' require 'support/test_helper' require 'passenger/application' -include Passenger +include PhusionPassenger describe Application do include TestHelper @@ -38,6 +38,6 @@ describe Application do content.sub(/^RAILS_GEM_VERSION = .*$/, "RAILS_GEM_VERSION = '1.9.1972'") end detector = lambda { Application.detect_framework_version(@stub.app_root) } - detector.should raise_error(::Passenger::VersionNotFound) + detector.should raise_error(::PhusionPassenger::VersionNotFound) end end test/ruby/application_spec.rb @@ -1,7 +1,7 @@ require 'socket' require 'support/config' require 'passenger/message_channel' -include Passenger +include PhusionPassenger describe MessageChannel do describe "scenarios with a single channel" do test/ruby/message_channel_spec.rb @@ -2,7 +2,7 @@ require 'support/config' require 'support/test_helper' require 'passenger/rack/application_spawner' -describe Passenger::Rack::ApplicationSpawner do +describe PhusionPassenger::Rack::ApplicationSpawner do include TestHelper before :each do @@ -35,7 +35,7 @@ describe Passenger::Rack::ApplicationSpawner do end if Process.euid == 0 def spawn(*args) - Passenger::Rack::ApplicationSpawner.spawn_application(*args) + PhusionPassenger::Rack::ApplicationSpawner.spawn_application(*args) end end test/ruby/rack/application_spawner_spec.rb @@ -7,8 +7,8 @@ require 'ruby/spawn_server_spec' require 'ruby/rails/spawner_privilege_lowering_spec' require 'ruby/rails/spawner_error_handling_spec' -include Passenger -include Passenger::Railz +include PhusionPassenger +include PhusionPassenger::Railz describe ApplicationSpawner do include TestHelper test/ruby/rails/application_spawner_spec.rb @@ -6,8 +6,8 @@ require 'ruby/rails/minimal_spawner_spec' require 'ruby/spawn_server_spec' require 'ruby/rails/spawner_privilege_lowering_spec' require 'ruby/rails/spawner_error_handling_spec' -include Passenger -include Passenger::Railz +include PhusionPassenger +include PhusionPassenger::Railz # TODO: test whether FrameworkSpawner restarts ApplicationSpawner if it crashed test/ruby/rails/framework_spawner_spec.rb @@ -6,8 +6,8 @@ require 'ruby/abstract_server_spec' require 'ruby/rails/minimal_spawner_spec' require 'ruby/rails/spawner_privilege_lowering_spec' require 'ruby/rails/spawner_error_handling_spec' -include Passenger -include Passenger::Utils +include PhusionPassenger +include PhusionPassenger::Utils # TODO: test whether SpawnManager restarts FrameworkSpawner if it crashed test/ruby/spawn_manager_spec.rb @@ -3,7 +3,7 @@ require 'support/config' require 'tempfile' require 'passenger/utils' -include Passenger +include PhusionPassenger describe Utils do include Utils test/ruby/utils_spec.rb @@ -5,9 +5,9 @@ require 'passenger/utils' require 'fileutils' require 'tempfile' -describe Passenger::WSGI::ApplicationSpawner do +describe PhusionPassenger::WSGI::ApplicationSpawner do include TestHelper - include Passenger::Utils + include PhusionPassenger::Utils before :each do ENV['PHUSION_PASSENGER_TMP'] = "#{Dir.tmpdir}/wsgi_test.tmp" @@ -41,7 +41,7 @@ describe Passenger::WSGI::ApplicationSpawner do end def spawn(*args) - Passenger::WSGI::ApplicationSpawner.spawn_application(*args) + PhusionPassenger::WSGI::ApplicationSpawner.spawn_application(*args) end end test/ruby/wsgi/application_spawner_spec.rb @@ -2,7 +2,7 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" require 'passenger/message_channel' -include Passenger +include PhusionPassenger reader = MessageChannel.new(STDIN) writer = MessageChannel.new(STDOUT) writer.write(*(reader.read << "!!")) test/stub/message_channel.rb @@ -2,7 +2,7 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" require 'passenger/message_channel' -include Passenger +include PhusionPassenger reader = MessageChannel.new(STDIN) writer = MessageChannel.new(STDOUT) writer.write_scalar(reader.read_scalar << "!!") test/stub/message_channel_2.rb @@ -4,7 +4,7 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext" require 'passenger/message_channel' require 'passenger/utils' -include Passenger +include PhusionPassenger channel = MessageChannel.new(IO.new(3)) channel.write(*channel.read) channel.write_scalar(channel.read_scalar) test/stub/message_channel_3.rb @@ -3,7 +3,7 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext" require 'passenger/spawn_manager' -include Passenger +include PhusionPassenger class SpawnManager def handle_spawn_application(*options) client.write('ok') test/stub/spawn_server.rb fbdd030abc9b43bb047d3bf739f1b6e0a8a6a88c Danial Pearce git@tigris.id.au http://github.com/FooBarWidget/passenger/commit/0b136ce983c65ecba2ee2438fb16d82c816de0cf 0b136ce983c65ecba2ee2438fb16d82c816de0cf 2009-02-02T20:21:10-08:00 2009-02-02T20:21:10-08:00 Move stuff into the PhusionPassenger namespace to avoid collisions. 0236d07c300c1d1905dc2e6802b540520002176c Danial Pearce git@tigris.id.au