thin 0.6.2 → 0.6.3

data/lib/thin/version.rb

@@ -1,4 +1,4 @@
-module Thin
+module Thin  
   # Raised when a feature is not supported on the
   # current platform.
   class PlatformNotSupported < RuntimeError; end
@@ -6,17 +6,24 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 6
-    TINY     = 2
+    TINY     = 3
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Rambo'
+    CODENAME = 'Ninja Cookie'
   end
   
+  NAME    = 'thin'.freeze
+  SERVER  = "#{NAME} #{VERSION::STRING} codename #{VERSION::CODENAME}".freeze  
+  
   def self.win?
     RUBY_PLATFORM =~ /mswin/
   end
   
+  def self.linux?
+    RUBY_PLATFORM =~ /linux/
+  end
+  
   def self.ruby_18?
     RUBY_VERSION =~ /^1\.8/
   end

data/spec/command_spec.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Command do
   before do
     @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log', :pid => nil)
-    @command.script = File.dirname(__FILE__) + '/../bin/thin'
     @command.silent = true
   end
   

data/spec/configs/cluster.yml

@@ -0,0 +1,9 @@
+--- 
+pid: tmp/pids/thin.pid
+log: log/thin.log
+timeout: 60
+port: 5000
+chdir: spec/rails_app
+environment: production
+servers: 3
+address: 127.0.0.1

data/spec/configs/single.yml

@@ -0,0 +1,9 @@
+--- 
+pid: tmp/pids/thin.pid
+log: log/thin.log
+timeout: 60
+port: 6000
+chdir: spec/rails_app
+environment: production
+daemonize: true
+address: 127.0.0.1

data/spec/{cluster_spec.rb → controllers/cluster_spec.rb}

@@ -1,8 +1,9 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+include Controllers
 
 describe Cluster, "with host and port" do
   before do
-    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+    @cluster = Cluster.new(:chdir => '/rails_app',
                            :address => '0.0.0.0',
                            :port => 3000, 
                            :servers => 3,
@@ -10,7 +11,6 @@ describe Cluster, "with host and port" do
                            :log => 'thin.log',
                            :pid => 'thin.pid'
                           )
-    @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
     @cluster.silent = true
   end
     
@@ -18,6 +18,10 @@ describe Cluster, "with host and port" do
     @cluster.send(:include_server_number, 'thin.log', 3000).should == 'thin.3000.log'
     @cluster.send(:include_server_number, 'thin.pid', 3000).should == 'thin.3000.pid'
   end
+  
+  it "should exclude :servers option" do
+    @cluster.options.should_not have_key(:servers)
+  end
     
   it 'should call each server' do
     calls = []
@@ -45,13 +49,13 @@ describe Cluster, "with host and port" do
   
   private
     def options_for_port(port)
-      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "./spec/rails_app" }
+      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "/rails_app" }
     end
 end
 
 describe Cluster, "with UNIX socket" do
   before do
-    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+    @cluster = Cluster.new(:chdir => '/rails_app',
                            :socket => '/tmp/thin.sock',
                            :address => '0.0.0.0',
                            :port => 3000,
@@ -60,7 +64,6 @@ describe Cluster, "with UNIX socket" do
                            :log => 'thin.log',
                            :pid => 'thin.pid'
                           )
-    @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
     @cluster.silent = true
   end
   
@@ -69,6 +72,11 @@ describe Cluster, "with UNIX socket" do
     @cluster.send(:include_server_number, 'thin', 0).should == 'thin.0'
   end
   
+  it "should exclude :address and :port options" do
+    @cluster.options.should_not have_key(:address)
+    @cluster.options.should_not have_key(:port)
+  end
+  
   it 'should call each server' do
     calls = []
     @cluster.send(:with_each_server) do |n|
@@ -96,13 +104,13 @@ describe Cluster, "with UNIX socket" do
   
   private
     def options_for_socket(number)
-      { :daemonize => true, :log => "thin.#{number}.log", :timeout => 10, :socket => "/tmp/thin.#{number}.sock", :pid => "thin.#{number}.pid", :chdir => "./spec/rails_app" }
+      { :daemonize => true, :log => "thin.#{number}.log", :timeout => 10, :socket => "/tmp/thin.#{number}.sock", :pid => "thin.#{number}.pid", :chdir => "/rails_app" }
     end
 end
 
 describe Cluster, "controlling only one server" do
   before do
-    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+    @cluster = Cluster.new(:chdir => '/rails_app',
                            :address => '0.0.0.0',
                            :port => 3000, 
                            :servers => 3,
@@ -111,10 +119,14 @@ describe Cluster, "controlling only one server" do
                            :pid => 'thin.pid',
                            :only => 3001
                           )
