thin 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.8.2 Double Margarita release
+ * Require EventMachine 0.12.0
+ * [bug] Fix timeout handling when running command
+ * [bug] Fix hanging when restarting and no process is running in single server move, fixes #67
+ * Added Mack adapter [markbates]
+ * Allow rackup .rb files by getting a conventionally named constant as the app [bmizerany]
+
 == 0.8.1 Rebel Porpoise release
  * [bug] Rescue all types of errors when processing request, fixes #62
  * [bug] Use Swiftiply backend when -y option is specified, fixes #63 and #64

data/example/myapp.rb

@@ -0,0 +1 @@
+Myapp = lambda { |env| [200, {}, 'this is my app!'] }

data/lib/rack/adapter/loader.rb

@@ -9,6 +9,7 @@ module Rack
     :ramaze  => "start.rb",
     :merb    => "config/init.rb",
     :halcyon => 'runner.ru',
+    :mack    => 'config/app_config/default.yml',
     :file    => nil
   }
     
@@ -57,6 +58,11 @@ module Rack
         
         return Halcyon::Runner.new
       
+      when :mack
+        ENV["MACK_ENV"] = options[:environment]
+        load(::File.join(options[:chdir], "Rakefile"))
+        require 'mack'
+        return Mack::Utils::Server.build_app
       when :file
         return Rack::File.new(options[:chdir])
       

data/lib/thin/backends/unix_server.rb

@@ -7,7 +7,6 @@ module Thin
       
       def initialize(socket)
         raise PlatformNotSupported, 'UNIX domain sockets not available on Windows' if Thin.win?
-        check_event_machine_version
         @socket = socket
         super()
       end
@@ -39,17 +38,6 @@ module Thin
         def remove_socket_file
           File.delete(@socket) if @socket && File.exist?(@socket)
         end
-        
-        def check_event_machine_version
-          # TODO remove this crap once eventmachine 0.11.0 is released
-          begin
-            gem 'eventmachine', '>= 0.11.0'
-          rescue Gem::LoadError
-            raise LoadError, "UNIX domain sockets require EventMachine version 0.11.0 or higher, " +
-                             "install the (not yet released) gem with: " +
-                             "gem install eventmachine --source http://code.macournoyer.com"
-          end
-        end
     end    
   end
 

data/lib/thin/controllers/controller.rb

@@ -83,17 +83,19 @@ module Thin
         raise OptionRequired, :pid unless @options[:pid]
       
         tail_log(@options[:log]) do
-          Server.kill(@options[:pid], @options[:timeout] || 60)
-          wait_for_file :deletion, @options[:pid]
+          if Server.kill(@options[:pid], @options[:timeout] || 60)
+            wait_for_file :deletion, @options[:pid]
+          end
         end
       end
     
       def restart
         raise OptionRequired, :pid unless @options[:pid]
-      
+        
         tail_log(@options[:log]) do
-          Server.restart(@options[:pid])
-          wait_for_file :creation, @options[:pid]
+          if Server.restart(@options[:pid])
+            wait_for_file :creation, @options[:pid]
+          end
         end
       end
     
@@ -110,9 +112,11 @@ module Thin
       protected
         # Wait for a pid file to either be created or deleted.
         def wait_for_file(state, file)
-          case state
-          when :creation then sleep 0.1 until File.exist?(file)
-          when :deletion then sleep 0.1 while File.exist?(file)
+          Timeout.timeout(@options[:timeout] || 30) do
+            case state
+            when :creation then sleep 0.1 until File.exist?(file)
+            when :deletion then sleep 0.1 while File.exist?(file)
+            end
           end
         end
         
@@ -161,8 +165,16 @@ module Thin
         end
         
         def load_rackup_config
-          rackup_code = File.read(@options[:rackup])
-          eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup])
+          case @options[:rackup]
+          when /\.rb$/
+            Kernel.load(@options[:rackup])
+            Object.const_get(File.basename(@options[:rackup], '.rb').capitalize.to_sym)
+          when /\.ru$/
+            rackup_code = File.read(@options[:rackup])
+            eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup])
+          else
+            raise "Invalid rackup file.  please specify either a .ru or .rb file"
+          end
         end
     end
   end

data/lib/thin/daemonizing.rb

@@ -94,17 +94,16 @@ module Thin
       # sent.
       def kill(pid_file, timeout=60)
         if pid = send_signal('QUIT', pid_file)
