thin 1.2.6 → 1.2.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.2.7 No Hup
+ * Support multiple Ruby version (fat binaries under windows)
+ * Do not trap unsupported HUP signal on Windows
+
 == 1.2.6 Crazy Delicious
  * Make work with Rails 3 out-of-the-box.
  * Auto-detect and load config.ru files on start. Makes Rails 3 work.

data/Rakefile

@@ -23,7 +23,7 @@ Rake::ExtensionTask.new('thin_parser', Thin::GemSpec) do |ext|
   ext.cross_platform = %w( i386-mswin32 x86-mingw32 )
 end
 
-CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
+CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM lib/1.{8,9}})
 
 desc "Compile the Ragel state machines"
 task :ragel do
@@ -35,5 +35,10 @@ task :ragel do
   end
 end
 
+desc "Build gem packages"
+task :gems do
+  sh "rvm use 1.8.6; rake clean gem && rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1"
+end
+
 desc "Release version #{Thin::VERSION::STRING} gems to rubyforge"
-task :release => [:clean, :cross, :native, :gem, :tag, "gem:upload"]
+task :release => [:tag, "gem:push"]

data/lib/thin.rb

@@ -39,6 +39,16 @@ require "#{Thin::ROOT}/thin/version"
 require "#{Thin::ROOT}/thin/statuses"
 require "#{Thin::ROOT}/rack/adapter/loader"
 
+# support multiple Ruby version (fat binaries under windows)
+begin
+  require "#{Thin::ROOT}/thin_parser"
+rescue LoadError
+  if RUBY_PLATFORM =~ /mingw|mswin/ then
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "#{Thin::ROOT}/#{$1}/thin_parser"
+  end
+end
+
 module Rack
   module Adapter
     autoload :Rails, "#{Thin::ROOT}/rack/adapter/rails"

data/lib/thin/request.rb

@@ -1,4 +1,3 @@
-require "#{Thin::ROOT}/thin_parser"
 require 'tempfile'
 
 module Thin

data/lib/thin/server.rb

@@ -210,10 +210,12 @@ module Thin
       # * INT calls +stop+ to shutdown gracefully.
       # * TERM calls <tt>stop!</tt> to force shutdown.
       def setup_signals
-        trap('QUIT') { stop }  unless Thin.win?
         trap('INT')  { stop! }
         trap('TERM') { stop! }
-        trap('HUP')  { restart }
+        unless Thin.win?
+          trap('QUIT') { stop }
+          trap('HUP')  { restart }
+        end
       end
       
       def select_backend(host, port, options)

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 6
+    TINY     = 7
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Crazy Delicious".freeze
+    CODENAME = "No Hup".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/tasks/gem.rake

@@ -58,9 +58,9 @@ task :gem => :tag_warn
 
 namespace :gem do
   desc 'Upload gems to gemcutter.org'
-  task :push => :gem do
+  task :push do
     Dir["pkg/#{Thin::GemSpec.full_name}*.gem"].each do |file|
-      puts "gem push #{file}"
+      sh "gem push #{file}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency