thin 0.6.1-x86-mswin32-60 → 0.6.2-x86-mswin32-60

data/lib/thin/version.rb

@@ -1,11 +1,23 @@
 module Thin
+  # Raised when a feature is not supported on the
+  # current platform.
+  class PlatformNotSupported < RuntimeError; end
+  
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 6
-    TINY     = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Cheesecake'
+    CODENAME = 'Rambo'
+  end
+  
+  def self.win?
+    RUBY_PLATFORM =~ /mswin/
+  end
+  
+  def self.ruby_18?
+    RUBY_VERSION =~ /^1\.8/
   end
 end

data/spec/cluster_spec.rb

@@ -26,36 +26,27 @@ describe Cluster, "with host and port" do
     end
     calls.should == [3000, 3001, 3002]
   end
-  
-  it 'should shellify command' do
-    out = @cluster.send(:shellify, :start, :port => 3000, :daemonize => true, :log => 'hi.log', :pid => nil)
-    out.should include('--port=3000', '--daemonize', '--log="hi.log"', 'thin start --')
-    out.should_not include('--pid=')
-  end
-  
-  it 'should absolutize file path' do
-    @cluster.pid_file_for(3000).should == File.expand_path(File.dirname(__FILE__) + "/rails_app/thin.3000.pid")
-  end
-  
-  it 'should start on specified port' do
-    @cluster.should_receive(:`) do |with|
-      with.should include('thin start', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
-      with.should_not include('--socket')
-      ''
-    end
+    
+  it 'should start on each port' do
+    Command.should_receive(:run).with(:start, options_for_port(3000))
+    Command.should_receive(:run).with(:start, options_for_port(3001))
+    Command.should_receive(:run).with(:start, options_for_port(3002))
 
-    @cluster.start_server 3001    
+    @cluster.start
   end
 
-  it 'should stop on specified port' do
-    @cluster.should_receive(:`) do |with|
-      with.should include('thin stop', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
-      with.should_not include('--socket')
-      ''
-    end
+  it 'should stop on each port' do
+    Command.should_receive(:run).with(:stop, options_for_port(3000))
+    Command.should_receive(:run).with(:stop, options_for_port(3001))
+    Command.should_receive(:run).with(:stop, options_for_port(3002))
 
-    @cluster.stop_server 3001
+    @cluster.stop
   end
+  
+  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" }
+    end
 end
 
 describe Cluster, "with UNIX socket" do
@@ -86,23 +77,60 @@ describe Cluster, "with UNIX socket" do
     calls.should == [0, 1, 2]
   end
   
-  it 'should start specified server' do
-    @cluster.should_receive(:`) do |with|
-      with.should include('thin start', '--daemonize', 'thin.1.log', 'thin.1.pid', '--socket="/tmp/thin.1.sock"')
-      with.should_not include('--port', '--address')
-      ''
-    end
+  it 'should start each server' do
+    Command.should_receive(:run).with(:start, options_for_socket(0))
+    Command.should_receive(:run).with(:start, options_for_socket(1))
+    Command.should_receive(:run).with(:start, options_for_socket(2))
 
-    @cluster.start_server 1
+    @cluster.start
   end
 
-  it 'should stop specified server' do
-    @cluster.should_receive(:`) do |with|
-      with.should include('thin stop', '--daemonize', 'thin.1.log', 'thin.1.pid', '--socket="/tmp/thin.1.sock"')
-      with.should_not include('--port', '--address')
-      ''
+  it 'should stop each server' do
+    Command.should_receive(:run).with(:stop, options_for_socket(0))
+    Command.should_receive(:run).with(:stop, options_for_socket(1))
+    Command.should_receive(:run).with(:stop, options_for_socket(2))
+
+    @cluster.stop
+  end
+  
+  
+  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" }
     end
+end
 
-    @cluster.stop_server 1
+describe Cluster, "controlling only one server" do
+  before do
+    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+                           :address => '0.0.0.0',
+                           :port => 3000, 
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid',
+                           :only => 3001
+                          )
+    @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
+    @cluster.silent = true
+  end
+  
+  it 'should call only specified server' do
+    calls = []
+    @cluster.send(:with_each_server) do |n|
+      calls << n
+    end
+    calls.should == [3001]
   end
+  
+  it "should start only specified server" do
+    Command.should_receive(:run).with(:start, options_for_port(3001))
+
+    @cluster.start
+  end
+  
+  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" }
+    end
 end

data/spec/command_spec.rb

@@ -0,0 +1,15 @@
+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
+  
+  it 'should shellify command' do
+    out = @command.shellify
+    out.should include('--port=3000', '--daemonize', '--log="hi.log"', 'thin start --')
+    out.should_not include('--pid=')
+  end
+end

data/spec/daemonizing_spec.rb

@@ -19,6 +19,7 @@ describe 'Daemonizing' do
       sleep 1
     end
     
+    sleep 1
     Process.wait(@pid)
     File.exist?(@server.pid_file).should be_true
     @pid = @server.pid
@@ -87,6 +88,8 @@ describe 'Daemonizing' do
     Process.running?(@pid).should be_false
   end
   
+  it "should restart"
+  
   after 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)

data/spec/request_spec.rb

@@ -190,18 +190,28 @@ EOS
   end
   
   it "should move body to tempfile when too big" do
+    request = Request.new
+    request.parse("POST /postit HTTP/1.1\r\nContent-Length: #{Request::MAX_BODY*2}\r\n\r\n#{'X' * Request::MAX_BODY}")
+    request.parse('X' * Request::MAX_BODY)
+    
+    request.body.size.should == Request::MAX_BODY * 2
+    request.should be_finished
+    request.body.class.should == Tempfile
+  end
+  
+  it "should delete body tempfile when closing" do
     body = 'X' * (Request::MAX_BODY + 1)
     
     request = R(<<-EOS.chomp, true)
 POST /postit HTTP/1.1
