macournoyer-thin 1.0.1 → 1.1.0

data/CHANGELOG

@@ -1,4 +1,6 @@
-== 1.0.1 ? release
+== 1.1.0 Super Disco Power release
+ * Fix Rack protocol version to 0.1 in environment hash.
+ * Fix error when passing no_epoll option to a cluster.
  * Omit parsing #defined strings [Jérémy Zurcher]
  * Defaults SERVER_NAME to localhost like webrick does [#87 state:resolved]
  * Namespace parser to prevent error when mongrel is required [cliffmoon]

data/lib/thin/command.rb

@@ -34,12 +34,13 @@ module Thin
     # Turn into a runnable shell command
     def shellify
       shellified_options = @options.inject([]) do |args, (name, value)|
+        option_name = name.to_s.tr("_", "-")
         case value
         when NilClass,
-             TrueClass then args << "--#{name}"
+             TrueClass then args << "--#{option_name}"
         when FalseClass
-        when Array     then value.each { |v| args << "--#{name}=#{v.inspect}" }
-        else                args << "--#{name.to_s.tr('_', '-')}=#{value.inspect}"
+        when Array     then value.each { |v| args << "--#{option_name}=#{v.inspect}" }
+        else                args << "--#{option_name}=#{value.inspect}"
         end
         args
       end

data/lib/thin/version.rb

@@ -5,14 +5,14 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 0
-    TINY     = 1
+    MINOR    = 1
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "?".freeze
+    CODENAME = "Super Disco Power".freeze
     
-    RACK     = [0, 3].freeze # Latest Rack version that was tested
+    RACK     = [0, 1].freeze # Rack protocol version that was tested
   end
   
   NAME    = 'thin'.freeze

data/spec/command_spec.rb

@@ -4,7 +4,7 @@ describe Command do
   before do
     Command.script = 'thin'
     @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log',
-                           :require => %w(rubygems thin))
+                           :require => %w(rubygems thin), :no_epoll => true)
   end
   
   it 'should shellify command' do
@@ -17,4 +17,9 @@ describe Command do
     out = @command.shellify
     out.should include('--require="rubygems"', '--require="thin"')
   end
+
+  it 'should convert _ to - in option name' do
+    out = @command.shellify
+    out.should include('--no-epoll')
+  end
 end

data/spec/spec_helper.rb

@@ -63,7 +63,7 @@ module Matchers
   class ValidateWithLint
     def matches?(request)
       @request = request
-      Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html'}, []]}).call(@request.env)
+      Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]}).call(@request.env)
       true
     rescue Rack::Lint::LintError => e
       @message = e.message
@@ -71,7 +71,7 @@ module Matchers
     end
     
     def failure_message(negation=nil)
-      "should#{negation} validate with Rack Lint"
+      "should#{negation} validate with Rack Lint: #{@message}"
     end
 
     def negative_failure_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: macournoyer-thin
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 21:00:00 -08:00
+date: 2009-02-02 21:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency