puma 2.0.0.b7-java → 2.0.0-java

data/History.txt

@@ -1,3 +1,20 @@
+=== 2.0.0 / 2013-04-29
+
+RailsConf 2013 edition!
+
+* 2 doc changes:
+  * Start with rackup -s Puma, NOT rackup -s puma.
+  * Minor doc fixes in the README.md, Capistrano section
+
+* 2 bug fixes:
+  * Fix reading RACK_ENV properly. Fixes #234
+  * Make cap recipe handle tmp/sockets; fixes #228
+
+* 3 minor changes:
+  * Fix capistrano recipe
+  * Fix stdout/stderr logs to sync outputs
+  * allow binding to IPv6 addresses
+
 === 2.0.0.b7 / 2013-03-18
 
 * 5 minor enhancements:

data/README.md

@@ -51,7 +51,7 @@ Then start your server with the `rails` command:
 
 You can pass it as an option to `rackup`:
 
-    $ rackup -s puma
+    $ rackup -s Puma
 
 Alternatively, you can modify your `config.ru` to choose Puma by default, by adding the following as the first line:
 
@@ -146,7 +146,7 @@ If you want an easy way to manage multiple scripts at once check [tools/jungle](
 
 ## Capistrano deployment
 
-Puma has included Capistrano [deploy script](https://github.com/plentz/puma/blob/master/lib/puma/capistrano.rb), you just need require that:
+Puma has included Capistrano [deploy script](https://github.com/puma/puma/blob/master/lib/puma/capistrano.rb), you just need require that:
 
 config/deploy.rb
 
@@ -157,9 +157,9 @@ require 'puma/capistrano'
 and then
 
 ```bash
-$ bunde exec cap puma:start
-$ bunde exec cap puma:restart 
-$ bunde exec cap puma:stop
+$ bundle exec cap puma:start
+$ bundle exec cap puma:restart 
+$ bundle exec cap puma:stop
 ```
 
 

data/docs/nginx.md

@@ -53,7 +53,7 @@ server {
     # rewite the url to have explicit .html on the end
     # and then send it on its way to the next config rule.
     # if there is no file on the fs then it sets all the
-    # necessary headers and proxies to our upstream mongrels
+    # necessary headers and proxies to our upstream pumas
     if (-f $request_filename.html) {
       rewrite (.*) $1.html break;
     }
@@ -66,12 +66,7 @@ server {
 
   # Now this supposedly should work as it gets the filenames with querystrings that Rails provides.
   # BUT there's a chance it could break the ajax calls.
-  location ~* \.(ico|css|gif|jpe?g|png)(\?[0-9]+)?$ {
-     expires max;
-     break;
-  }
-
-  location ~ ^/javascripts/.*\.js(\?[0-9]+)?$ {
+  location ~* \.(ico|css|gif|jpe?g|png|js)(\?[0-9]+)?$ {
      expires max;
      break;
   }

data/lib/puma/binder.rb

@@ -163,6 +163,7 @@ module Puma
     # allow to accumulate before returning connection refused.
     #
     def add_tcp_listener(host, port, optimize_for_latency=true, backlog=1024)
+      host = host[1..-2] if host[0..0] == '['
       s = TCPServer.new(host, port)
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)

data/lib/puma/capistrano.rb

@@ -3,6 +3,11 @@ Capistrano::Configuration.instance.load do
   after 'deploy:start', 'puma:start'
   after 'deploy:restart', 'puma:restart'
 
+  # Ensure the tmp/sockets directory is created by the deploy:setup task and
+  # symlinked in by the deploy:update task. This is not handled by Capistrano
+  # v2 but is fixed in v3.
+  shared_children.push('tmp/sockets')
+
   _cset(:puma_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
   _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
   _cset(:puma_state) { "#{shared_path}/sockets/puma.state" }
@@ -17,12 +22,12 @@ Capistrano::Configuration.instance.load do
 
     desc 'Stop puma'
     task :stop, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S fetch(:puma_state) stop"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} stop"
     end
 
     desc 'Restart puma'
     task :restart, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S fetch(:puma_state) restart"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} restart"
     end
   end
 end

data/lib/puma/cli.rb

@@ -179,8 +179,7 @@ module Puma
         :binds => [],
         :workers => 0,
         :daemon => false,
-        :worker_boot => [],
-        :environment => "development"
+        :worker_boot => []
       }
 
       @parser = OptionParser.new do |o|
@@ -270,9 +269,6 @@ module Puma
 
         o.on "-w", "--workers COUNT",
                    "Activate cluster mode: How many worker processes to create" do |arg|
-          unsupported "-w not supported on JRuby and Windows",
-                      jruby? || windows?
-
           @options[:workers] = arg.to_i
         end
 
@@ -301,9 +297,12 @@ module Puma
       # Try the user option first, then the environment variable,
       # finally default to development
 
-      ENV['RACK_ENV'] = @options[:environment] ||
-                        ENV['RACK_ENV'] ||
-                        'development'
+      env = @options[:environment] ||
+                   ENV['RACK_ENV'] ||
+                     'development'
+
+      @options[:environment] = env
+      ENV['RACK_ENV'] = env
     end
 
     def delete_pidfile
@@ -346,6 +345,11 @@ module Puma
       Puma.cli_config = @config
 
       @config.load
+
+      if @options[:workers]
+        unsupported "worker mode not supported on JRuby and Windows",
+                    jruby? || windows?
+      end
     end
 
     def graceful_stop(server)
@@ -364,11 +368,13 @@ module Puma
       if stdout
         @io_redirected = true
         STDOUT.reopen stdout, (append ? "a" : "w")
+        STDOUT.sync = true
         STDOUT.puts "=== puma startup: #{Time.now} ==="
       end
 
       if stderr
         STDERR.reopen stderr, (append ? "a" : "w")
+        STDERR.sync = true
         STDERR.puts "=== puma startup: #{Time.now} ==="
       end
     end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b7".freeze
+    PUMA_VERSION = VERSION = "2.0.0".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.0.0.b7"
+  s.version = "2.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-03-19"
+  s.date = "2013-04-29"
   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"]

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: puma
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.0.0.b7
+  prerelease: 
+  version: 2.0.0
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-19 00:00:00 Z
+date: 2013-04-29 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
@@ -173,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: puma