puma 2.7.0 → 3.1.1

data/puma.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
   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.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. It's great for highly concurrent Ruby implementations such as Rubinius and JRuby as well as as providing process worker support to support CRuby well."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.files = `git ls-files`.split($/)
   s.homepage = "http://puma.io"
+  s.license = "BSD-3-Clause"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
@@ -35,18 +36,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
-      s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
-    s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<hoe>, ["~> 3.6"])

data/tools/jungle/init.d/README.md

@@ -26,12 +26,12 @@ Puma apps are held in /etc/puma.conf by default. It's mainly a CSV file and ever
 
 You can add an instance by editing the file or running the following command:
 
-    sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log
+    sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/log/puma.log
 
 The config and log paths are optional parameters and default to:
 
 * config: /path/to/app/*config/puma.rb*
-* log: /path/to/app/*config/puma.log*
+* log: /path/to/app/*log/puma.log*
 
 To remove an app, simply delete the line from the config file or run:
 

data/tools/jungle/init.d/puma

@@ -23,6 +23,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 CONFIG=/etc/puma.conf
 JUNGLE=`cat $CONFIG`
 RUNPUMA=/usr/local/bin/run-puma
+USE_LOCAL_BUNDLE=0
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -47,7 +48,8 @@ do_start() {
     if [ "$log_file" = "" ]; then
       log_file="$dir/log/puma.log"
     fi
-    do_start_one $dir $user $config_file $log_file
+    environment=`echo $i | cut -d , -f 5`
+    do_start_one $dir $user $config_file $log_file $environment
   done
 }
 
@@ -57,12 +59,12 @@ do_start_one() {
     PID=`cat $PIDFILE`
     # If the puma isn't running, run it, otherwise restart it.
     if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2 $3 $4
+      do_start_one_do $1 $2 $3 $4 $5
     else
       do_restart_one $1
     fi
   else
-    do_start_one_do $1 $2 $3 $4
+    do_start_one_do $1 $2 $3 $4 $5
   fi
 }
 
@@ -70,6 +72,14 @@ do_start_one_do() {
   log_daemon_msg "--> Woke up puma $1"
   log_daemon_msg "user $2"
   log_daemon_msg "log to $4"
+
+  if [ ! -z "$5" ]; then
+    for e in $(echo "$5" | tr ';' '\n'); do
+        log_daemon_msg "environment $e"
+        v=${e%%\=*} ;  eval "$e" ; export $v
+    done
+  fi
+
   start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
 }
 
@@ -96,7 +106,11 @@ do_stop_one() {
       log_daemon_msg "---> Puma $1 isn't running."
     else
       log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
-      pumactl --state $STATEFILE stop
+      if [ "$USE_LOCAL_BUNDLE" -eq 1 ]; then
+        cd $1 && bundle exec pumactl --state $STATEFILE stop
+      else
+        pumactl --state $STATEFILE stop
+      fi
       # Many daemons don't delete their pidfiles when they exit.
       rm -f $PIDFILE $STATEFILE
     fi
@@ -126,7 +140,11 @@ do_restart_one() {
   
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to restart puma $1"
-    pumactl --state $dir/tmp/puma/state restart
+    if [ "$USE_LOCAL_BUNDLE" -eq 1 ]; then
+      cd $1 && bundle exec pumactl --state $dir/tmp/puma/state restart
+    else
+      pumactl --state $dir/tmp/puma/state restart
+    fi
     # kill -s USR2 `cat $PIDFILE`
     # TODO Check if process exist
   else
@@ -140,7 +158,8 @@ do_restart_one() {
     if [ "$log_file" = "" ]; then
       log_file="$dir/log/puma.log"
     fi
-    do_start_one $dir $user $config_file $log_file
+    environment=`echo $i | cut -d , -f 5`
+    do_start_one $dir $user $config_file $log_file $environment
   fi
 	return 0
 }
@@ -165,7 +184,11 @@ do_status_one() {
   
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to status puma $1"
-    pumactl --state $dir/tmp/puma/state stats
+    if [ "$USE_LOCAL_BUNDLE" -eq 1 ]; then
+      cd $1 && bundle exec pumactl --state $dir/tmp/puma/state stats
+    else
+      pumactl --state $dir/tmp/puma/state stats
+    fi
     # kill -s USR2 `cat $PIDFILE`
     # TODO Check if process exist
   else
@@ -209,6 +232,11 @@ do_add() {
     str="$str,$4"
   fi
 
+  # Environment variables
+  if [ "$5" != "" ]; then
+    str="$str,$5"
+  fi
+
   # Add it to the jungle 
   echo $str >> $CONFIG
   log_daemon_msg "Added a Puma to the jungle: $str. You still have to start it though."
@@ -226,6 +254,40 @@ do_remove() {
   fi
 }
 
+config_bundler() {
+  HOME="$(eval echo ~$(id -un))"
+  if [ -d "/usr/local/rbenv/bin" ]; then
+    PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
+    eval "$(rbenv init -)"
+    USE_LOCAL_BUNDLE=1
+    return 0
+  elif [ -d "$HOME/.rbenv/bin" ]; then
+    PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
+    eval "$(rbenv init -)"
+    USE_LOCAL_BUNDLE=1
+    return 0
+  # TODO: test rvm
+  # 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"
+  # TODO: don't know what to do with chruby
+  # 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
+
+  return 1
+}
+
+config_bundler
+
 case "$1" in
   start)
     [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

data/tools/jungle/upstart/puma.conf

@@ -34,12 +34,18 @@ script
 # respawn as bash so we can source in rbenv/rvm
 # quoted heredoc to tell /bin/sh not to interpret
 # variables
+
+# source ENV variables manually as Upstart doesn't, eg:
+#. /etc/environment
+
 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))"
 
-  if [ -d "$HOME/.rbenv/bin" ]; then
-    export PATH="$HOME/.rbenv/bin:$PATH"
+  if [ -d "/usr/local/rbenv/bin" ]; then
+    export PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
+  elif [ -d "$HOME/.rbenv/bin" ]; then
+    export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
   elif [ -f  /etc/profile.d/rvm.sh ]; then
     source /etc/profile.d/rvm.sh
   elif [ -f /usr/local/rvm/scripts/rvm ]; then

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '4.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
 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
@@ -84,27 +84,30 @@ executables:
 extensions:
 - ext/puma_http11/extconf.rb
 extra_rdoc_files:
+- DEPLOYMENT.md
 - History.txt
 - Manifest.txt
 - README.md
 - docs/config.md
 - docs/nginx.md
+- docs/signals.md
 - tools/jungle/README.md
 - tools/jungle/init.d/README.md
 - tools/jungle/upstart/README.md
 files:
-- COPYING
+- DEPLOYMENT.md
 - Gemfile
 - History.txt
 - LICENSE
 - Manifest.txt
 - README.md
 - Rakefile
-- TODO
 - bin/puma
+- bin/puma-wild
 - bin/pumactl
 - docs/config.md
 - docs/nginx.md
+- docs/signals.md
 - ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
@@ -127,25 +130,36 @@ files:
 - lib/puma/cli.rb
 - lib/puma/client.rb
 - lib/puma/cluster.rb
+- lib/puma/commonlogger.rb
 - lib/puma/compat.rb
 - lib/puma/configuration.rb
 - lib/puma/const.rb
 - lib/puma/control_cli.rb
+- lib/puma/convenient.rb
 - lib/puma/daemon_ext.rb
 - lib/puma/delegation.rb
 - lib/puma/detect.rb
+- lib/puma/dsl.rb
 - lib/puma/events.rb
 - lib/puma/io_buffer.rb
 - lib/puma/java_io_buffer.rb
 - lib/puma/jruby_restart.rb
+- lib/puma/launcher.rb
 - lib/puma/minissl.rb
 - lib/puma/null_io.rb
+- lib/puma/plugin.rb
+- lib/puma/plugin/tmp_restart.rb
+- lib/puma/rack/backports/uri/common_18.rb
+- lib/puma/rack/backports/uri/common_192.rb
+- lib/puma/rack/backports/uri/common_193.rb
+- lib/puma/rack/builder.rb
+- lib/puma/rack/urlmap.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/state_file.rb
 - lib/puma/tcp_logger.rb
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
@@ -159,65 +173,31 @@ files:
 - 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
 homepage: http://puma.io
 licenses:
-- MIT
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: puma
-rubygems_version: 2.1.11
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
   Ruby/Rack applications
-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
+test_files: []