passenger 2.0.6 → 2.1.2

data/test/ruby/application_spec.rb

@@ -1,7 +1,7 @@
 require 'support/config'
 require 'support/test_helper'
-require 'passenger/application'
-include Passenger
+require 'phusion_passenger/application'
+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

data/test/ruby/message_channel_spec.rb

@@ -1,7 +1,7 @@
 require 'socket'
 require 'support/config'
-require 'passenger/message_channel'
-include Passenger
+require 'phusion_passenger/message_channel'
+include PhusionPassenger
 
 describe MessageChannel do
 	describe "scenarios with a single channel" do

data/test/ruby/rack/application_spawner_spec.rb

@@ -1,10 +1,8 @@
 require 'support/config'
 require 'support/test_helper'
-require 'passenger/rack/application_spawner'
+require 'phusion_passenger/rack/application_spawner'
 
-include Passenger
-
-describe Passenger::Rack::ApplicationSpawner do
+describe PhusionPassenger::Rack::ApplicationSpawner do
 	include TestHelper
 	
 	before :each do
@@ -37,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
 

data/test/ruby/rails/application_spawner_spec.rb

@@ -1,14 +1,14 @@
 require 'support/config'
 require 'support/test_helper'
-require 'passenger/railz/application_spawner'
+require 'phusion_passenger/railz/application_spawner'
 
 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
 
 describe ApplicationSpawner do
 	include TestHelper
@@ -35,10 +35,35 @@ end
 describe ApplicationSpawner do
 	include TestHelper
 	
-	describe "regular spawning" do
+	describe "smart spawning" do
 		it_should_behave_like "a minimal spawner"
 		it_should_behave_like "handling errors in application initialization"
 		
+		it "calls the starting_worker_process event, with forked=true, after a new worker process has been forked off" do
+			use_rails_stub('foobar') do |stub|
+				File.append(stub.environment_rb, %q{
+					PhusionPassenger.on_event(:starting_worker_process) do |forked|
+						File.append("result.txt", "forked = #{forked}\n")
+					end
+					File.append("result.txt", "end of environment.rb\n");
+				})
+				
+				spawner = ApplicationSpawner.new(stub.app_root)
+				spawner.start
+				begin
+					spawner.spawn_application.close
+					spawner.spawn_application.close
+				ensure
+					spawner.stop
+				end
+				
+				contents = File.read("#{stub.app_root}/result.txt")
+				contents.should == "end of environment.rb\n" +
+					"forked = true\n" +
+					"forked = true\n"
+			end
+		end
+		
 		def spawn_stub_application(stub)
 			@spawner = ApplicationSpawner.new(stub.app_root)
 			begin
@@ -53,7 +78,25 @@ describe ApplicationSpawner do
 	describe "conservative spawning" do
 		it_should_behave_like "a minimal spawner"
 		it_should_behave_like "handling errors in application initialization"
-	
+		
+		it "calls the starting_worker_process event, with forked=true, after environment.rb has been loaded" do
+			use_rails_stub('foobar') do |stub|
+				File.append(stub.environment_rb, %q{
+					PhusionPassenger.on_event(:starting_worker_process) do |forked|
+						File.append("result.txt", "forked = #{forked}\n")
+					end
+					File.append("result.txt", "end of environment.rb\n");
+				})
+				spawn_stub_application(stub).close
+				spawn_stub_application(stub).close
+				contents = File.read("#{stub.app_root}/result.txt")
+				contents.should == "end of environment.rb\n" +
+					"forked = false\n" +
+					"end of environment.rb\n" +
+					"forked = false\n"
+			end
+		end
+		
 		def spawn_stub_application(stub)
 			@spawner = ApplicationSpawner.new(stub.app_root)
 			return @spawner.spawn_application!
@@ -70,12 +113,10 @@ describe("ApplicationSpawner privilege lowering support") do
 	
 		def spawn_stub_application(options = {})
 			options = {
-				:lower_privilege => true,
-				:lowest_user => CONFIG['lowest_user']
+				"lower_privilege" => true,
+				"lowest_user" => CONFIG['lowest_user']
 			}.merge(options)
