Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Require EventMachine 0.12.0 and remove pre-0.11 checks.

Name release to Double Margarita.
  • Loading branch information...
commit bdddd86657ae44adef067acc43b0a7391f3530de 1 parent 2a13143
@macournoyer macournoyer authored
View
3  CHANGELOG
@@ -1,4 +1,5 @@
-== 0.8.2 ??? release
+== 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]
View
12 lib/thin/backends/unix_server.rb
@@ -7,7 +7,6 @@ class UnixServer < Base
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 @@ def to_s
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
View
4 lib/thin/version.rb
@@ -6,11 +6,11 @@ class PlatformNotSupported < RuntimeError; end
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
View
6 tasks/gem.rake
@@ -20,11 +20,9 @@ spec = Gem::Specification.new do |s|
s.required_ruby_version = '>= 1.8.5'
s.add_dependency 'rack', '>= 0.3.0'
- if WIN
- s.add_dependency 'eventmachine', '>= 0.8.1' # TODO replace w/ latest precompiled
- else
+ 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) +
Please sign in to comment.
Something went wrong with that request. Please try again.