puma 1.1.1 → 1.2.0

data/History.txt

@@ -1,69 +1,44 @@
-=== 1.2.0.beta.1 / 2010-07-??
+=== 1.2.0 / 2012-04-11
 
-Improvements:
+ 1 major feature:
 
-* Ruby 1.9 early compatbility: Merged commits form Eric Wong and Matt Aimonetti.
-* Better RubyGems support thanks to added env she-bang to mongrel_rails executable.
-* Smartly load http11 extension using fat-binary approach.
-* Better detection of Windows platform (usage of RbConfig::CONFIG instead of RUBY_PLATFORM)
+   * When possible, the internal restart does a "hot restart" meaning
+     the server sockets remains open, so no connections are lost.
 
-Bugfixes:
+ 1 minor feature:
 
-* Fixed proper version reporting under 1.9
-* Consider MinGW as valid Windows platform.
-* Properly drop PID when daemonizing (EngineYard patched 1.1.5.1).
+    * More helpful fallback error message
 
-Reorganization:
+ 6 bug fixes:
 
-* Rake task project reorganization and reformat using Hoe.
-* Compile extension using rake-compiler
-* Upgraded http11_parser to work with Ragel 6.2
-* Deprecated obsolete Windows service example scripts (from 2006!)
-* Relocate Http11 JRuby extension to share http11 C extension folder and name.
+    * Pass the proper args to unknown_error. Fixes #54, #58
+    * Stop the control server before restarting. Fixes #61
+    * Fix reporting https only on a true SSL connection
+    * Set the default content type to 'text/plain'. Fixes #63
+    * Use REUSEADDR. Fixes #60
+    * Shutdown gracefull on SIGTERM. Fixes #53
 
-=== 1.1.5 / 2008-05-22
+ 2 new contributers:
 
-* Fix bug where num_processors is not actually set from mongrel_rails.
+   * Seamus Abshere
+   * Steve Richert
 
+=== 1.1.1 / 2012-03-30
 
-=== 1.1.4 / 2008-02-29
+ 1 bugfix:
 
-* Fix camping handler. Correct treatment of @throttle parameter.
+   * Include puma/compat.rb in the gem (oops!)
 
+=== 1.1.0 / 2012-03-30
 
-=== 1.1.3 / 2007-12-29
+ 1 bugfix:
 
-* Fix security flaw of DirHandler; reported on mailing list.
+   * Make sure that the unix socket has the perms 0777 by default
 
+ 1 minor feature:
 
-=== 1.1.2 /  2007-12-15
+   * Add umask param to the unix:// bind to set the umask
 
-* Fix worker termination bug; fix JRuby 1.0.3 load order issue; fix require issue on systems without Rubygems.
+=== 1.0.0 / 2012-03-29
 
-
-=== 1.1.1 / 2007-11-12
-
-* Fix mongrel_rails restart bug; fix bug with Rack status codes.
-
-
-=== 1.1 / 2007-11-01
-
-* Pure Ruby URIClassifier.
-* More modular architecture.
-* JRuby support.
-* Move C URIClassifier into mongrel_experimental project.
-
-
-=== 1.0.4 / 2007-10-29
-
-* Backport fixes for versioning inconsistency, mongrel_rails bug, and DirHandler bug.
-
-
-=== 1.0.3
-
-* Fix user-switching bug; make people upgrade to the latest from the RC.
-
-
-=== 1.0.2
-
-* Signed gem; many minor bugfixes and patches.
+* Released!

data/README.md

@@ -1,5 +1,7 @@
 # Puma: A Ruby Web Server Built For Concurrency
 
