puma 2.12.0-java → 2.12.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef1a7c3d1d328c5f63c396de8278badac9ae24f
-  data.tar.gz: 86dc6dded4ac139337c294048ac7891c36187013
+  metadata.gz: 7dc44ef6aaeda70b87da03a15bd5b9bd3abd35d6
+  data.tar.gz: 64d3be4eb9cbffa1e417c29d561553e2198dcb17
 SHA512:
-  metadata.gz: dfb33144d100c64238d3677a627266927c50e219c8f09cdf97edbc801d3304a559ccf9c19e3c0d54b433ae445dc522f974dde0e056aad4e792804a9a5e913431
-  data.tar.gz: 10a923768c5fcecfb7952b23ae6d512dc9e8a4338dabbbd33873c3188da9ce56a08575a934050d48ec3819aea1a027bc6b508ff408e20436f5a9ff75eca76498
+  metadata.gz: 0d3e867cae3b8c665ae63153d5a47b77f9457f81461976abe27bd9cb82902ba1e68203f8ac4f3dcc3ac7002583f9dc2609b5fce32751f3a85e73f7dd8459591c
+  data.tar.gz: 2d131676d9f81752d5e47af4d643b5e2a5e7ff4c38db02a1e5fa2f9edb27e36c2c725ae38571316bd6ebeae319960846b295a9cd230caff6521f51b80372e112

data/History.txt

@@ -1,6 +1,18 @@
+=== 2.12.1 / 2015-07-16
+
+* 2 bug fixes:
+  * Use a constant format. Fixes #737
+  * Use strerror for Windows sake. Fixes #733
+
+* 1 doc change:
+  * typo fix: occured -> occurred
+
+* 1 PR merged:
+  * Merge pull request #736 from paulanunda/paulanunda/typo-fix
+
 === 2.12.0 / 2015-07-14
 
-* X bug fixes:
+* 13 bug fixes:
   * Add thread reaping to thread pool
   * Do not automatically use chunked responses when hijacked
   * Do not suppress Content-Length on partial hijack
@@ -15,7 +27,7 @@
   * Remove the default Content-Type: text/plain
   * Add Client Side Certificate Auth
 
-* X doc/test changes:
+* 8 doc/test changes:
   * Added example sourcing of environment vars
   * Added tests for bind configuration on rackup file
   * Fix example config text
@@ -25,11 +37,11 @@
   * ci: Start running tests against JRuby 9k on Travis
   * ci: Convert to container infrastructure for travisci
 
-* X ops changes:
+* 2 ops changes:
   * Check for system-wide rbenv
   * capistrano: Add additional env when start rails
 
-* X PRs merged:
+* 16 PRs merged:
   * Merge pull request #686 from jjb/patch-2
   * Merge pull request #693 from rob-murray/update-example-config
   * Merge pull request #697 from spk/tests-bind-on-rackup-file

data/README.md

@@ -131,7 +131,7 @@ error-tracking service (in this example, [rollbar](http://rollbar.com)):
 ```ruby
 lowlevel_error_handler do |e|
   Rollbar.critical(e)
-  [500, {}, ["An error has occured, and engineers have been informed. Please reload the page. If you continue to have problems, contact support@example.com\n"]]
+  [500, {}, ["An error has occurred, and engineers have been informed. Please reload the page. If you continue to have problems, contact support@example.com\n"]]
 end
 ```
 

data/ext/puma_http11/mini_ssl.c

@@ -212,8 +212,7 @@ void raise_error(SSL* ssl, int result) {
   int verify_err = SSL_get_verify_result(ssl);
 
   if(SSL_ERROR_SYSCALL == ssl_err) {
-    strerror_r(err, buf, sizeof(buf));
-    snprintf(msg, sizeof(msg), "System error: %s - %d", buf, err);
+    snprintf(msg, sizeof(msg), "System error: %s - %d", strerror(err), err);
 
   } else if(SSL_ERROR_SSL == ssl_err) {
     if(X509_V_OK != verify_err) {
@@ -233,7 +232,7 @@ void raise_error(SSL* ssl, int result) {
   }
 
   ERR_clear_error();
-  rb_raise(eError, msg);
+  rb_raise(eError, "%s", msg);
 }
 
 VALUE engine_read(VALUE self) {

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.12.0".freeze
+    PUMA_VERSION = VERSION = "2.12.1".freeze
     CODE_NAME = "Plutonian Photo Shoot".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/events.rb

@@ -87,7 +87,7 @@ module Puma
       formatter.call(str)
     end
 
-    # An HTTP parse error has occured.
+    # An HTTP parse error has occurred.
     # +server+ is the Server object, +env+ the request, and +error+ a
     # parsing exception.
     #
@@ -96,7 +96,7 @@ module Puma
       @stderr.puts "#{Time.now}: ENV: #{env.inspect}\n---\n"
     end
 
-    # An SSL error has occured.
+    # An SSL error has occurred.
     # +server+ is the Server object, +peeraddr+ peer address, +peercert+
     # any peer certificate (if present), and +error+ an exception object.
     #
@@ -105,7 +105,7 @@ module Puma
       @stderr.puts "#{Time.now}: SSL error, peer: #{peeraddr}, peer cert: #{subject}, #{error.inspect}"
     end
 
-    # An unknown error has occured.
+    # An unknown error has occurred.
     # +server+ is the Server object, +env+ the request, +error+ an exception
     # object, and +kind+ some additional info.
     #

data/lib/puma/server.rb

@@ -764,7 +764,7 @@ module Puma
       if @leak_stack_on_error
         [500, {}, ["Puma caught this error: #{e.message} (#{e.class})\n#{e.backtrace.join("\n")}"]]
       else
-        [500, {}, ["An unhandled lowlevel error occured. The application logs may have details.\n"]]
+        [500, {}, ["An unhandled lowlevel error occurred. The application logs may have details.\n"]]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   name: hoe
   prerelease: false
   type: :development
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 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.
 email:
 - evan@phx.io
@@ -164,24 +164,6 @@ 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_puma_server_ssl.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
 - lib/puma/puma_http11.jar
 homepage: http://puma.io
 licenses:
@@ -209,22 +191,4 @@ rubygems_version: 2.1.9
 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_puma_server_ssl.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: []

data/test/test_app_status.rb

@@ -1,92 +0,0 @@
-require 'test/unit'
-require 'rack'
-require 'puma/app/status'
-
-class TestAppStatus < Test::Unit::TestCase
-  class FakeServer
-    def initialize
-      @status = :running
-      @backlog = 0
-      @running = 0
-    end
-
-    attr_reader :status
-    attr_accessor :backlog, :running
-
-    def stop
-      @status = :stop
-    end
-
-    def halt
-      @status = :halt
-    end
-
-    def stats
-      "{}"
-    end
-  end
-
-  def setup
-    @server = FakeServer.new
-    @app = Puma::App::Status.new(@server)
-    @app.auth_token = nil
-  end
-
-  def lint(uri)
-    app = Rack::Lint.new @app
-    mock_env = Rack::MockRequest.env_for uri
-    app.call mock_env
-  end
-
-  def test_bad_token
-    @app.auth_token = "abcdef"
-
-    status, _, _ = lint('/whatever')
-
-    assert_equal 403, status
-  end
-
-  def test_good_token
-    @app.auth_token = "abcdef"
-
-    status, _, _ = lint('/whatever?token=abcdef')
-
-    assert_equal 404, status
-  end
-
-  def test_unsupported
-    status, _, _ = lint('/not-real')
-
-    assert_equal 404, status
-  end
-
-  def test_stop
-    status, _ , app = lint('/stop')
-
-    assert_equal :stop, @server.status
-    assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
-  end
-
-  def test_halt
-    status, _ , app = lint('/halt')
-
-    assert_equal :halt, @server.status
-    assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
-  end
-
-  def test_stats
-    @server.backlog = 1
-    @server.running = 9
-    status, _ , app = lint('/stats')
-
-    assert_equal 200, status
-    assert_equal ['{}'], app.enum_for.to_a
-  end
-
-  def test_alternate_location
-    status, _ , _ = lint('__alternatE_location_/stats')
-    assert_equal 200, status
-  end
-end

data/test/test_cli.rb

@@ -1,173 +0,0 @@
-require "rbconfig"
-require 'test/unit'
-require 'puma/cli'
-require 'tempfile'
-
-class TestCLI < Test::Unit::TestCase
-  def setup
-    @environment = 'production'
-    @tmp_file = Tempfile.new("puma-test")
-    @tmp_path = @tmp_file.path
-    @tmp_file.close!
-
-    @tmp_path2 = "#{@tmp_path}2"
-
-    File.unlink @tmp_path if File.exist? @tmp_path
-    File.unlink @tmp_path2 if File.exist? @tmp_path2
-
-    @wait, @ready = IO.pipe
-
-    @events = Events.strings
-    @events.on_booted { @ready << "!" }
-  end
-
-  def wait_booted
-    @wait.sysread 1
-  end
-
-  def teardown
-    File.unlink @tmp_path if File.exist? @tmp_path
-    File.unlink @tmp_path2 if File.exist? @tmp_path2
-
-    @wait.close
-    @ready.close
-  end
-
-  def test_pid_file
-    cli = Puma::CLI.new ["--pidfile", @tmp_path]
-    cli.send(:parse_options)
-    cli.write_pid
-
-    assert_equal File.read(@tmp_path).strip.to_i, Process.pid
-  end
-
-  def test_control_for_tcp
-    url = "tcp://127.0.0.1:9877/"
-    cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], @events
-
-    cli.send(:parse_options)
-
-    thread_exception = nil
-    t = Thread.new do
-      begin
-        cli.run
-      rescue Exception => e
-        thread_exception = e
-      end
-    end
-
-    wait_booted
-
-    s = TCPSocket.new "127.0.0.1", 9877
-    s << "GET /stats HTTP/1.0\r\n\r\n"
-    body = s.read
-    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
-
-    cli.stop
-    t.join
-    assert_equal nil, thread_exception
-  end
-
-  unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
-  def test_control
-    url = "unix://#{@tmp_path}"
-
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], @events
-    cli.send(:parse_options)
-
-    t = Thread.new { cli.run }
-
-    wait_booted
-
-    s = UNIXSocket.new @tmp_path
-    s << "GET /stats HTTP/1.0\r\n\r\n"
-    body = s.read
-
-    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
-
-    cli.stop
-    t.join
-  end
-
-  def test_control_stop
-    url = "unix://#{@tmp_path}"
-
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
-                         "--control", url,
-                         "--control-token", "",
-                         "test/lobster.ru"], @events
-    cli.send(:parse_options)
-
-    t = Thread.new { cli.run }
-
-    wait_booted
-
-    s = UNIXSocket.new @tmp_path
-    s << "GET /stop HTTP/1.0\r\n\r\n"
-    body = s.read
-
-    assert_equal '{ "status": "ok" }', body.split("\r\n").last
-
-    t.join
-  end
-
-  def test_tmp_control
-    url = "tcp://127.0.0.1:8232"
-    cli = Puma::CLI.new ["--state", @tmp_path, "--control", "auto"]
-    cli.send(:parse_options)
-    cli.write_state
-
-    data = YAML.load File.read(@tmp_path)
-
-    assert_equal Process.pid, data["pid"]
-
-    url = data["config"].options[:control_url]
-
-    m = %r!unix://(.*)!.match(url)
-
-    assert m, "'#{url}' is not a URL"
-  end
-  end # JRUBY or Windows
-
-  def test_state
-    url = "tcp://127.0.0.1:8232"
-    cli = Puma::CLI.new ["--state", @tmp_path, "--control", url]
-    cli.send(:parse_options)
-    cli.write_state
-
-    data = YAML.load File.read(@tmp_path)
-
-    assert_equal Process.pid, data["pid"]
-    assert_equal url, data["config"].options[:control_url]
-  end
-
-  def test_load_path
-    cli = Puma::CLI.new ["--include", 'foo/bar']
-    cli.send(:parse_options)
-
-    assert_equal 'foo/bar', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-
-    cli = Puma::CLI.new ["--include", 'foo/bar:baz/qux']
-    cli.send(:parse_options)
-
-    assert_equal 'foo/bar', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-    assert_equal 'baz/qux', $LOAD_PATH[0]
-    $LOAD_PATH.shift
-  end
-
-  def test_environment
-    cli = Puma::CLI.new ["--environment", @environment]
-    cli.send(:parse_options)
-    cli.send(:set_rack_environment)
-
-    assert_equal ENV['RACK_ENV'], @environment
-  end
-end