-    @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
     @cluster.silent = true
   end
   
+  it "should exclude :servers and :only options" do
+    @cluster.options.should_not have_key(:servers)
+    @cluster.options.should_not have_key(:only)
+  end
+  
   it 'should call only specified server' do
     calls = []
     @cluster.send(:with_each_server) do |n|
@@ -131,6 +143,6 @@ describe Cluster, "controlling only one server" do
   
   private
     def options_for_port(port)
-      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "./spec/rails_app" }
+      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "/rails_app" }
     end
 end

data/spec/controllers/controller_spec.rb

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'ostruct'
+include Controllers
+
+describe Controller, 'start' do
+  before do
+    @controller = Controller.new(:address => '0.0.0.0', :port => 3000, :pid => 'thin.pid', :log => 'thin.log', :timeout => 60)
+    
+    @server = OpenStruct.new
+    @adapter = OpenStruct.new
+    
+    Server.should_receive(:new).with('0.0.0.0', 3000).and_return(@server)
+    Rack::Adapter::Rails.stub!(:new).and_return(@adapter)
+  end
+  
+  it "should configure server" do
+    @controller.start
+    
+    @server.app.should == @adapter
+    @server.pid_file.should == 'thin.pid'
+    @server.log_file.should == 'thin.log'
+    @server.timeout.should == 60
+  end
+  
+  it "should start as daemon" do
+    @controller.options[:daemonize] = true
+    @controller.options[:user] = true
+    @controller.options[:group] = true
+    
+    @server.should_receive(:daemonize)
+    @server.should_receive(:change_privilege)
+
+    @controller.start
+  end
+  
+  it "should configure Rails adapter" do
+    Rack::Adapter::Rails.should_receive(:new).with(@controller.options.merge(:root => nil))
+    
+    @controller.start
+  end
+  
+  it "should mount app under :prefix" do
+    @controller.options[:prefix] = '/app'
+    @controller.start
+    
+    @server.app.class.should == Rack::URLMap
+  end
+
+  it "should mount Stats adapter under :stats" do
+    @controller.options[:stats] = '/stats'
+    @controller.start
+    
+    @server.app.class.should == Stats::Adapter
+  end
+  
+  it "should load app from Rack config" do
+    @controller.options[:rackup] = 'example/config.ru'    
+    @controller.start
+    
+    @server.app.class.should == Proc
+  end
+end
+
+describe Controller do
+  it "should stop" do
+    Server.should_receive(:kill).with('thin.pid', 10)
+    Controller.new(:pid => 'thin.pid', :timeout => 10).stop
+  end
+  
+  it "should restart" do
+    Server.should_receive(:restart).with('thin.pid')
+    Controller.new(:pid => 'thin.pid').restart
+  end
+  
+  it "should write configuration file" do
+    silence_stream(STDOUT) do
+      Controller.new(:config => 'test.yml', :port => 5000, :address => '127.0.0.1').config
+    end
+
+    File.read('test.yml').should include('port: 5000', 'address: 127.0.0.1')
+    File.read('test.yml').should_not include('config: ')
+
+    File.delete('test.yml')
+  end
+end

data/spec/controllers/service_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+include Controllers
+
+describe Service do
+  before(:all) do
+    silence_stream(STDERR) do
+      Service::INITD_PATH          = 'tmp/sandbox' + Service::INITD_PATH
+      Service::DEFAULT_CONFIG_PATH = 'tmp/sandbox' + Service::DEFAULT_CONFIG_PATH
+    end
+  end
+  
+  before do
+    Thin.stub!(:linux?).and_return(true)
+    FileUtils.mkdir_p 'tmp/sandbox'
+        
+    @service = Service.new(:all => 'spec/configs')
+    @service.silent = true
+  end
+  
+  it "should call command for each config file" do
+    Command.should_receive(:run).with(:start, :config => 'spec/configs/cluster.yml', :daemonize => true)
+    Command.should_receive(:run).with(:start, :config => 'spec/configs/single.yml', :daemonize => true)
+    
+    @service.start
+  end
+  
+  it "should create /etc/init.d/thin file when calling install" do
+    @service.install
+    
+    File.exist?(Service::INITD_PATH).should be_true
+    File.read(Service::INITD_PATH).should include('CONFIG_PATH=tmp/sandbox/etc/thin',
+                                                  'SCRIPT_NAME=tmp/sandbox/etc/init.d/thin',
+                                                  'DAEMON=' + Command.script)
+  end
+  
+  it "should create /etc/thin dir when calling install" do
+    @service.install
+    
+    File.directory?(Service::DEFAULT_CONFIG_PATH).should be_true
+  end
+  
+  it "should include specified path in /etc/init.d/thin script" do
+    @service.install('tmp/sandbox/usr/thin')
+    
+    File.read(Service::INITD_PATH).should include('CONFIG_PATH=tmp/sandbox/usr/thin')
+  end
+  
+  after do
+    FileUtils.rm_rf 'tmp/sandbox'
+  end
+end

