puma 2.4.1 → 2.5.0

data/History.txt

@@ -1,3 +1,25 @@
+=== 2.5.0 / 2013-08-08
+
+* 2 minor features:
+  * Allow configuring pumactl with config.rb
+  * make `pumactl restart` start puma if not running
+
+* 6 bug fixes:
+  * Autodetect ruby managers and home directory in upstart script
+  * Convert header values to string before sending.
+  * Correctly report phased-restart availability
+  * Fix pidfile creation/deletion race on jruby daemonization
+  * Use integers when comparing thread counts
+  * Fix typo in using lopez express (raw tcp) mode
+
+* 6 misc changes:
+  * Fix typo in phased-restart response
+  * Uncomment setuid/setgid by default in upstart
+  * Use Puma::Const::PUMA_VERSION in gemspec
+  * Update upstart comments to reflect new commandline
+  * Remove obsolete pumactl instructions; refer to pumactl for details
+  * Make Bundler used puma.gemspec version agnostic
+
 === 2.4.1 / 2013-08-07
 
 * 1 experimental feature:

data/README.md

@@ -180,17 +180,7 @@ Because of various platforms not being implement certain things, the following d
 
 ## pumactl
 
-If you start puma with `-S some/path` then you can pass that same path to the `pumactl` program to control your server. For instance:
-
-    $ pumactl -S some/path command
-
-or
-
-    $ pumactl -C url -T token command
-
-will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the control/status app described above.
-
-Allowed commands: `status`, `restart`, `halt`, `stop`
+`pumactl` is a simple CLI frontend to the control/status app described above.  Please refer to `pumactl --help` for available commands.
 
 ## Managing multiple Pumas / init.d / upstart scripts
 

data/Rakefile

@@ -75,16 +75,6 @@ task "changelog" do
   puts
 end
 
-# puma.gemspec
-
-file "#{HOE.spec.name}.gemspec" => ['Rakefile', "lib/puma/const.rb"] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'wb') { |f| f.write HOE.spec.to_ruby }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{HOE.spec.name}.gemspec"]
-
 # generate extension code using Ragel (C and Java)
 desc "Generate extension code (C and Java) using Ragel"
 task :ragel

data/lib/puma/app/status.rb

@@ -43,7 +43,7 @@ module Puma
 
         when /\/phased-restart$/
           if !@cli.phased_restart
-            return rack_response(404, '{ "error": "phased resart not available" }')
+            return rack_response(404, '{ "error": "phased restart not available" }')
           else
             return rack_response(200, OK_STATUS)
           end

data/lib/puma/cli.rb

@@ -503,8 +503,11 @@ module Puma
     end
 
     def phased_restart
-      return restart unless @runner.respond_to? :phased_restart
-      return restart unless @runner.phased_restart
+      unless @runner.respond_to?(:phased_restart) and @runner.phased_restart
+        log "* phased-restart called but not available, restarting normally."
+        return restart
+      end
+      true
     end
 
     def stats

data/lib/puma/configuration.rb

@@ -266,8 +266,10 @@ module Puma
       # requests and +max+ the maximum.
       #
       def threads(min, max)
+        min = Integer(min)
+        max = Integer(max)
         if min > max
-          raise "The minimum number of threads must be less than the max"
+          raise "The minimum (#{min}) number of threads must be less than the max (#{max})"
         end
 
         @options[:min_threads] = min

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.4.1".freeze
-    CODE_NAME = "Crunchy Munchy Lunchy"
+    PUMA_VERSION = VERSION = "2.5.0".freeze
+    CODE_NAME = "Astronaut Shoelaces"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -18,12 +18,12 @@ module Puma
       @stdout = stdout
       @stderr = stderr
       @options = {}
-      
+
       opts = OptionParser.new do |o|
-        o.banner = "Usage: pumactl (-p PID | -P pidfile | -S status_file | -C url -T token) (#{COMMANDS.join("|")})"
+        o.banner = "Usage: pumactl (-p PID | -P pidfile | -S status_file | -C url -T token | -F config.rb) (#{COMMANDS.join("|")})"
 
         o.on "-S", "--state PATH", "Where the state file to use is" do |arg|
-          @options[:status_path] = arg
+          @options[:state] = arg
         end
 
         o.on "-Q", "--quiet", "Not display messages" do |arg|
@@ -31,7 +31,7 @@ module Puma
         end
 
         o.on "-P", "--pidfile PATH", "Pid file" do |arg|
