yahns 0.0.1 → 0.0.2

data/test/test_stream_file.rb

@@ -4,7 +4,7 @@ require_relative 'helper'
 require 'timeout'
 
 class TestStreamFile < Testcase
-  parallelize_me!
+  ENV["N"].to_i > 1 and parallelize_me!
   DevFD = Struct.new(:to_path)
 
   def test_stream_file

data/test/test_unix_socket.rb

@@ -0,0 +1,72 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'server_helper'
+
+class TestUnixSocket < Testcase
+  ENV["N"].to_i > 1 and parallelize_me!
+  include ServerHelper
+  alias setup server_helper_setup
+  alias teardown server_helper_teardown
+
+  def unix_socket(path)
+    Timeout.timeout(30) do
+      begin
+        c = UNIXSocket.new(path)
+        c.close_on_exec = true
+        return c
+      rescue Errno::ENOENT
+        sleep 0.01
+        retry
+      end
+    end
+  end
+
+  def test_socket
+    tmpdir = Dir.mktmpdir
+    err, cfg = @err, Yahns::Config.new
+    sock = "#{tmpdir}/sock"
+    cfg.instance_eval do
+      ru = lambda { |_| [ 200, {'Content-Length'=>'2'}, ['HI'] ] }
+      GTL.synchronize { app(:rack, ru) { listen sock } }
+      stderr_path err.path
+    end
+    pid = mkserver(cfg)
+    c = unix_socket(sock)
+    c.write "GET / HTTP/1.0\r\n\r\n"
+    assert_equal c, c.wait(30)
+    buf = c.read
+    assert_match %r{\AHTTP/1\.1 200 OK\r\n}, buf
+    assert_match %r{\r\n\r\nHI\z}, buf
+    st = File.stat(sock)
+    assert st.world_readable?
+    assert st.world_writable?
+    c.close
+  ensure
+    quit_wait(pid)
+    FileUtils.rm_rf(tmpdir)
+  end
+
+  def test_socket_perms
+    tmpdir = Dir.mktmpdir
+    err, cfg = @err, Yahns::Config.new
+    sock = "#{tmpdir}/sock"
+    cfg.instance_eval do
+      ru = lambda { |_| [ 200, {'Content-Length'=>'2'}, ['HI'] ] }
+      GTL.synchronize { app(:rack, ru) { listen sock, umask: 0077 } }
+      stderr_path err.path
+    end
+    pid = mkserver(cfg)
+    c = unix_socket(sock)
+    c.write "GET / HTTP/1.0\r\n\r\n"
+    assert_equal c, c.wait(30)
+    buf = c.read
+    assert_match %r{\AHTTP/1\.1 200 OK\r\n}, buf
+    assert_match %r{\r\n\r\nHI\z}, buf
+    st = File.stat(sock)
+    refute st.world_readable?
+    refute st.world_writable?
+  ensure
+    quit_wait(pid)
+    FileUtils.rm_rf(tmpdir)
+  end
+end

data/test/test_wbuf.rb

@@ -4,19 +4,27 @@ require_relative 'helper'
 require 'timeout'
 
 class TestWbuf < Testcase
-  parallelize_me!
+  ENV["N"].to_i > 1 and parallelize_me!
+
+  class KgioUS < UNIXSocket
+    include Kgio::SocketMethods
+  end
+
+  def socketpair
+    KgioUS.pair.each { |io| io.close_on_exec = true }
+  end
 
   def test_wbuf
     buf = "*" * (16384 * 2)
     nr = 1000
     [ true, false ].each do |persist|
-      wbuf = Yahns::Wbuf.new([], persist)
-      a, b = UNIXSocket.pair
+      wbuf = Yahns::Wbuf.new([], persist, Dir.tmpdir)
+      a, b = socketpair
       assert_nil wbuf.wbuf_write(a, "HIHI")
       assert_equal "HIHI", b.read(4)
       nr.times { wbuf.wbuf_write(a, buf) }
       assert_equal :wait_writable, wbuf.wbuf_flush(a)
-      done = IO.pipe
+      done = cloexec_pipe
       thr = Thread.new do
         rv = []
         until rv[-1] == persist
@@ -33,7 +41,7 @@ class TestWbuf < Testcase
         if wait
           r = IO.select([b,done[0]], nil, nil, 5)
         end
-        b.read_nonblock((rand * 1024) + 666, buf)
+        b.read_nonblock((rand * 1024).to_i + 666, buf)
         wait = (r[0] & done).empty?
       rescue Errno::EAGAIN
         break
@@ -50,7 +58,7 @@ class TestWbuf < Testcase
   end
 
   def test_wbuf_blocked
-    a, b = UNIXSocket.pair
+    a, b = socketpair
     buf = "." * 4096
     4.times do
       begin
@@ -59,7 +67,7 @@ class TestWbuf < Testcase
         break
       end while true
     end
-    wbuf = Yahns::Wbuf.new([], true)
+    wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir)
     assert_equal :wait_writable, wbuf.wbuf_write(a, buf)
     assert_equal :wait_writable, wbuf.wbuf_flush(a)
 
@@ -74,23 +82,18 @@ class TestWbuf < Testcase
     b.read(nr - 2) if nr > 2
     assert_equal b, IO.select([b], nil, nil, 5)[0][0]
     assert_equal "HI", b.read(2)
