passenger 5.0.0.beta3 → 5.0.0.rc1

data/test/ruby/rack/loader_spec.rb

@@ -5,38 +5,38 @@ require 'ruby/shared/ruby_loader_sharedspec'
 module PhusionPassenger
 
 describe "Rack loader" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rack"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rack"))
+  end
 
-	def start(options = {})
-		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
-		return @loader.start(options)
-	end
+  def start(options = {})
+    @loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+    return @loader.start(options)
+  end
 
-	it_should_behave_like "a loader"
-	it_should_behave_like "a Ruby loader"
+  it_should_behave_like "a loader"
+  it_should_behave_like "a Ruby loader"
 
-	it "calls the starting_worker_process event with forked=false" do
-		File.prepend(@stub.startup_file, %q{
-			history_file = "history.txt"
-			PhusionPassenger.on_event(:starting_worker_process) do |forked|
-				::File.open(history_file, 'a') do |f|
-					f.puts "worker_process_started: forked=#{forked}\n"
-				end
-			end
-			::File.open(history_file, 'a') do |f|
-				f.puts "end of startup file\n"
-			end
-		})
-		result = start
-		result[:status].should == "Ready"
-		File.read("#{@stub.app_root}/history.txt").should ==
-			"end of startup file\n" +
-			"worker_process_started: forked=false\n"
-	end
+  it "calls the starting_worker_process event with forked=false" do
+    File.prepend(@stub.startup_file, %q{
+      history_file = "history.txt"
+      PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        ::File.open(history_file, 'a') do |f|
+          f.puts "worker_process_started: forked=#{forked}\n"
+        end
+      end
+      ::File.open(history_file, 'a') do |f|
+        f.puts "end of startup file\n"
+      end
+    })
+    result = start
+    result[:status].should == "Ready"
+    File.read("#{@stub.app_root}/history.txt").should ==
+      "end of startup file\n" +
+      "worker_process_started: forked=false\n"
+  end
 end
 
 end # module PhusionPassenger

data/test/ruby/rack/preloader_spec.rb

@@ -5,44 +5,44 @@ require 'ruby/shared/ruby_loader_sharedspec'
 module PhusionPassenger
 
 describe "Rack preloader" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rack"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rack"))
+  end
 
-	def start(options = {})
-		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
-		result = @preloader.start(options)
-		if result[:status] == "Ready"
-			@loader = @preloader.spawn(options)
-			return @loader.start(options)
-		else
-			return result
-		end
-	end
+  def start(options = {})
+    @preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+    result = @preloader.start(options)
+    if result[:status] == "Ready"
+      @loader = @preloader.spawn(options)
+      return @loader.start(options)
+    else
+      return result
+    end
+  end
 
-	it_should_behave_like "a loader"
-	it_should_behave_like "a Ruby loader"
+  it_should_behave_like "a loader"
+  it_should_behave_like "a Ruby loader"
 
-	it "calls the starting_worker_process event with forked=true" do
-		File.prepend(@stub.startup_file, %q{
-			history_file = "history.txt"
-			PhusionPassenger.on_event(:starting_worker_process) do |forked|
-				::File.open(history_file, 'a') do |f|
-					f.puts "worker_process_started: forked=#{forked}\n"
-				end
-			end
-			::File.open(history_file, 'a') do |f|
-				f.puts "end of startup file\n"
-			end
-		})
-		result = start
-		result[:status].should == "Ready"
-		File.read("#{@stub.app_root}/history.txt").should ==
-			"end of startup file\n" +
-			"worker_process_started: forked=true\n"
-	end
+  it "calls the starting_worker_process event with forked=true" do
+    File.prepend(@stub.startup_file, %q{
+      history_file = "history.txt"
+      PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        ::File.open(history_file, 'a') do |f|
+          f.puts "worker_process_started: forked=#{forked}\n"
+        end
+      end
+      ::File.open(history_file, 'a') do |f|
+        f.puts "end of startup file\n"
+      end
+    })
+    result = start
+    result[:status].should == "Ready"
+    File.read("#{@stub.app_root}/history.txt").should ==
+      "end of startup file\n" +
+      "worker_process_started: forked=true\n"
+  end
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.0/loader_spec.rb

@@ -5,22 +5,22 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack loader with Rails 3.0" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.0"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.0"))
+  end
 
-	def start(options = {})
-		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
-		return @loader.start(options)
-	end
+  def start(options = {})
+    @loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+    return @loader.start(options)
+  end
 
-	def rails_version
-		return "3.0"
-	end
+  def rails_version
+    return "3.0"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.0/preloader_spec.rb