-          @options[:pid_file] = arg
+          @options[:pidfile] = arg
         end
 
         o.on "-p", "--pid PID", "Pid" do |arg|
@@ -46,6 +46,10 @@ module Puma
           @options[:control_auth_token] = arg
         end
 
+        o.on "-F", "--config-file PATH", "Puma config script" do |arg|
+          @options[:config_file] = arg
+        end
+
         o.on_tail("-H", "--help", "Show this message") do
           @stdout.puts o
           exit
@@ -58,35 +62,37 @@ module Puma
       end
 
       opts.order!(argv) { |a| opts.terminate a }
-      
+
       command = argv.shift
       @options[:command] = command if command
 
+      Puma::Configuration.new(@options).load if @options[:config_file]
+
       # check present of command
       unless @options[:command]
         raise "Available commands: #{COMMANDS.join(", ")}"
       end
 
       unless COMMANDS.include? @options[:command]
-        raise "Invalid command: #{@options[:command]}" 
+        raise "Invalid command: #{@options[:command]}"
       end
 
     rescue => e
       @stdout.puts e.message
       exit 1
     end
-    
+
     def message(msg)
       @stdout.puts msg unless @options[:quiet_flag]
     end
 
     def prepare_configuration
-      if @options.has_key? :status_path
-        unless File.exist? @options[:status_path]
-          raise "Status file not found: #{@options[:status_path]}"
+      if @options.has_key? :state
+        unless File.exist? @options[:state]
+          raise "Status file not found: #{@options[:state]}"
         end
 
-        status = YAML.load File.read(@options[:status_path])
+        status = YAML.load File.read(@options[:state])
 
         if status.kind_of?(Hash) && status.has_key?("config")
 
@@ -105,18 +111,18 @@ module Puma
           # get pid
           @options[:pid] = status["pid"].to_i
         else
-          raise "Invalid status file: #{@options[:status_path]}"
+          raise "Invalid status file: #{@options[:state]}"
         end
 
-      elsif @options.has_key? :pid_file
+      elsif @options.has_key? :pidfile
         # get pid from pid_file
-        @options[:pid] = File.open(@options[:pid_file]).gets.to_i
+        @options[:pid] = File.open(@options[:pidfile]).gets.to_i
       end
     end
 
     def send_request
       uri = URI.parse @options[:control_url]
-      
+
       # create server object by scheme
       @server = case uri.scheme
                 when "tcp"
@@ -161,7 +167,7 @@ module Puma
         message "Command #{@options[:command]} sent success"
         message response.last if @options[:command] == "stats"
       end
-      
+
       @server.close
     end
 
@@ -173,7 +179,12 @@ module Puma
       begin
         Process.getpgid pid
       rescue SystemCallError
-        raise "No pid '#{pid}' found"
+        if @options[:command] == "restart"
+          @options.delete(:command)
+          start
+        else
+          raise "No pid '#{pid}' found"
+        end
       end
 
       case @options[:command]
@@ -202,23 +213,10 @@ module Puma
     end
 
     def run
-      if @options[:command] == "start"
-        require 'puma/cli'
-
-        run_args = @argv
-        if path = @options[:status_path]
-          run_args = ["-S", path] + run_args
-        end
-
-        events = Puma::Events.new @stdout, @stderr
-
-        cli = Puma::CLI.new run_args, events
-        cli.run
-        return
-      end
+      start if @options[:command] == "start"
 
       prepare_configuration
-    
+
       if is_windows?
         send_request
       else
@@ -229,5 +227,25 @@ module Puma
       message e.message
       exit 1
     end
+
+  private
+    def start
+      require 'puma/cli'
+
+      run_args = @argv
+
+      if path = @options[:state]
+        run_args = ["-S", path] + run_args
+      end
+
+      if path = @options[:config_file]
+        run_args = ["-C", path] + run_args
+      end
+
+      events = Puma::Events.new @stdout, @stderr
+
+      cli = Puma::CLI.new run_args, events
+      cli.run
+    end
   end
-end  
+end

data/lib/puma/server.rb

@@ -160,7 +160,7 @@ module Puma
         @thread = Thread.new { handle_servers_lopez_mode }
         return @thread
       else
-        handle_lopez_servers
+        handle_servers_lopez_mode
       end
     end
 
@@ -549,8 +549,12 @@ module Puma
             next
           end
 