+[![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma)
+
 ## Description
 
 Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.

data/Rakefile

@@ -9,6 +9,7 @@ Hoe.plugin :git
 HOE = Hoe.spec "puma" do
   self.rubyforge_name = 'puma'
   self.readme_file    = "README.md"
+  self.urls = %w!http://puma.io http://github.com/puma/puma!
 
   developer 'Evan Phoenix', 'evan@phx.io'
 

data/bin/puma

@@ -7,10 +7,4 @@ require 'puma/cli'
 
 cli = Puma::CLI.new ARGV
 
-begin
-  cli.run
-rescue => e
-  raise e if $DEBUG
-  STDERR.puts e.message
-  exit 1
-end
+cli.run

data/lib/puma/app/status.rb

@@ -30,7 +30,8 @@ module Puma
 
         when "/restart"
           if @cli and @cli.restart_on_stop!
-            @server.stop
+            @server.begin_restart
+
             return [200, {}, ['{ "status": "ok" }']]
           else
             return [200, {}, ['{ "status": "not configured" }']]

data/lib/puma/cli.rb

@@ -33,9 +33,26 @@ module Puma
       @restart = false
       @temp_status_path = nil
 
+      @listeners = []
+
       setup_options
 
       generate_restart_data
+
+      @inherited_fds = {}
+      remove = []
+
+      ENV.each do |k,v|
+        if k =~ /PUMA_INHERIT_\d+/
+          fd, url = v.split(":", 2)
+          @inherited_fds[url] = fd.to_i
+          remove << k
+        end
+      end
+
+      remove.each do |k|
+        ENV.delete k
+      end
     end
 
     def restart_on_stop!
@@ -62,6 +79,8 @@ module Puma
 
       @restart_dir ||= Dir.pwd
 
+      @original_argv = ARGV.dup
+
       if defined? Rubinius::OS_ARGV
         @restart_argv = Rubinius::OS_ARGV
       else
@@ -72,20 +91,47 @@ module Puma
         # picked up in PATH.
         #
         if File.exists?($0)
-          @restart_argv = [Gem.ruby, $0] + ARGV
+          arg0 = [Gem.ruby, $0]
         else
-          @restart_argv = [Gem.ruby, "-S", $0] + ARGV
+          arg0 = [Gem.ruby, "-S", $0]
         end
+
+        @restart_argv = arg0 + ARGV
       end
     end
 
     def restart!
+      @options[:on_restart].each do |blk|
+        blk.call self
+      end
+
       if IS_JRUBY
+        @listeners.each_with_index do |(str,io),i|
+          io.close
+
+          # We have to unlink a unix socket path that's not being used
+          uri = URI.parse str
+          if uri.scheme == "unix"
+            path = "#{uri.host}#{uri.path}"
+            File.unlink path
+          end
+        end
+
         require 'puma/jruby_restart'
         JRubyRestart.chdir_exec(@restart_dir, Gem.ruby, *@restart_argv)
       else
+        @listeners.each_with_index do |(l,io),i|
+          ENV["PUMA_INHERIT_#{i}"] = "#{io.to_i}:#{l}"
+        end
+
+        if cmd = @options[:restart_cmd]
+          argv = cmd.split(' ') + @original_argv
+        else
+          argv = @restart_argv
+        end
+
         Dir.chdir @restart_dir
-        Kernel.exec(*@restart_argv)
+        Kernel.exec(*argv)
       end
     end
 
@@ -163,6 +209,11 @@ module Puma
           end
         end
 
+        o.on "--restart-cmd CMD",
+             "The puma command to run during a hot restart",
+             "Default: inferred" do |cmd|
+          @options[:restart_cmd] = cmd
+        end
       end
 
       @parser.banner = "puma <options> <rackup file>"
@@ -190,7 +241,10 @@ module Puma
       if path = @options[:state]
         state = { "pid" => Process.pid }
 
-        state["config"] = @config
+        cfg = @config.dup
+        cfg.options.delete :on_restart
+
+        state["config"] = cfg
 
         File.open(path, "w") do |f|
           f.write state.to_yaml
@@ -212,6 +266,12 @@ module Puma
       @temp_status_path = @options[:control_path_temp]
     end
 
+    def graceful_stop(server)
+      log " - Gracefully stopping, waiting for requests to finish"
+      server.stop(true)
+      log " - Goodbye!"
+    end
+
     # Parse the options, load the rackup, start the server and wait
     # for it to finish.
     #
@@ -237,25 +297,38 @@ module Puma
         uri = URI.parse str
         case uri.scheme
         when "tcp"
-          log "* Listening on #{str}"
-          server.add_tcp_listener uri.host, uri.port
+          if fd = @inherited_fds.delete(str)
+            log "* Inherited #{str}"
+            io = server.inherit_tcp_listener uri.host, uri.port, fd
+          else
+            log "* Listening on #{str}"
+            io = server.add_tcp_listener uri.host, uri.port
+          end
+
+          @listeners << [str, io]
         when "unix"
-          log "* Listening on #{str}"
-          path = "#{uri.host}#{uri.path}"
+          if fd = @inherited_fds.delete(str)
+            log "* Inherited #{str}"
+            io = server.inherit_unix_listener uri.path, fd
+          else
+            log "* Listening on #{str}"
+            path = "#{uri.host}#{uri.path}"
 
-          umask = nil
+            umask = nil
 
-          if uri.query
-            params = Rack::Utils.parse_query uri.query
-            if u = params['umask']
-              # Use Integer() to respect the 0 prefix as octal
-              umask = Integer(u)
+            if uri.query
+              params = Rack::Utils.parse_query uri.query
+              if u = params['umask']
+                # Use Integer() to respect the 0 prefix as octal
+                umask = Integer(u)
+              end
             end
+
+            io = server.add_unix_listener path, umask
           end
 
-          server.add_unix_listener path, umask
+          @listeners << [str, io]
         when "ssl"
-          log "* Listening on #{str}"
           params = Rack::Utils.parse_query uri.query
           require 'openssl'
 
@@ -274,12 +347,38 @@ module Puma
 
           ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-          server.add_ssl_listener uri.host, uri.port, ctx
+          if fd = @inherited_fds.delete(str)
+            log "* Inherited #{str}"
+            io = server.inherited_ssl_listener fd, ctx
+          else
+            log "* Listening on #{str}"
+            io = server.add_ssl_listener uri.host, uri.port, ctx
+          end
+
+          @listeners << [str, io]
         else
           error "Invalid URI: #{str}"
         end
       end
 
+      # If we inherited fds but didn't use them (because of a
+      # configuration change), then be sure to close them.
+      @inherited_fds.each do |str, fd|
+        log "* Closing unused inherited connection: #{str}"
+
+        begin
+          IO.for_fd(fd).close
+        rescue SystemCallError
+        end
+
+        # We have to unlink a unix socket path that's not being used
+        uri = URI.parse str
+        if uri.scheme == "unix"
+          path = "#{uri.host}#{uri.path}"
+          File.unlink path
+        end
+      end
+
       @server = server
 
       if str = @options[:control_url]
@@ -314,20 +413,28 @@ module Puma
         @status = status
       end
 
+      Signal.trap "SIGUSR2" do
+        @restart = true
+        server.begin_restart
+      end
+
+      Signal.trap "SIGTERM" do
+        graceful_stop server
+      end
+
       log "Use Ctrl-C to stop"
 
       begin
         server.run.join
       rescue Interrupt
-        log " - Gracefully stopping, waiting for requests to finish"
-        server.stop(true)
-        log " - Goodbye!"
+        graceful_stop server
       end
 
       File.unlink @temp_status_path if @temp_status_path
 
       if @restart
         log "* Restarting..."
+        @status.stop true
         restart!
       end
     end

data/lib/puma/configuration.rb

@@ -8,10 +8,15 @@ module Puma
     def initialize(options)
       @options = options
       @options[:binds] ||= []
+      @options[:on_restart] ||= []
     end
 
     attr_reader :options
 
+    def initialize_copy(other)
+      @options = @options.dup
+    end
+
     def load
       if path = @options[:config_file]
         DSL.new(@options)._load_from path
@@ -150,6 +155,15 @@ module Puma
         @options[:binds] << url
       end
 
+      # Code to run before doing a restart. This code should
+      # close logfiles, database connections, etc.
+      #
+      # This can be called multiple times to add code each time.
+      #
+      def on_restart(&blk)
+        @options[:on_restart] << blk
+      end
+
       # Store the pid of the server in the file at +path+.
       def pidfile(path)
         @options[:pidfile] = path

data/lib/puma/const.rb

@@ -75,7 +75,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "1.1.1".freeze
+    PUMA_VERSION = VERSION = "1.2.0".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 
@@ -133,6 +133,7 @@ module Puma
 
     STOP_COMMAND = "?".freeze
     HALT_COMMAND = "!".freeze
+    RESTART_COMMAND = "R".freeze
 
     RACK_INPUT = "rack.input".freeze
     RACK_URL_SCHEME = "rack.url_scheme".freeze

data/lib/puma/server.rb

@@ -63,13 +63,20 @@ module Puma
         "rack.multiprocess".freeze => false,
         "rack.run_once".freeze => true,
         "SCRIPT_NAME".freeze => "",
-        "CONTENT_TYPE".freeze => "",
+
+        # Rack blows up if this is an empty string, and Rack::Lint
+        # blows up if it's nil. So 'text/plain' seems like the most
+        # sensible default value.
+        "CONTENT_TYPE".freeze => "text/plain",
+
         "QUERY_STRING".freeze => "",
         SERVER_PROTOCOL => HTTP_11,
         SERVER_SOFTWARE => PUMA_VERSION,
         GATEWAY_INTERFACE => CGI_VER
       }
 