-			@spawner = ApplicationSpawner.new(@stub.app_root,
-				options[:lower_privilege],
-				options[:lowest_user])
+			@spawner = ApplicationSpawner.new(@stub.app_root, options)
 			@spawner.start
 			begin
 				app = @spawner.spawn_application
@@ -92,12 +133,10 @@ describe("ApplicationSpawner privilege lowering support") do
 	
 		def spawn_stub_application(options = {})
 			options = {
-				:lower_privilege => true,
-				:lowest_user => CONFIG['lowest_user']
+				"lower_privilege" => true,
+				"lowest_user" => CONFIG['lowest_user']
 			}.merge(options)
-			@spawner = ApplicationSpawner.new(@stub.app_root,
-				options[:lower_privilege],
-				options[:lowest_user])
+			@spawner = ApplicationSpawner.new(@stub.app_root, options)
 			begin
 				app = @spawner.spawn_application!
 				yield app

data/test/ruby/rails/framework_spawner_spec.rb

@@ -1,13 +1,13 @@
 require 'support/config'
 require 'support/test_helper'
-require 'passenger/railz/framework_spawner'
+require 'phusion_passenger/railz/framework_spawner'
 
 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
 
@@ -112,17 +112,15 @@ describe("FrameworkSpawner privilege lowering support") do
 	
 	def spawn_stub_application(options = {})
 		options = {
-			:lower_privilege => true,
-			:lowest_user => CONFIG['lowest_user']
+			"lower_privilege" => true,
+			"lowest_user" => CONFIG['lowest_user']
 		}.merge(options)
 		@stub.use_vendor_rails('minimal')
 		@spawner = FrameworkSpawner.new(:vendor =>
 			"#{@stub.app_root}/vendor/rails")
 		@spawner.start
 		begin
-			app = @spawner.spawn_application(@stub.app_root,
-				options[:lower_privilege],
-				options[:lowest_user])
+			app = @spawner.spawn_application(@stub.app_root, options)
 			yield app
 		ensure
 			app.close if app

data/test/ruby/rails/minimal_spawner_spec.rb

@@ -35,6 +35,35 @@ shared_examples_for "a minimal spawner" do
 		end
 	end
 	