-          vs.split(NEWLINE).each do |v|
-            lines.append k, colon, v, line_ending
+          if vs.respond_to?(:to_s)
+            vs.to_s.split(NEWLINE).each do |v|
+              lines.append k, colon, v, line_ending
+            end
+          else
+            lines.append k, colon, line_ending
           end
         end
 

data/lib/puma/single.rb

@@ -52,7 +52,11 @@ module Puma
 
           Signal.trap "SIGUSR2" do
             log "* Started new process #{pid} as daemon..."
-            exit
+
+            # Must use exit! so we don't unwind and run the ensures
+            # that will be run by the new child (such as deleting the
+            # pidfile)
+            exit!
           end
 
           Signal.trap "SIGCHLD" do

data/puma.gemspec

@@ -1,18 +1,20 @@
 # -*- encoding: utf-8 -*-
 
+# This is only used when puma is a git dep from Bundler, so it's a little
+# weird.
+
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.4.1"
+  s.version = Puma::Const::PUMA_VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-08-07"
+  s.date = `git log --pretty="%ai" -n 1`.split(" ").first
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/cluster.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/runner.rb", "lib/puma/server.rb", "lib/puma/single.rb", "lib/puma/tcp_logger.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "tools/trickletest.rb", "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_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_tcp_rack.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.files = `git ls-files`.split($/)
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
@@ -20,7 +22,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.25"
   s.summary = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack 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_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_tcp_rack.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = s.files.grep(/^test/)
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/tools/jungle/upstart/puma.conf

@@ -7,9 +7,9 @@
 # See workers.conf for how to manage all Puma instances at once.
 #
 # Save this config as /etc/init/puma.conf then manage puma with:
-#   sudo start puma index=0
-#   sudo stop puma index=0
-#   sudo status puma index=0
+#   sudo start puma app=PATH_TO_APP
+#   sudo stop puma app=PATH_TO_APP
+#   sudo status puma app=PATH_TO_APP
 #
 # or use the service command:
 #   sudo service puma {start,stop,restart,status}
@@ -20,9 +20,9 @@ description "Puma Background Worker"
 # no "start on", we don't want to automatically start
 stop on (stopping puma-manager or runlevel [06])
 
-# change apps to match your deployment user if you want to use this as a less privileged user (recommended!) 
-# setuid apps 
-# setgid apps 
+# change apps to match your deployment user if you want to use this as a less privileged user (recommended!)
+setuid apps
+setgid apps
 
 respawn
 respawn limit 3 30
@@ -32,21 +32,33 @@ instance ${app}
 script
 # this script runs in /bin/sh by default
 # respawn as bash so we can source in rbenv/rvm
-exec /bin/bash <<EOT
-  export HOME=/home/apps
-
-  # Pick your poison :) Or none if you're using a system wide installed Ruby.
-  # rbenv
-  # source /home/apps/.bash_profile
-  # OR
-  # source /home/apps/.profile
-  #
-  # rvm
-  # source /home/apps/.rvm/scripts/rvm
+# quoted heredoc to tell /bin/sh not to interpret
+# variables
+exec /bin/bash <<'EOT'
+  # set HOME to the setuid user's home, there doesn't seem to be a better, portable way
+  export HOME="$(eval echo ~$(id -un))"
+
+  cd $app
+
+  if [ -d "$HOME/.rbenv/bin" ]; then
+    export PATH="$HOME/.rbenv/bin:$PATH"
+  elif [ -f  /etc/profile.d/rvm.sh ]; then
+    source /etc/profile.d/rvm.sh
+  elif [ -f /usr/local/rvm/scripts/rvm ]; then
+    source /etc/profile.d/rvm.sh
+  elif [ -f "$HOME/.rvm/scripts/rvm" ]; then
+    source "$HOME/.rvm/scripts/rvm"
+  elif [ -f /usr/local/share/chruby/chruby.sh ]; then
+    source /usr/local/share/chruby/chruby.sh
+    if [ -f /usr/local/share/chruby/auto.sh ]; then
+      source /usr/local/share/chruby/auto.sh
+    fi
+    # if you aren't using auto, set your version here
+    # chruby 2.0.0
+  fi
 
   logger -t puma "Starting server: $app"
 
-  cd $app
-  exec bundle exec puma -C config/puma.rb
+  exec bundle exec puma -C config/puma/production.rb
 EOT
-end script
+end script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack