puma 3.6.0 → 3.12.0

data/tools/jungle/init.d/run-puma

@@ -8,7 +8,11 @@ if [ -d "$HOME/.rbenv/bin" ]; then
 elif [ -d "/usr/local/rbenv/bin" ]; then
   PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
   eval "$(rbenv init -)"
+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"
 fi
 
 app=$1; config=$2; log=$3;
-cd $app && exec bundle exec puma -C $config 2>&1 >> $log
+cd $app && exec bundle exec puma -C $config >> $log 2>&1

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

@@ -0,0 +1,74 @@
+# Puma as a service using rc.d
+
+Manage multilpe Puma servers as services on one box using FreeBSD's rc.d service.
+
+## Dependencies
+
+* `jq` - a command-line json parser is needed to parse the json in the config file
+
+## Installation
+
+    # Copy the puma script to the rc.d directory (make sure everyone has read/execute perms)
+    sudo cp puma /usr/local/etc/rc.d/
+
+    # Create an empty configuration file
+    sudo touch /usr/local/etc/puma.conf
+
+    # Enable the puma service
+    sudo echo 'puma_enable="YES"' >> /etc/rc.conf
+
+## Managing the jungle
+
+Puma apps are referenced in /usr/local/etc/puma.conf by default.
+
+Start the jungle running:
+
+`service puma start`
+
+This script will run at boot time.
+
+
+You can also stop the jungle (stops ALL puma instances) by running:
+
+`service puma stop`
+
+
+To restart the jungle:
+
+`service puma restart`
+
+## Conventions
+
+* The script expects:
+  * a config file to exist under `config/puma.rb` in your app. E.g.: `/home/apps/my-app/config/puma.rb`.
+
+You can always change those defaults by editing the scripts.
+
+## Here's what a minimal app's config file should have
+
+```
+{
+	"servers" : [
+		{
+			"dir": "/path/to/rails/project",
+			"user": "deploy-user",
+			"ruby_version": "ruby.version",
+			"ruby_env": "rbenv"
+		}
+	]
+}
+```
+
+## Before starting...
+
+You need to customise `puma.conf` to:
+
+* Set the right user your app should be running on unless you want root to execute it!
+* Set the directory of the app
+* Set the ruby version to execute
+* Set the ruby environment (currently set to rbenv, since that is the only ruby environment currently supported)
+* Add additional server instances following the scheme in the example
+
+## Notes:
+
+Only rbenv is currently supported.

data/tools/jungle/rc.d/puma

@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+
+# PROVIDE: puma
+
+. /etc/rc.subr
+
+name="puma"
+start_cmd="puma_start"
+stop_cmd="puma_stop"
+restart_cmd="puma_restart"
+rcvar=puma_enable
+required_files=/usr/local/etc/puma.conf
+
+puma_start()
+{
+	server_count=$(/usr/local/bin/jq ".servers[] .ruby_env" /usr/local/etc/puma.conf | wc -l)
+	i=0	
+	while [ "$i" -lt "$server_count" ]; do
+		rb_env=$(/usr/local/bin/jq -r ".servers[$i].ruby_env" /usr/local/etc/puma.conf)
+		dir=$(/usr/local/bin/jq -r ".servers[$i].dir" /usr/local/etc/puma.conf)
+		user=$(/usr/local/bin/jq -r ".servers[$i].user" /usr/local/etc/puma.conf)
+		rb_ver=$(/usr/local/bin/jq -r ".servers[$i].ruby_version" /usr/local/etc/puma.conf)
+		case $rb_env in
+			"rbenv")
+				su - $user -c "cd $dir && rbenv shell $rb_ver && bundle exec puma -C $dir/config/puma.rb -d"
+				;;
+			*)
+				;;
+		esac
+		i=$(( i + 1 ))
+	done
+}
+
+puma_stop()
+{
+    pkill ruby
+}
+
+puma_restart()
+{
+	server_count=$(/usr/local/bin/jq ".servers[] .ruby_env" /usr/local/etc/puma.conf | wc -l)
+	i=0	
+	while [ "$i" -lt "$server_count" ]; do
+		rb_env=$(/usr/local/bin/jq -r ".servers[$i].ruby_env" /usr/local/etc/puma.conf)
+		dir=$(/usr/local/bin/jq -r ".servers[$i].dir" /usr/local/etc/puma.conf)
+		user=$(/usr/local/bin/jq -r ".servers[$i].user" /usr/local/etc/puma.conf)
+		rb_ver=$(/usr/local/bin/jq -r ".servers[$i].ruby_version" /usr/local/etc/puma.conf)
+		case $rb_env in
+			"rbenv")
+				su - $user -c "cd $dir && pkill ruby && rbenv shell $ruby_version && bundle exec puma -C $dir/config/puma.rb -d"
+				;;
+			*)
+				;;
+		esac
+		i=$(( i + 1 ))
+	done
+}
+
+load_rc_config $name
+run_rc_command "$1"