-    begin
-      wbuf.wbuf_flush(a)
-      assert false
-    rescue => e
-    end
-    assert_match(%r{BUG: EOF on tmpio}, e.message)
+    assert_equal false, wbuf.wbuf_flush(a)
   ensure
     a.close
     b.close
   end
 
   def test_wbuf_flush_close
-    pipe = IO.pipe
+    pipe = cloexec_pipe
     persist = true
-    wbuf = Yahns::Wbuf.new(pipe[0], persist)
+    wbuf = Yahns::Wbuf.new(pipe[0], persist, Dir.tmpdir)
     refute wbuf.respond_to?(:close) # we don't want this for HttpResponse body
-    sp = UNIXSocket.pair
+    sp = socketpair
     rv = nil
 
     buf = ("*" * 16384) << "\n"
@@ -103,7 +106,7 @@ class TestWbuf < Testcase
     assert_equal thr, thr.join(5)
     assert_equal :wait_writable, rv
 
-    done = IO.pipe
+    done = cloexec_pipe
     thr = Thread.new do
       rv = []
       until rv[-1] == persist

data/yahns.gemspec

@@ -14,6 +14,9 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<sleepy_penguin>, '~> 3.2')
   s.add_dependency(%q<sendfile>, '~> 1.2.1')
   s.add_dependency(%q<unicorn>, '~> 4.6.3')
+
+  # minitest is standard in Ruby 2.0
+  s.add_development_dependency(%q<minitest>, '~> 4.3', '~> 5.0')
   s.homepage = "http://yahns.yhbt.net/README"
   s.licenses = "GPLv3+"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -66,6 +66,26 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.6.3
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: |-
   A Free Software, multi-threaded, non-blocking network application server
   designed for low _idle_ power consumption.  It is primarily optimized
@@ -76,29 +96,43 @@ description: |-
 email: yahns@yhbt.net
 executables:
 - yahns
+- yahns-rackup
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - COPYING
+- Documentation/.gitignore
+- Documentation/GNUmakefile
+- Documentation/yahns-rackup.txt
+- Documentation/yahns.txt
+- Documentation/yahns_config.txt
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- HACKING
+- INSTALL
 - NEWS
 - README
 - Rakefile
 - bin/yahns
+- bin/yahns-rackup
 - examples/README
 - examples/init.sh
 - examples/logger_mp_safe.rb
 - examples/logrotate.conf
 - examples/yahns_multi.conf.rb
 - examples/yahns_rack_basic.conf.rb
+- extras/README
+- extras/autoindex.rb
+- extras/exec_cgi.rb
+- extras/proxy_pass.rb
+- extras/try_gzip_static.rb
 - lib/yahns.rb
 - lib/yahns/acceptor.rb
 - lib/yahns/cap_input.rb
-- lib/yahns/client_expire.rb
-- lib/yahns/client_expire_portable.rb
+- lib/yahns/client_expire_generic.rb
+- lib/yahns/client_expire_tcpi.rb
 - lib/yahns/config.rb
 - lib/yahns/daemon.rb
 - lib/yahns/fdmap.rb
@@ -112,7 +146,10 @@ files:
 - lib/yahns/queue.rb
 - lib/yahns/queue_egg.rb
 - lib/yahns/queue_epoll.rb
+- lib/yahns/queue_quitter.rb
+- lib/yahns/queue_quitter_pipe.rb
 - lib/yahns/rack.rb
+- lib/yahns/rackup_handler.rb
 - lib/yahns/server.rb
 - lib/yahns/server_mp.rb
 - lib/yahns/sigevent.rb
@@ -121,20 +158,34 @@ files:
 - lib/yahns/socket_helper.rb
 - lib/yahns/stream_file.rb
 - lib/yahns/stream_input.rb
+- lib/yahns/tcp_server.rb
 - lib/yahns/tee_input.rb
 - lib/yahns/tmpio.rb
+- lib/yahns/unix_server.rb
 - lib/yahns/version.rb
 - lib/yahns/wbuf.rb
 - lib/yahns/wbuf_common.rb
+- lib/yahns/wbuf_str.rb
 - lib/yahns/worker.rb
+- man/yahns-rackup.1
+- man/yahns.1
+- man/yahns_config.5
 - test/covshow.rb
 - test/helper.rb
 - test/server_helper.rb
 - test/test_bin.rb
+- test/test_buffer_tmpdir.rb
 - test/test_client_expire.rb
 - test/test_client_max_body_size.rb
 - test/test_config.rb
+- test/test_expect_100.rb
+- test/test_extras_autoindex.rb
+- test/test_extras_exec_cgi.rb
+- test/test_extras_exec_cgi.sh
+- test/test_extras_try_gzip_static.rb
 - test/test_fdmap.rb
+- test/test_input.rb
+- test/test_mt_accept.rb
 - test/test_output_buffering.rb
 - test/test_rack.rb
 - test/test_rack_hijack.rb
@@ -142,6 +193,7 @@ files:
 - test/test_serve_static.rb
 - test/test_server.rb
 - test/test_stream_file.rb
+- test/test_unix_socket.rb
 - test/test_wbuf.rb
 - yahns.gemspec
 homepage: http://yahns.yhbt.net/README
@@ -164,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server