+      @envs = {}
+
       ENV['RACK_ENV'] ||= "development"
     end
 
@@ -107,8 +114,16 @@ module Puma
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       end
+      s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
       s.listen backlog
       @ios << s
+      s
+    end
+
+    def inherit_tcp_listener(host, port, fd)
+      s = TCPServer.for_fd(fd)
+      @ios << s
+      s
     end
 
     def add_ssl_listener(host, port, ctx, optimize_for_latency=true, backlog=1024)
@@ -116,9 +131,21 @@ module Puma
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       end
+      s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
       s.listen backlog
-      @proto_env[HTTPS_KEY] = HTTPS
+
+      env = @proto_env.dup
+      env[HTTPS_KEY] = HTTPS
+      @envs[s] = env
+
+      @ios << OpenSSL::SSL::SSLServer.new(s, ctx)
+      s
+    end
+
+    def inherited_ssl_listener(fd, ctx)
+      s = TCPServer.for_fd(fd)
       @ios << OpenSSL::SSL::SSLServer.new(s, ctx)
+      s
     end
 
     # Tell the server to listen on +path+ as a UNIX domain socket.
@@ -131,10 +158,22 @@ module Puma
 
       begin
         old_mask = File.umask(umask)
-        @ios << UNIXServer.new(path)
+        s = UNIXServer.new(path)
+        @ios << s
       ensure
         File.umask old_mask
       end