data/tools/jungle/rc.d/puma.conf

@@ -0,0 +1,10 @@
+{
+	"servers" : [
+		{
+			"dir": "/path/to/rails/project",
+			"user": "deploy-user",
+			"ruby_version": "ruby.version",
+			"ruby_env": "rbenv"
+		}
+	]
+}

data/tools/trickletest.rb

@@ -31,7 +31,7 @@ st = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\nCon
 puts "length: #{content.length}"
 
 threads = []
-ARGV[1].to_i.times do 
+ARGV[1].to_i.times do
   t = Thread.new do
     size = 100
     puts ">>>> #{size} sized chunks"

metadata

@@ -1,81 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        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: '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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
+date: 2018-07-13 00:00:00.000000000 Z
+dependencies: []
 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.
+  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.
 email:
 - evan@phx.io
 executables:
@@ -83,29 +21,22 @@ executables:
 - pumactl
 extensions:
 - ext/puma_http11/extconf.rb
-extra_rdoc_files:
-- DEPLOYMENT.md
-- History.txt
-- Manifest.txt
-- README.md
-- docs/nginx.md
-- docs/signals.md
-- docs/systemd.md
-- tools/jungle/README.md
-- tools/jungle/init.d/README.md
-- tools/jungle/upstart/README.md
+extra_rdoc_files: []
 files:
-- DEPLOYMENT.md
-- Gemfile
-- History.txt
+- History.md
 - LICENSE
-- Manifest.txt
 - README.md
-- Rakefile
 - bin/puma
 - bin/puma-wild
 - bin/pumactl
+- docs/architecture.md
+- docs/deployment.md
+- docs/images/puma-connection-flow-no-reactor.png
+- docs/images/puma-connection-flow.png
+- docs/images/puma-general-arch.png
 - docs/nginx.md
+- docs/plugins.md
+- docs/restart.md
 - docs/signals.md
 - docs/systemd.md
 - ext/puma_http11/PumaHttp11Service.java
@@ -148,8 +79,6 @@ files:
 - 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
@@ -163,11 +92,13 @@ files:
 - 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/rc.d/README.md
+- tools/jungle/rc.d/puma
+- tools/jungle/rc.d/puma.conf
 - tools/jungle/upstart/README.md
 - tools/jungle/upstart/puma-manager.conf
 - tools/jungle/upstart/puma.conf
@@ -175,18 +106,17 @@ files:
 homepage: http://puma.io
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: openssl
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -194,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for

data/Gemfile

@@ -1,13 +0,0 @@
-source "http://rubygems.org"
-
-gem "hoe"
-gem "hoe-git"
-gem "hoe-ignore"
-gem "rdoc"
-gem "rake-compiler"
-gem "test-unit", "~> 3.0"
-
-gem "rack"
-gem 'minitest', '~> 5.8'
-
-gem "jruby-openssl", :platform => "jruby"

data/Manifest.txt

@@ -1,77 +0,0 @@
-DEPLOYMENT.md
-Gemfile
-History.txt
-LICENSE
-Manifest.txt
-README.md
-Rakefile
-bin/puma
-bin/puma-wild
-bin/pumactl
-docs/nginx.md
-docs/signals.md
-docs/systemd.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/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/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
-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

data/Rakefile