@@ -5,28 +5,28 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack preloader with Rails 3.0" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.0"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.0"))
+  end
 
-	def start(options = {})
-		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
-		result = @preloader.start(options)
-		if result[:status] == "Ready"
-			@loader = @preloader.spawn(options)
-			return @loader.start(options)
-		else
-			return result
-		end
-	end
+  def start(options = {})
+    @preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+    result = @preloader.start(options)
+    if result[:status] == "Ready"
+      @loader = @preloader.spawn(options)
+      return @loader.start(options)
+    else
+      return result
+    end
+  end
 
-	def rails_version
-		return "3.0"
-	end
+  def rails_version
+    return "3.0"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.1/loader_spec.rb

@@ -5,22 +5,22 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack loader with Rails 3.1" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.1"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.1"))
+  end
 
-	def start(options = {})
-		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
-		return @loader.start(options)
-	end
+  def start(options = {})
+    @loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+    return @loader.start(options)
+  end
 
-	def rails_version
-		return "3.1"
-	end
+  def rails_version
+    return "3.1"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.1/preloader_spec.rb

@@ -5,28 +5,28 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack preloader with Rails 3.1" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.1"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.1"))
+  end
 
-	def start(options = {})
-		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
-		result = @preloader.start(options)
-		if result[:status] == "Ready"
-			@loader = @preloader.spawn(options)
-			return @loader.start(options)
-		else
-			return result
-		end
-	end
+  def start(options = {})
+    @preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+    result = @preloader.start(options)
+    if result[:status] == "Ready"
+      @loader = @preloader.spawn(options)
+      return @loader.start(options)
+    else
+      return result
+    end
+  end
 
-	def rails_version
-		return "3.1"
-	end
+  def rails_version
+    return "3.1"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.2/loader_spec.rb

@@ -5,22 +5,22 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack loader with Rails 3.2" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.2"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.2"))
+  end
 
-	def start(options = {})
-		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
-		return @loader.start(options)
-	end
+  def start(options = {})
+    @loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+    return @loader.start(options)
+  end
 
-	def rails_version
-		return "3.2"
-	end
+  def rails_version
+    return "3.2"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.2/preloader_spec.rb

@@ -5,28 +5,28 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 module PhusionPassenger
 
 describe "Rack preloader with Rails 3.2" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails3.2"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails3.2"))
+  end
 
-	def start(options = {})
-		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
-		result = @preloader.start(options)
-		if result[:status] == "Ready"
-			@loader = @preloader.spawn(options)
-			return @loader.start(options)
-		else
-			return result
-		end
-	end
+  def start(options = {})
+    @preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+    result = @preloader.start(options)
+    if result[:status] == "Ready"
+      @loader = @preloader.spawn(options)
+      return @loader.start(options)
+    else
+      return result
+    end
+  end
 
-	def rails_version
-		return "3.2"
-	end
+  def rails_version
+    return "3.2"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails4.0/loader_spec.rb

@@ -6,22 +6,22 @@ if RUBY_VERSION_INT >= 190
 module PhusionPassenger
 
 describe "Rack loader with Rails 4.0" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails4.0"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails4.0"))
+  end
 
-	def start(options = {})
-		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
-		return @loader.start(options)
-	end
+  def start(options = {})
+    @loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+    return @loader.start(options)
+  end
 
-	def rails_version
-		return "4.0"
-	end
+  def rails_version
+    return "4.0"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails4.0/preloader_spec.rb

@@ -6,28 +6,28 @@ if RUBY_VERSION_INT >= 190
 module PhusionPassenger
 
 describe "Rack preloader with Rails 4.0" do
-	include LoaderSpecHelper
+  include LoaderSpecHelper
 
-	before :each do
-		@stub = register_stub(RackStub.new("rails4.0"))
-	end
+  before :each do
+    @stub = register_stub(RackStub.new("rails4.0"))
+  end
 
-	def start(options = {})
-		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
-		result = @preloader.start(options)
-		if result[:status] == "Ready"
-			@loader = @preloader.spawn(options)
-			return @loader.start(options)
-		else
-			return result
-		end
-	end
+  def start(options = {})
+    @preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+    result = @preloader.start(options)
+    if result[:status] == "Ready"
+      @loader = @preloader.spawn(options)
+      return @loader.start(options)
+    else
+      return result
+    end
+  end
 
-	def rails_version
-		return "4.0"
-	end
+  def rails_version
+    return "4.0"
+  end
 
-	include_examples "Union Station extensions for Rails"
+  include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger