puma 3.0.0.rc1 → 5.0.0.beta1

data/Manifest.txt

@@ -1,79 +0,0 @@
-COPYING
-DEPLOYMENT.md
-Gemfile
-History.txt
-LICENSE
-Manifest.txt
-README.md
-Rakefile
-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
-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/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
-

data/ext/puma_http11/io_buffer.c

@@ -1,155 +0,0 @@
-#define RSTRING_NOT_MODIFIED 1
-#include "ruby.h"
-
-#include <sys/types.h>
-
-struct buf_int {
-  uint8_t* top;
-  uint8_t* cur;
-
-  size_t size;
-};
-
-#define BUF_DEFAULT_SIZE 4096
-#define BUF_TOLERANCE 32
-
-static void buf_free(struct buf_int* internal) {
-  free(internal->top);
-  free(internal);
-}
-
-static VALUE buf_alloc(VALUE self) {
-  VALUE buf;
-  struct buf_int* internal;
-
-  buf = Data_Make_Struct(self, struct buf_int, 0, buf_free, internal);
-
-  internal->size = BUF_DEFAULT_SIZE;
-  internal->top = malloc(BUF_DEFAULT_SIZE);
-  internal->cur = internal->top;
-
-  return buf;
-}
-
-static VALUE buf_append(VALUE self, VALUE str) {
-  struct buf_int* b;
-  size_t used, str_len, new_size;
-
-  Data_Get_Struct(self, struct buf_int, b);
-
-  used = b->cur - b->top;
-
-  StringValue(str);
-  str_len = RSTRING_LEN(str);
-
-  new_size = used + str_len;
-
-  if(new_size > b->size) {
-    size_t n = b->size + (b->size / 2);
-    uint8_t* top;
-    uint8_t* old;
-
-    new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
-
-    top = malloc(new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    free(old);
-  }
-
-  memcpy(b->cur, RSTRING_PTR(str), str_len);
-  b->cur += str_len;
-
-  return self;
-}
-
-static VALUE buf_append2(int argc, VALUE* argv, VALUE self) {
-  struct buf_int* b;
-  size_t used, new_size;
-  int i;
-  VALUE str;
-
-  Data_Get_Struct(self, struct buf_int, b);
-
-  used = b->cur - b->top;
-  new_size = used;
-
-  for(i = 0; i < argc; i++) {
-    StringValue(argv[i]);
-
-    str = argv[i];
-
-    new_size += RSTRING_LEN(str);
-  }
-
-  if(new_size > b->size) {
-    size_t n = b->size + (b->size / 2);
-    uint8_t* top;
-    uint8_t* old;
-
-    new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
-
-    top = malloc(new_size);
-    old = b->top;
-    memcpy(top, old, used);
-    b->top = top;
-    b->cur = top + used;
-    b->size = new_size;
-    free(old);
-  }
-
-  for(i = 0; i < argc; i++) {
-    long str_len;
-    str = argv[i];
-    str_len = RSTRING_LEN(str);
-    memcpy(b->cur, RSTRING_PTR(str), str_len);
-    b->cur += str_len;
-  }
-
-  return self;
-}
-
-static VALUE buf_to_str(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return rb_str_new(b->top, b->cur - b->top);
-}
-
-static VALUE buf_used(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return INT2FIX(b->cur - b->top);
-}
-
-static VALUE buf_capa(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  return INT2FIX(b->size);
-}
-
-static VALUE buf_reset(VALUE self) {
-  struct buf_int* b;
-  Data_Get_Struct(self, struct buf_int, b);
-
-  b->cur = b->top;
-  return self;
-}
-
-void Init_io_buffer(VALUE puma) {
-  VALUE buf = rb_define_class_under(puma, "IOBuffer", rb_cObject);
-
-  rb_define_alloc_func(buf, buf_alloc);
-  rb_define_method(buf, "<<", buf_append, 1);
-  rb_define_method(buf, "append", buf_append2, -1);
-  rb_define_method(buf, "to_str", buf_to_str, 0);
-  rb_define_method(buf, "to_s", buf_to_str, 0);
-  rb_define_method(buf, "used", buf_used, 0);
-  rb_define_method(buf, "capacity", buf_capa, 0);
-  rb_define_method(buf, "reset", buf_reset, 0);
-}

data/lib/puma/capistrano.rb

@@ -1,94 +0,0 @@
-$stderr.puts "DEPRECATED: To manage puma with capistrano, use https://github.com/seuros/capistrano-puma"
-
-Capistrano::Configuration.instance.load do
-
-  # 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_default_hooks)    { true }
-  _cset(:puma_cmd)    { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
-  _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
-  _cset(:puma_env)    { fetch(:rack_env, fetch(:rails_env, 'production')) }
-  _cset(:puma_state)  { "#{shared_path}/sockets/puma.state" }
-  _cset(:puma_socket) { "unix://#{shared_path}/sockets/puma.sock" }
-  _cset(:puma_role)   { :app }
-
-  if fetch(:puma_default_hooks)
-    after 'deploy:stop', 'puma:stop'
-    after 'deploy:start', 'puma:start'
-    after 'deploy:restart', 'puma:restart'
-  end
-
-  namespace :puma do
-    desc 'Start puma'
-    task :start, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{puma_rails_additional_env} #{puma_cmd} #{start_options}", :pty => false
-    end
-
-    desc 'Stop puma'
-    task :stop, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} stop"
-    end
-
-    desc 'Restart puma'
-    task :restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      begin
-        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} restart"
-      rescue Capistrano::CommandError => ex
-        puts "Failed to restart puma: #{ex}\nAssuming not started."
-        start
-      end
-    end
-
-    desc 'Restart puma (phased restart)'
-    task :phased_restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      begin
-        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} phased-restart"
-      rescue Capistrano::CommandError => ex
-        puts "Failed to restart puma: #{ex}\nAssuming not started."
-        start
-      end
-    end
-
-  end
-
-  def start_options
-    if config_file
-      "-q -d -e #{puma_env} -C #{config_file}"
-    else
-      "-q -d -e #{puma_env} -b '#{puma_socket}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
-    end
-  end
-
-  def config_file
-    @_config_file ||= begin
-      file = fetch(:puma_config_file, nil)
-      file = "./config/puma/#{puma_env}.rb" if !file && File.exists?("./config/puma/#{puma_env}.rb")
-      file
-    end
-  end
-
-  def puma_env
-    fetch(:rack_env, fetch(:rails_env, 'production'))
-  end
-
-  #add additional env when start rails, such as : secret key, db username, db pwd or other what you want.
-  def puma_rails_additional_env
-    fetch(:puma_rails_additional_env, '')
-  end
-
-  def state_path
-    (config_file ? configuration.options[:state] : nil) || puma_state
-  end
-
-  def configuration
-    require 'puma'
-    require 'puma/configuration'
-
-    config = Puma::Configuration.new(:config_file => config_file)
-    config.load
-    config
-  end
-end