@@ -1,158 +0,0 @@
-require "hoe"
-require "rake/extensiontask"
-require "rake/javaextensiontask"
-
-IS_JRUBY = defined?(RUBY_ENGINE) ? RUBY_ENGINE == "jruby" : false
-
-Hoe.plugin :git
-Hoe.plugin :ignore
-
-HOE = Hoe.spec "puma" do
-  self.readme_file    = "README.md"
-  self.urls = %w!http://puma.io https://github.com/puma/puma!
-
-  license "BSD-3-Clause"
-  developer 'Evan Phoenix', 'evan@phx.io'
-
-  spec_extras[:extensions]  = ["ext/puma_http11/extconf.rb"]
-  spec_extras[:executables] = ['puma', 'pumactl']
-  spec_extras[:homepage] = self.urls.first
-
-  require_ruby_version ">= 1.8.7"
-
-  dependency "rack", [">= 1.1", "< 2.0"], :development
-
-  extra_dev_deps << ["rake-compiler", "~> 0.8"]
-end
-
-task :prerelease => [:clobber, :check_manifest, :test]
-
-# hoe/test and rake-compiler don't seem to play well together, so disable
-# hoe/test's .gemtest touch file thingy for now
-HOE.spec.files -= [".gemtest"]
-
-include Hoe::Git
-
-desc "Print the current changelog."
-task "changelog" do
-  tag   = ENV["FROM"] || git_tags.last
-  range = [tag, "HEAD"].compact.join ".."
-  cmd   = "git log #{range} '--format=tformat:%B|||%aN|||%aE|||'"
-  now   = Time.new.strftime "%Y-%m-%d"
-
-  changes = `#{cmd}`.split(/\|\|\|/).each_slice(3).map { |msg, author, email|
-              msg.split(/\n/).reject { |s| s.empty? }.first
-            }.flatten.compact
-
-  $changes = Hash.new { |h,k| h[k] = [] }
-
-  codes = {
-    "!" => :major,
-    "+" => :minor,
-    "*" => :minor,
-    "-" => :bug,
-    "?" => :unknown,
-  }
-
-  codes_re = Regexp.escape codes.keys.join
-
-  changes.each do |change|
-    if change =~ /^\s*([#{codes_re}])\s*(.*)/ then
-      code, line = codes[$1], $2
-    else
-      code, line = codes["?"], change.chomp
-    end
-
-    $changes[code] << line
-  end
-
-  puts "=== #{ENV['VERSION'] || 'NEXT'} / #{now}"
-  puts
-  changelog_section :major
-  changelog_section :minor
-  changelog_section :bug
-  changelog_section :unknown
-  puts
-end
-
-# generate extension code using Ragel (C and Java)
-desc "Generate extension code (C and Java) using Ragel"
-task :ragel
-
-file 'ext/puma_http11/http11_parser.c' => ['ext/puma_http11/http11_parser.rl'] do |t|
-  begin
-    sh "ragel #{t.prerequisites.last} -C -G2 -I ext/puma_http11 -o #{t.name}"
-  rescue
-    fail "Could not build wrapper using Ragel (it failed or not installed?)"
-  end
-end
-task :ragel => ['ext/puma_http11/http11_parser.c']
-
-file 'ext/puma_http11/org/jruby/puma/Http11Parser.java' => ['ext/puma_http11/http11_parser.java.rl'] do |t|
-  begin
-    sh "ragel #{t.prerequisites.last} -J -G2 -I ext/puma_http11 -o #{t.name}"
-  rescue
-    fail "Could not build wrapper using Ragel (it failed or not installed?)"
-  end
-end
-task :ragel => ['ext/puma_http11/org/jruby/puma/Http11Parser.java']
-
-if !IS_JRUBY
-
-# compile extensions using rake-compiler
-# C (MRI, Rubinius)
-Rake::ExtensionTask.new("puma_http11", HOE.spec) do |ext|
-  # place extension inside namespace
-  ext.lib_dir = "lib/puma"
-
-  ext.cross_compile = true
-  ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
-  ext.cross_compiling do |spec|
-    # add fat-binary stub only when cross compiling
-    spec.files << "lib/puma/puma_http11.rb"
-  end
-
-  CLEAN.include "lib/puma/{1.8,1.9}"
-  CLEAN.include "lib/puma/puma_http11.rb"
-end
-
-else
-
-# Java (JRuby)
-Rake::JavaExtensionTask.new("puma_http11", HOE.spec) do |ext|
-  ext.lib_dir = "lib/puma"
-end
-
-end
-
-# the following is a fat-binary stub that will be used when
-# require 'puma/puma_http11' and will use either 1.8 or 1.9 version depending
-# on RUBY_VERSION
-file "lib/puma/puma_http11.rb" do |t|
-  File.open(t.name, "w") do |f|
-    f.puts "RUBY_VERSION =~ /(\d+.\d+)/"
-    f.puts 'require "puma/#{$1}/puma_http11"'
-  end
-end
-
-# tests require extension be compiled, but depend on the platform
-if IS_JRUBY
-  task :test => [:java]
-else
-  task :test => [:compile]
-end
-
-namespace :test do
-  desc "Run the integration tests"
-  task :integration do
-    sh "cd test/shell; sh run.sh"
-  end
-
-  desc "Run all tests"
-  if defined?(JRUBY_VERSION) and ENV['TRAVIS']
-    task :all => :test
-  else
-    task :all => [:test, "test:integration"]
-  end
-end
-