-          begin
-            Timeout.timeout(timeout) do
-              sleep 0.1 while Process.running?(pid)
-            end
-          rescue Timeout::Error
-            print "Timeout! "
-            send_signal('KILL', pid_file)
-          rescue Interrupt
-            send_signal('KILL', pid_file)
+          Timeout.timeout(timeout) do
+            sleep 0.1 while Process.running?(pid)
           end
         end
+      rescue Timeout::Error
+        print "Timeout! "
+        send_signal('KILL', pid_file)
+      rescue Interrupt
+        send_signal('KILL', pid_file)
+      ensure
         File.delete(pid_file) if File.exist?(pid_file)
       end
       

data/lib/thin/runner.rb

@@ -174,7 +174,7 @@ module Thin
     
     # +true+ if we're controlling a cluster.
     def cluster?
-      @options[:only] || @options[:servers]
+      @options[:only] || @options[:servers] || @options[:config]
     end
     
     # +true+ if we're acting a as system service.

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 8
-    TINY     = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Rebel Porpoise'
+    CODENAME = 'Double Margarita'
     
     RACK     = [0, 3].freeze # Latest Rack version that was tested
   end

data/spec/controllers/controller_spec.rb

@@ -63,11 +63,25 @@ describe Controller, 'start' do
   end
   
   it "should load app from Rack config" do
-    @controller.options[:rackup] = 'example/config.ru'    
+    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/config.ru'    
     @controller.start
     
     @server.app.class.should == Proc
   end
+
+  it "should load app from ruby file" do
+    @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.rb'    
+    @controller.start
+    
+    @server.app.should == Myapp
+  end
+
+  it "should throwup if rackup is not a .ru or .rb file" do
+    proc do
+      @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.foo'    
+      @controller.start
+    end.should raise_error(RuntimeError, /please/)
+  end
   
   it "should set server as threaded" do
     @controller.options[:threaded] = true
@@ -75,6 +89,7 @@ describe Controller, 'start' do
     
     @server.threaded.should be_true
   end
+    
 end
 
 describe Controller do

data/spec/daemonizing_spec.rb

@@ -133,6 +133,12 @@ describe 'Daemonizing' do
     proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(10)
   end
   
+  it "should not restart when not running" do
+    silence_stream STDOUT do
+      TestServer.restart(@server.pid_file)
+    end
+  end
+  
   it "should exit and raise if pid file already exist" do
     @pid = fork do
       @server.daemonize

data/spec/request/parser_spec.rb

@@ -173,6 +173,18 @@ EOS
     end
   end
   
+  xit "should parse absolute request URI" do
+    request = R(<<-EOS, true)
+GET http://localhost:3000/hi HTTP/1.1
+Host: localhost:3000
+
+EOS
+    request.env['PATH_INFO'].should == '/hi'
+
+    request.should validate_with_lint
+  end
+  
+  
   it "should fails on heders larger then MAX_HEADER" do
     proc { R("GET / HTTP/1.1\r\nFoo: #{'X' * Request::MAX_HEADER}\r\n\r\n") }.should raise_error(InvalidRequest)
   end

data/tasks/gem.rake

@@ -19,12 +19,10 @@ spec = Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.8.5'
   
-  s.add_dependency        'rack',         '>= 0.2.0'
-  if WIN
-    s.add_dependency      'eventmachine', '= 0.8.1' # TODO replace w/ latest precompiled
-  else
+  s.add_dependency        'rack',         '>= 0.3.0'
+  s.add_dependency        'eventmachine', '>= 0.12.0'
+  unless WIN
     s.add_dependency      'daemons',      '>= 1.0.9'
-    s.add_dependency      'eventmachine', '>= 0.10.0' # TODO '>= 0.11.0' when it's released
   end
 
   s.files                 = %w(COPYING CHANGELOG COMMITTERS README Rakefile) +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-19 00:00:00 -04:00
+date: 2008-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,25 +19,25 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: eventmachine
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 0.12.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: daemons
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 1.0.9
     version: 
 description: A thin and fast web server
 email: macournoyer@gmail.com
@@ -61,6 +61,7 @@ files:
 - example/config.ru
 - example/monit_sockets
 - example/monit_unixsock
+- example/myapp.rb
 - example/ramaze.ru
 - example/thin.god
 - example/thin_solaris_smf.erb