thin 1.2.6 → 1.2.7

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ == 1.2.7 No Hup
2
+ * Support multiple Ruby version (fat binaries under windows)
3
+ * Do not trap unsupported HUP signal on Windows
4
+
1
5
  == 1.2.6 Crazy Delicious
2
6
  * Make work with Rails 3 out-of-the-box.
3
7
  * Auto-detect and load config.ru files on start. Makes Rails 3 work.
data/Rakefile CHANGED
@@ -23,7 +23,7 @@ Rake::ExtensionTask.new('thin_parser', Thin::GemSpec) do |ext|
23
23
  ext.cross_platform = %w( i386-mswin32 x86-mingw32 )
24
24
  end
25
25
 
26
- CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
26
+ CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM lib/1.{8,9}})
27
27
 
28
28
  desc "Compile the Ragel state machines"
29
29
  task :ragel do
@@ -35,5 +35,10 @@ task :ragel do
35
35
  end
36
36
  end
37
37
 
38
+ desc "Build gem packages"
39
+ task :gems do
40
+ sh "rvm use 1.8.6; rake clean gem && rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1"
41
+ end
42
+
38
43
  desc "Release version #{Thin::VERSION::STRING} gems to rubyforge"
39
- task :release => [:clean, :cross, :native, :gem, :tag, "gem:upload"]
44
+ task :release => [:tag, "gem:push"]
@@ -39,6 +39,16 @@ require "#{Thin::ROOT}/thin/version"
39
39
  require "#{Thin::ROOT}/thin/statuses"
40
40
  require "#{Thin::ROOT}/rack/adapter/loader"
41
41
 
42
+ # support multiple Ruby version (fat binaries under windows)
43
+ begin
44
+ require "#{Thin::ROOT}/thin_parser"
45
+ rescue LoadError
46
+ if RUBY_PLATFORM =~ /mingw|mswin/ then
47
+ RUBY_VERSION =~ /(\d+.\d+)/
48
+ require "#{Thin::ROOT}/#{$1}/thin_parser"
49
+ end
50
+ end
51
+
42
52
  module Rack
43
53
  module Adapter
44
54
  autoload :Rails, "#{Thin::ROOT}/rack/adapter/rails"
@@ -1,4 +1,3 @@
1
- require "#{Thin::ROOT}/thin_parser"
2
1
  require 'tempfile'
3
2
 
4
3
  module Thin
@@ -210,10 +210,12 @@ module Thin
210
210
  # * INT calls +stop+ to shutdown gracefully.
211
211
  # * TERM calls <tt>stop!</tt> to force shutdown.
212
212
  def setup_signals
213
- trap('QUIT') { stop } unless Thin.win?
214
213
  trap('INT') { stop! }
215
214
  trap('TERM') { stop! }
216
- trap('HUP') { restart }
215
+ unless Thin.win?
216
+ trap('QUIT') { stop }
217
+ trap('HUP') { restart }
218
+ end
217
219
  end
218
220
 
219
221
  def select_backend(host, port, options)
@@ -6,11 +6,11 @@ module Thin
6
6
  module VERSION #:nodoc:
7
7
  MAJOR = 1
8
8
  MINOR = 2
9
- TINY = 6
9
+ TINY = 7
10
10
 
11
11
  STRING = [MAJOR, MINOR, TINY].join('.')
12
12
 
13
- CODENAME = "Crazy Delicious".freeze
13
+ CODENAME = "No Hup".freeze
14
14
 
15
15
  RACK = [1, 0].freeze # Rack protocol version
16
16
  end
@@ -58,9 +58,9 @@ task :gem => :tag_warn
58
58
 
59
59
  namespace :gem do
60
60
  desc 'Upload gems to gemcutter.org'
61
- task :push => :gem do
61
+ task :push do
62
62
  Dir["pkg/#{Thin::GemSpec.full_name}*.gem"].each do |file|
63
- puts "gem push #{file}"
63
+ sh "gem push #{file}"
64
64
  end
65
65
  end
66
66
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.6
4
+ version: 1.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2010-02-25 00:00:00 -05:00
12
+ date: 2010-03-01 00:00:00 -05:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency