From db845bbee6b243c6a99befc13b7f7b94eac36358 Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Tue, 3 Feb 2009 10:22:10 +0100 Subject: [PATCH] Fix problems introduced by the recent renames. --- Rakefile | 2 +- bin/passenger-install-apache2-module | 8 ++++---- bin/passenger-install-nginx-module | 16 +++++++--------- lib/phusion_passenger/abstract_installer.rb | 12 ++++++------ ..._snippets.txt.erb => config_snippets.txt.erb} | 0 lib/phusion_passenger/version.rb | 4 ++-- 6 files changed, 20 insertions(+), 22 deletions(-) rename lib/phusion_passenger/templates/apache2/{apache2_config_snippets.txt.erb => config_snippets.txt.erb} (100%) diff --git a/Rakefile b/Rakefile index b721c316bf..48876b036f 100644 --- a/Rakefile +++ b/Rakefile @@ -31,7 +31,7 @@ verbose true ##### Configuration # Don't forget to edit Configuration.h too -PACKAGE_VERSION = Passenger::VERSION_STRING +PACKAGE_VERSION = PhusionPassenger::VERSION_STRING OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE']) include PlatformInfo diff --git a/bin/passenger-install-apache2-module b/bin/passenger-install-apache2-module index 319f90915f..b571b09b8e 100755 --- a/bin/passenger-install-apache2-module +++ b/bin/passenger-install-apache2-module @@ -55,7 +55,7 @@ class Installer < PhusionPassenger::AbstractInstaller end def install! - if Passenger.natively_packaged? + if PhusionPassenger.natively_packaged? check_dependencies || exit(1) show_apache2_config_snippets show_deployment_example @@ -78,7 +78,7 @@ class Installer < PhusionPassenger::AbstractInstaller private def show_welcome_screen - render_template 'apache2/welcome', :version => Passenger::VERSION_STRING + render_template 'apache2/welcome', :version => PhusionPassenger::VERSION_STRING wait end @@ -142,7 +142,7 @@ private def show_apache2_config_snippets puts line - if Passenger.natively_packaged? + if PhusionPassenger.natively_packaged? module_location = "#{PASSENGER_ROOT}/lib/passenger/mod_passenger.so" else module_location = "#{PASSENGER_ROOT}/ext/apache2/mod_passenger.so" @@ -151,7 +151,7 @@ private :module_location => module_location, :passenger_root => PASSENGER_ROOT, :ruby => RUBY - if Passenger.natively_packaged? + if PhusionPassenger.natively_packaged? wait(10) else wait diff --git a/bin/passenger-install-nginx-module b/bin/passenger-install-nginx-module index f810fefaab..44eae9a492 100755 --- a/bin/passenger-install-nginx-module +++ b/bin/passenger-install-nginx-module @@ -8,13 +8,13 @@ $LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext") require 'optparse' require 'fileutils' -require 'passenger/platform_info' -require 'passenger/dependencies' -require 'passenger/abstract_installer' +require 'phusion_passenger/platform_info' +require 'phusion_passenger/dependencies' +require 'phusion_passenger/abstract_installer' include PlatformInfo -class Installer < Passenger::AbstractInstaller - include Passenger +class Installer < PhusionPassenger::AbstractInstaller + include PhusionPassenger NGINX_VERSION = "0.6.34" @@ -37,7 +37,7 @@ class Installer < Passenger::AbstractInstaller check_write_permission_to_passenger_root || exit(1) - compile_passenger_support_files + compile_passenger_support_files || exit(1) download_and_install = should_we_download_and_install_nginx_automatically? if pcre_is_installed? @@ -97,9 +97,7 @@ private def compile_passenger_support_files new_screen color_puts "Compiling Passenger support files..." - if !sh("rake nginx") - return false - end + return sh("rake nginx") end def should_we_download_and_install_nginx_automatically? diff --git a/lib/phusion_passenger/abstract_installer.rb b/lib/phusion_passenger/abstract_installer.rb index dfd8933d42..009ffb1acb 100644 --- a/lib/phusion_passenger/abstract_installer.rb +++ b/lib/phusion_passenger/abstract_installer.rb @@ -16,10 +16,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'passenger/console_text_template' -require 'passenger/version' +require 'phusion_passenger/console_text_template' +require 'phusion_passenger/version' -module Passenger +module PhusionPassenger # Abstract base class for installers. Used by passenger-install-apache2-module # and passenger-install-nginx-module. @@ -27,8 +27,8 @@ class AbstractInstaller PASSENGER_WEBSITE = "http://www.modrails.com/" PHUSION_WEBSITE = "www.phusion.nl" USERS_GUIDE = begin - if Passenger.natively_packaged? - "/usr/share/doc/passenger/Users guide.html" + if PhusionPassenger.natively_packaged? + "/usr/share/doc/phusion_passenger/Users guide.html" else File.expand_path("#{LIBDIR}/../../doc/Users guide.html") end @@ -194,4 +194,4 @@ def print_dependency_installation_instructions(dep) end end -end # module Passenger +end # module PhusionPassenger diff --git a/lib/phusion_passenger/templates/apache2/apache2_config_snippets.txt.erb b/lib/phusion_passenger/templates/apache2/config_snippets.txt.erb similarity index 100% rename from lib/phusion_passenger/templates/apache2/apache2_config_snippets.txt.erb rename to lib/phusion_passenger/templates/apache2/config_snippets.txt.erb diff --git a/lib/phusion_passenger/version.rb b/lib/phusion_passenger/version.rb index f0a434a94e..54a112c074 100644 --- a/lib/phusion_passenger/version.rb +++ b/lib/phusion_passenger/version.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 LIBDIR = File.expand_path(File.dirname(__FILE__)) VERSION_STRING = '2.1.0' @@ -24,4 +24,4 @@ module Passenger def self.natively_packaged? return !File.exist?("#{LIBDIR}/../../Rakefile") end -end \ No newline at end of file +end