data/spec/daemonizing_spec.rb

@@ -1,9 +1,28 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+class TestServer
+  include Logging # Daemonizable should include this?
+  include Daemonizable
+  
+  def stop
+  end
+  
+  def name
+    'thin'
+  end
+end
+
 describe 'Daemonizing' do
-  before do
-    @server = Server.new('0.0.0.0', 3000, nil)
-    @server.log_file = File.dirname(__FILE__) + '/../log/daemonizing_test.log'
+  
+  before(:all) do
+    @logfile = File.dirname(__FILE__) + '/../log/daemonizing_test.log'
+    File.delete(@logfile) if File.exist?(@logfile)
+    @child_processes = []
+  end
+  
+  before(:each) do
+    @server = TestServer.new
+    @server.log_file = @logfile
     @server.pid_file = 'test.pid'
     @pid = nil
   end
@@ -15,6 +34,7 @@ describe 'Daemonizing' do
   
   it 'should create a pid file' do
     @pid = fork do
+      @child_processes << Process.pid
       @server.daemonize
       sleep 1
     end
@@ -29,6 +49,7 @@ describe 'Daemonizing' do
   
   it 'should redirect stdio to a log file' do
     @pid = fork do
+      @child_processes << Process.pid
       @server.log_file = 'daemon_test.log'
       @server.daemonize
 
@@ -49,6 +70,7 @@ describe 'Daemonizing' do
   
   it 'should change privilege' do
     @pid = fork do
+      @child_processes << Process.pid
       @server.daemonize
       @server.change_privilege('root', 'admin')
     end
@@ -58,14 +80,15 @@ describe 'Daemonizing' do
   
   it 'should kill process in pid file' do
     @pid = fork do
+      @child_processes << Process.pid
       @server.daemonize
       loop { sleep 1 }
     end
   
-    proc { sleep 0.1 until File.exist?(@server.pid_file) }.should take_less_then(3)
+    server_should_start_in_less_then 3
   
     silence_stream STDOUT do
-      Server.kill(@server.pid_file, 1)
+      TestServer.kill(@server.pid_file, 1)
     end
   
     File.exist?(@server.pid_file).should_not be_true
@@ -73,25 +96,66 @@ describe 'Daemonizing' do
   
   it 'should send kill signal if timeout' do
     @pid = fork do
+      @child_processes << Process.pid
       @server.should_receive(:stop) # pretend we cannot handle the INT signal
       @server.daemonize
       sleep 5
     end
   
-    proc { sleep 0.1 until File.exist?(@server.pid_file) }.should take_less_then(10)
+    server_should_start_in_less_then 10
   
     silence_stream STDOUT do
-      Server.kill(@server.pid_file, 1)
+      TestServer.kill(@server.pid_file, 1)
     end
   
     File.exist?(@server.pid_file).should be_false
     Process.running?(@pid).should be_false
   end
   
-  it "should restart"
+  it "should restart" do
+    @pid = fork do
+      @child_processes << Process.pid
+      @server.on_restart {}
+      @server.daemonize
+      sleep 5
+    end
+    
+    server_should_start_in_less_then 10
+  
+    silence_stream STDOUT do
+      TestServer.restart(@server.pid_file)
+    end
+    
+    proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(10)
+  end
+  
+  it "should exit if pid file already exist" do
+    @pid = fork do
+      @child_processes << Process.pid
+      @server.daemonize
+      sleep 5
+    end
+    server_should_start_in_less_then 10
+
+    proc { @server.daemonize }.should raise_error(PidFileExist)
+    
+    File.exist?(@server.pid_file).should be_true
+  end
   
-  after do
+  after(:each) do
     Process.kill(9, @pid.to_i) if @pid && Process.running?(@pid.to_i)
     Process.kill(9, @server.pid) if @server.pid && Process.running?(@server.pid)
+    File.delete(@server.pid_file) rescue nil
+  end
+  
+  after(:all) do
+    @child_processes.each do |pid|
+      Process.kill(9, pid) rescue nil
+    end
   end
+  
+  private
+    def server_should_start_in_less_then(sec=10)
+      proc { sleep 0.1 until File.exist?(@server.pid_file) }.should take_less_then(10)
+    end
 end