+	it "does not conflict with models in the application that are named 'Passenger'" do
+		use_rails_stub('foobar') do |stub|
+			if !File.directory?("#{stub.app_root}/app/models")
+				Dir.mkdir("#{stub.app_root}/app/models")
+			end
+			File.open("#{stub.app_root}/app/models/passenger.rb", 'w') do |f|
+				f.write(%q{
+					class Passenger
+						def name
+							return "Gourry Gabriev"
+						end
+					end
+				})
+			end
+			File.append(stub.environment_rb, %q{
+				# We explicitly call 'require' here because we might be
+				# using a stub Rails framework (that doesn't support automatic
+				# loading of model source files).
+				require 'app/models/passenger'
+				File.open('passenger.txt', 'w') do |f|
+					f.write(Passenger.new.name)
+				end
+			})
+			spawn_stub_application(stub).close
+			passenger_name = File.read("#{stub.app_root}/passenger.txt")
+			passenger_name.should == 'Gourry Gabriev'
+		end
+	end
+	
 	it "loads application_controller.rb instead of application.rb, if the former exists" do
 		use_rails_stub('foobar') do |stub|
 			File.rename("#{stub.app_root}/app/controllers/application.rb",

data/test/ruby/rails/spawner_error_handling_spec.rb

@@ -39,7 +39,7 @@ shared_examples_for "handling errors in application initialization" do
 			spawn_stub_application(@stub)
 			violated "Spawning the application should have raised an InitializationError."
 		rescue AppInitError => e
-			e.child_exception.should be_nil
+			e.child_exception.class.should == SystemExit
 		end
 	end
 end

data/test/ruby/rails/spawner_privilege_lowering_spec.rb

@@ -65,20 +65,20 @@ shared_examples_for "a spawner that supports lowering of privileges" do
 	
 	it "doesn't switch user if environment.rb is owned by a nonexistant user, and 'lowest_user' doesn't exist either" do
 		File.chown(CONFIG['nonexistant_uid'], nil, @environment_rb)
-		spawn_stub_application(:lowest_user => CONFIG['nonexistant_user']) do |app|
+		spawn_stub_application("lowest_user" => CONFIG['nonexistant_user']) do |app|
 			read_dumped_info[:username].should == my_username
 		end
 	end
 	
 	it "doesn't switch user if 'lower_privilege' is set to false" do
 		File.chown(uid_for('normal_user_2'), nil, @environment_rb)
-		spawn_stub_application(:lower_privilege => false) do |app|
+		spawn_stub_application("lower_privilege" => false) do |app|
 			read_dumped_info[:username].should == my_username
 		end
 	end
 	
 	it "sets $HOME to the user's home directory, after privilege lowering" do
-		spawn_stub_application(:lowest_user => CONFIG['normal_user_1']) do |app|
+		spawn_stub_application("lowest_user" => CONFIG['normal_user_1']) do |app|
 			read_dumped_info[:home].should == Etc.getpwnam(CONFIG['normal_user_1']).dir
 		end
 	end

data/test/ruby/spawn_manager_spec.rb

@@ -1,13 +1,13 @@
 require 'support/config'
 require 'support/test_helper'
-require 'passenger/spawn_manager'
+require 'phusion_passenger/spawn_manager'
 
 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
 
@@ -64,7 +64,7 @@ describe SpawnManager do
 	end
 	
 	it "can spawn when the server's not running" do
-		app = @manager.spawn_application(@stub.app_root)
+		app = @manager.spawn_application("app_root" => @stub.app_root)
 		app.close
 	end
 	
@@ -75,8 +75,7 @@ describe SpawnManager do
 				a.close
 				sleep(1) # Give @manager the chance to start.
 				channel = MessageChannel.new(b)
-				channel.write("spawn_application", @stub.app_root, "true",
-					"nobody", "production", "smart", "rails")
+				channel.write("spawn_application", "app_root", @stub.app_root)
 				channel.read
 				pid, listen_socket = channel.read
 				channel.recv_io.close
@@ -98,7 +97,7 @@ describe SpawnManager do
 			content.sub(/^RAILS_GEM_VERSION = .*$/, '')
 		end
 		@stub.dont_use_vendor_rails
-		@manager.spawn_application(@stub.app_root).close
+		@manager.spawn_application("app_root" => @stub.app_root).close
 	end
 	
 	it "properly reloads applications that do not specify a Rails version" do
@@ -108,7 +107,9 @@ describe SpawnManager do
 		@stub.dont_use_vendor_rails
 		@manager.reload(@stub.app_root)
 		spawners = @manager.instance_eval { @spawners }
-		spawners.should be_empty
+		spawners.synchronize do
+			spawners.should be_empty
+		end
 	end
 end
 
@@ -118,8 +119,9 @@ describe SpawnManager do
 	it "can spawn a Rack application" do
 		use_stub('rack') do |stub|
 			@manager = SpawnManager.new
-			app = @manager.spawn_application(stub.app_root, true,
-				"nobody", "production", "smart", "rack")
+			app = @manager.spawn_application(
+				"app_root" => stub.app_root,
+				"app_type" => "rack")
 			app.close
 		end
 	end
@@ -136,6 +138,14 @@ describe SpawnManager do
 		it_should_behave_like "a minimal spawner"
 	end
 	
+	describe "smart-lv2 spawning" do
+		before :each do
+			@spawn_method = "smart-lv2"
+		end
+		
+		it_should_behave_like "a minimal spawner"
+	end
+	
 	describe "conservative spawning" do
 		before :each do
 			@spawn_method = "conservative"
@@ -150,8 +160,9 @@ describe SpawnManager do
 	def spawn_stub_application(stub)
 		spawner = SpawnManager.new
 		begin
-			return spawner.spawn_application(stub.app_root, true,
-				"nobody", "production", @spawn_method)
+			return spawner.spawn_application(
+				"app_root" => stub.app_root,
+				"spawn_method" => @spawn_method)
 		ensure
 			spawner.cleanup
 		end

data/test/ruby/utils_spec.rb

@@ -1,9 +1,9 @@
 require 'support/config'
 
 require 'tempfile'
-require 'passenger/utils'
+require 'phusion_passenger/utils'
 
-include Passenger
+include PhusionPassenger
 
 describe Utils do
 	include Utils
@@ -30,4 +30,38 @@ describe Utils do
 			File.unlink(filename) rescue nil
 		end
 	end
+	
+	describe "#passenger_tmpdir" do
+		before :each do
+			ENV.delete('PHUSION_PASSENGER_TMP')
+		end
+		
+		after :each do
+			ENV.delete('PHUSION_PASSENGER_TMP')
+		end
+		
+		it "returns Dir.tmpdir if ENV['PHUSION_PASSENGER_TMP'] is nil" do
+			passenger_tmpdir(false).should == Dir.tmpdir
+		end
+		
+		it "returns Dir.tmpdir if ENV['PHUSION_PASSENGER_TMP'] is an empty string" do
+			ENV['PHUSION_PASSENGER_TMP'] = ''
+			passenger_tmpdir(false).should == Dir.tmpdir
+		end
+		
+		it "returns ENV['PHUSION_PASSENGER_TMP'] if it's set" do
+			ENV['PHUSION_PASSENGER_TMP'] = '/foo'
+			passenger_tmpdir(false).should == '/foo'
+		end
+		
+		it "creates the directory if it doesn't exist, if the 'create' argument is true" do
+			ENV['PHUSION_PASSENGER_TMP'] = 'utils_spec.tmp'
+			passenger_tmpdir
+			begin
+				File.directory?('utils_spec.tmp').should be_true
+			ensure
+				Dir.rmdir('utils_spec.tmp') rescue nil
+			end
+		end
+	end
 end

data/test/ruby/wsgi/application_spawner_spec.rb

@@ -0,0 +1,47 @@
+require 'support/config'
+require 'support/test_helper'
+require 'phusion_passenger/wsgi/application_spawner'
+require 'phusion_passenger/utils'
+require 'fileutils'
+require 'tempfile'
+
+describe PhusionPassenger::WSGI::ApplicationSpawner do
+	include TestHelper
+	include PhusionPassenger::Utils
+	
+	before :each do
+		ENV['PHUSION_PASSENGER_TMP'] = "#{Dir.tmpdir}/wsgi_test.tmp"
+		@stub = setup_stub('wsgi')
+		File.unlink("#{@stub.app_root}/passenger_wsgi.pyc") rescue nil
+	end
+	
+	after :each do
+		@stub.destroy
+		ENV.delete('PHUSION_PASSENGER_TMP')
+		FileUtils.rm_rf("wsgi_test.tmp")
+	end
+	
+	it "can spawn our stub application" do
+		spawn(@stub.app_root).close
+	end
+	
+	it "creates a socket in Phusion Passenger's temp directory" do
+		begin
+			app = spawn(@stub.app_root)
+			Dir["#{passenger_tmpdir}/passenger_wsgi.*"].should have(1).item
+		ensure
+			app.close rescue nil
+		end
+	end
+	
+	specify "the backend process deletes its socket upon termination" do
+		spawn(@stub.app_root).close
+		sleep 0.2 # Give it some time to terminate.
+		Dir["#{passenger_tmpdir}/passenger_wsgi.*"].should be_empty
+	end
+	
+	def spawn(*args)
+		PhusionPassenger::WSGI::ApplicationSpawner.spawn_application(*args)
+	end
+end
+