-Host: localhost:3000
-Content-Type: text/html
 Content-Length: #{body.size}
 
 #{body}
 EOS
     
-    request.body.class.should == Tempfile
+    request.body.path.should_not be_nil
+    request.close
+    request.body.path.should be_nil
   end
   
   it "should raise error when header is too big" do

data/spec/response_spec.rb

@@ -52,7 +52,7 @@ describe Response do
     out.should include("\r\n\r\n<html></html>")
   end
   
-  it "should be faster then #{max_parsing_time = 0.00011} RubySecond" do
+  it "should be fast" do
     @response.body << <<-EOS
 <html><head><title>Dir listing</title></head>
 <body><h1>Listing stuff</h1><ul>
@@ -60,7 +60,7 @@ describe Response do
 </ul></body></html>
 EOS
     
-    proc { @response.each { |l| l } }.should be_faster_then(max_parsing_time)
+    proc { @response.each { |l| l } }.should be_faster_then(0.00011)
   end
   
   it "should be closeable" do

data/spec/server_spec.rb

@@ -10,11 +10,11 @@ describe Server do
       body << env['rack.input'].read
       [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
     end
-    server = Thin::Server.new('0.0.0.0', 3333, app)
-    server.timeout = 3
-    server.silent = true
+    @server = Thin::Server.new('0.0.0.0', 3333, app)
+    @server.timeout = 3
+    @server.silent = true
     
-    @thread = Thread.new { server.start }
+    @thread = Thread.new { @server.start }
     sleep 0.1 until @thread.status == 'sleep'
   end
     
@@ -23,18 +23,18 @@ describe Server do
   end
   
   it 'should GET from TCPSocket' do
-    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\n\r\n").
+    raw("GET /?this HTTP/1.1\r\n\r\n").
       should include("HTTP/1.1 200 OK",
                      "Content-Type: text/html", "Content-Length: ",
                      "Connection: close", "this")
   end
   
   it 'should return empty string on incomplete headers' do
-    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\nHost:").should be_empty
+    raw("GET /?this HTTP/1.1\r\nHost:").should be_empty
   end
   
   it 'should return empty string on incorrect Content-Length' do
-    raw('0.0.0.0', 3333, "POST / HTTP/1.1\r\nContent-Length: 300\r\n\r\naye").should be_empty
+    raw("POST / HTTP/1.1\r\nContent-Length: 300\r\n\r\naye").should be_empty
   end
   
   it 'should POST from Net::HTTP' do
@@ -58,7 +58,40 @@ describe Server do
     get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"')
   end
   
+  it "should wait for current requests before soft stopping" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write("GET / HTTP/1.1")
+    @server.stop # Stop the server in the middle of a request
+    socket.write("\r\n\r\n")
+    
+    out = socket.read
+    socket.close
+    
+    out.should_not be_empty
+  end
+  
+  it "should not accept new requests when soft stopping" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write("GET / HTTP/1.1")
+    @server.stop # Stop the server in the middle of a request
+    
+    EventMachine.next_tick do
+      proc { get('/') }.should raise_error(Errno::ECONNRESET)
+    end
+    
+    socket.close
+  end
+  
+  it "should drop current requests when hard stopping" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write("GET / HTTP/1.1")
+    @server.stop! # Force stop the server in the middle of a request
+    
+    EventMachine.next_tick { socket.should be_closed }
+  end
+  
   after do
+    @server.stop!
     @thread.kill
   end
   
@@ -67,8 +100,8 @@ describe Server do
       Net::HTTP.get(URI.parse('http://0.0.0.0:3333' + url))
     end
     
-    def raw(host, port, data)
-      socket = TCPSocket.new(host, port)
+    def raw(data)
+      socket = TCPSocket.new('0.0.0.0', 3333)
       socket.write data
       out = socket.read
       socket.close
@@ -143,11 +176,12 @@ describe Server, "on UNIX domain socket" do
   end
   
   it "should remove socket file after server stops" do
-    @server.stop
+    @server.stop!
     File.exist?('/tmp/thin_test.sock').should be_false
   end
   
   after do
+    @server.stop!
     @thread.kill
   end
   

data/tasks/gem.rake

@@ -67,17 +67,11 @@ namespace :gem do
       system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
     end    
 
-    desc 'Upload gem to rubyforge.org'
+    desc 'Upload gems (ruby & win32) to rubyforge.org'
     task :rubyforge => :gem do
       sh 'rubyforge login'
       sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
-      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"    
-    end
-
-    desc 'Upload the precompiled win32 gem to rubyforge.org'
-    task 'rubyforge:win' do
-      sh 'rubyforge login'
-      sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
+      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
     end
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: x86-mswin32-60
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-26 00:00:00 -07:00
+date: 2008-01-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ files:
 - doc/benchmarks.txt
 - example/adapter.rb
 - example/config.ru
+- example/monit_sockets
+- example/monit_unixsock
 - example/thin.god
 - lib/rack
 - lib/rack/adapter
@@ -58,6 +60,7 @@ files:
 - lib/rack/handler/thin.rb
 - lib/thin
 - lib/thin/cluster.rb
+- lib/thin/command.rb
 - lib/thin/connection.rb
 - lib/thin/daemonizing.rb
 - lib/thin/headers.rb
@@ -70,6 +73,7 @@ files:
 - lib/thin/version.rb
 - lib/thin.rb
 - spec/cluster_spec.rb
+- spec/command_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
 - spec/rack_rails_spec.rb