+
+      s
+    end
+
+    def inherit_unix_listener(path, fd)
+      @unix_paths << path
+
+      s = UNIXServer.for_fd fd
+      @ios << s
+
+      s
     end
 
     def backlog
@@ -153,8 +192,8 @@ module Puma
 
       @status = :run
 
-      @thread_pool = ThreadPool.new(@min_threads, @max_threads) do |client|
-        process_client(client)
+      @thread_pool = ThreadPool.new(@min_threads, @max_threads) do |client, env|
+        process_client(client, env)
       end
 
       if @auto_trim_time
@@ -174,7 +213,7 @@ module Puma
                 if sock == check
                   break if handle_check
                 else
-                  pool << sock.accept
+                  pool << [sock.accept, @envs.fetch(sock, @proto_env)]
                 end
               end
             rescue Errno::ECONNABORTED
@@ -187,8 +226,10 @@ module Puma
 
           graceful_shutdown if @status == :stop
         ensure
-          @ios.each { |i| i.close }
-          @unix_paths.each { |i| File.unlink i }
+          unless @status == :restart
+            @ios.each { |i| i.close }
+            @unix_paths.each { |i| File.unlink i }
+          end
         end
       end
 
@@ -206,6 +247,9 @@ module Puma
       when HALT_COMMAND
         @status = :halt
         return true
+      when RESTART_COMMAND
+        @status = :restart
+        return true
       end
 
       return false
@@ -217,7 +261,7 @@ module Puma
     # indicates that it supports keep alive, wait for another request before
     # returning.
     #
-    def process_client(client)
+    def process_client(client, proto_env)
       parser = HttpParser.new
       close_socket = true
 
@@ -225,7 +269,7 @@ module Puma
         while true
           parser.reset
 
-          env = @proto_env.dup
+          env = proto_env.dup
           data = client.readpartial(CHUNK_SIZE)
           nparsed = 0
 
@@ -286,7 +330,7 @@ module Puma
 
       # Server error
       rescue StandardError => e
-        @events.unknown_error self, env, e, "Read"
+        @events.unknown_error self, e, "Read"
 
       ensure
         begin
@@ -294,7 +338,7 @@ module Puma
         rescue IOError, SystemCallError
           # Already closed
         rescue StandardError => e
-          @events.unknown_error self, env, e, "Client"
+          @events.unknown_error self, e, "Client"
         end
       end
     end
@@ -560,7 +604,7 @@ module Puma
     # A fallback rack response if +@app+ raises as exception.
     #
     def lowlevel_error(e)
-      [500, {}, ["No application configured"]]
+      [500, {}, ["Puma caught this error:\n#{e.backtrace.join("\n")}"]]
     end
 
     # Wait for all outstanding requests to finish.
@@ -585,5 +629,10 @@ module Puma
 
       @thread.join if @thread && sync
     end
+
+    def begin_restart
+      @persistent_wakeup.close
+      @notify << RESTART_COMMAND
+    end
   end
 end

data/puma.gemspec

@@ -2,22 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-03-31"
+  s.date = "2012-04-11"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
   s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
+  s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.21"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
   s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
@@ -26,19 +27,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
-      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
-      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
-    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.14"])
+    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puma
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -33,34 +33,34 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 19
         segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: rake-compiler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 63
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 7
         segments: 
-        - 2
-        - 14
-        version: "2.14"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id004
 description: |-
@@ -163,7 +163,7 @@ files:
 - test/test_ws.rb
 - test/testhelp.rb
 - tools/trickletest.rb
-homepage: 
+homepage: http://puma.io
 licenses: []
 
 post_install_message: 
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puma
-rubygems_version: 1.8.18
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications