http_spew 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb45872da4a40e1048b41a9e67d770cf36b8492
-  data.tar.gz: 1529513d35f7690108de8fb47e2762222921211a
+  metadata.gz: 6f78a87db667171d544603aa12a83475dab20545
+  data.tar.gz: 5f487539a9d355cbc5a979cab70ac4b6788253ed
 SHA512:
-  metadata.gz: 15d146b1507a22952149368040593afa81b267c9df596a1ba080391cd66917890fe0472d3580644b6111bf3a163c4e5fd8194b0967eb5c92f200f96a12671b69
-  data.tar.gz: 8cccbb603644241181634209d8acc42f8b49001e03af46910b41303a12b0b44d70a1e6aee9fa0afbfde644789cd31980236722f098cf3f4b1d7e65a6ceb0cc1f
+  metadata.gz: 64a5f0b76fa4d70ffeef6de7120c51677a503bba55972d7063ded10532453bb3c8838cee0445c86da0f5f067a7977a8fd026a31bc399b0bde7c60811c0d33c2c
+  data.tar.gz: e22a30b09ab4b87c395084395da3ff477823cf5e28caf048e77ccd56d86692c3cde5c22629c18751662df2084fea6cfdd3fc3752d5a29b9f0ccb0837163e711a

data/.olddoc.yml

@@ -3,5 +3,4 @@ cgit_url: https://bogomips.org/http_spew.git
 git_url: git://bogomips.org/http_spew.git
 rdoc_url: https://bogomips.org/http_spew/
 ml_url: https://bogomips.org/http_spew-public/
-private_email: kcar@bogomips.org
 public_email: http_spew-public@bogomips.org

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.6.0
+DEF_VER=v0.7.0
 
 LF='
 '

data/http_spew.gemspec

@@ -1,23 +1,20 @@
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'olddoc'
-extend Olddoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{http_spew}
-  s.version = ENV["VERSION"].dup
-  s.authors = ["kcar hackers"]
-  s.description = readme_description
-  s.email = %q{kcar@bogomips.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.version = (ENV['VERSION'] || '0.7.0').dup
+  s.authors = ["http_spew hackers"]
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{http_spew-public@bogomips.org}
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Olddoc.config['rdoc_url']
-  s.summary = summary
+  s.homepage = 'https://bogomips.org/http_spew/'
+  s.summary = 'HTTP Spew - LAN-only HTTP spam^H^H^H^Hclient for Ruby'
   s.test_files = Dir["test/test_*.rb"]
   s.add_dependency(%q<kcar>, [ "~> 0.3", ">= 0.3.1"])
-  s.add_dependency(%q<kgio>, "~> 2.6")
-  s.add_development_dependency(%q<olddoc>, "~> 1.0")
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.3'
   s.licenses = %w(GPL-2.0+)
 end

data/lib/http_spew.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require "kgio"
+require "io/wait"
 require "kcar"
 
 module HTTP_Spew

data/lib/http_spew/chunky_pipe.rb

@@ -3,17 +3,28 @@
 # This is a OS-level pipe that overrides IO#read to provide
 # IO#readpartial-like semantics while remaining Rack::Lint-compatible
 # for EOF, meaning we return nil on EOF instead of raising EOFError.
-class HTTP_Spew::ChunkyPipe < Kgio::Pipe
+class HTTP_Spew::ChunkyPipe < IO
 
   # other threads may force an error to be raised in the +read+
   # method
   attr_accessor :error
 
+  class << self
+    alias new pipe
+  end
+
   # Override IO#read to behave like IO#readpartial, but still return +nil+
   # on EOF instead of raising EOFError.
-  def read(*args)
+  def read(len = 16384, buf = '')
     check_err!
-    kgio_read(*args) || check_err! || close
+    case read_nonblock(len, buf, exception: false)
+    when nil
+      return check_err! || close
+    when :wait_readable
+      wait_readable # retry
+    else
+      return buf
+    end while true
   end
 
   def check_err!

data/lib/http_spew/class_methods.rb

@@ -53,7 +53,7 @@ module HTTP_Spew::ClassMethods
   # If +need+ is fullfilled, it closes all incomplete requests.
   def wait_mt(need, requests, timeout)
     ready, failed = [], []
-    r, w = Kgio::Pipe.new
+    r, w = IO.pipe
     active = []
     t = [ timeout ]
     requests.each_with_index do |req, i|
@@ -68,7 +68,7 @@ module HTTP_Spew::ClassMethods
       end
     end
     begin
-      with_timeout(t) { r.kgio_wait_readable(t[0]) }
+      with_timeout(t) { r.wait_readable(t[0]) }
       req_idx = r.read(2).unpack("v".freeze)[0]
       thr = active[req_idx]
       with_timeout(t) { thr.join(t[0]) }
@@ -110,7 +110,7 @@ module HTTP_Spew::ClassMethods
       break if pollset.empty?
 
       busy = pollset.keys
-      rv = with_timeout(t) { Kgio.poll(pollset, (t[0] * 1000).to_i) } or break
+      rv = with_timeout(t) { do_poll(pollset, t[0]) } or break
     end while t[0] > 0.0 && requests = rv.keys.concat(busy).uniq!
 
     ready.concat(failed)
@@ -121,4 +121,32 @@ module HTTP_Spew::ClassMethods
     end
     ready
   end
+
+  begin
+    require 'kgio'
+    def do_poll(pollset, sec) # :nodoc:
+      Kgio.poll(pollset, (sec * 1000).to_i)
+    end
+  rescue LoadError
+    # emulate Kgio.poll with IO.select
+    def do_poll(pollset, sec) # :nodoc:
+      rd = []
+      wr = []
+      pollset.each do |io, events|
+        case events
+        when :wait_readable
+          rd << io
+        when :wait_writable
+          wr << io
+        else
+          raise "BUG: unsupported event #{event.inspect} for #{io.inspect}"
+        end
+      end
+      ready = IO.select(rd, wr, nil, sec) or return
+      pollset.clear
+      ready[0].each { |io| pollset[io] = 1 } # POLLIN
+      ready[1].each { |io| pollset[io] = 4 } # POLLOUT
+      pollset
+    end
+  end
 end

data/lib/http_spew/request.rb

@@ -1,4 +1,6 @@
 # -*- encoding: binary -*-
+require 'socket'
+
 # This is the base class actually capable of making a normal HTTP request
 class HTTP_Spew::Request
 
@@ -21,10 +23,9 @@ class HTTP_Spew::Request
   #
   # +sock+ may be the String representing an address created with
   # +Socket.pack_sockaddr_un+ or +Socket.pack_sockaddr_in+, or it
-  # may be an actual IO object with Kgio::SocketMethods mixed in
-  # (e.g. Kgio::Socket)
+  # may be an actual Socket object
   def initialize(env, input, sock, allow = nil)
-    @to_io = Kgio::SocketMethods === sock ? sock : Kgio::Socket.start(sock)
+    @to_io = BasicSocket === sock ? sock : start_sock(sock)
     if Hash === env
       @buf, @input = env_to_headers(env, input)
     else
@@ -37,18 +38,21 @@ class HTTP_Spew::Request
   # returns :wait_readable or :wait_writable if busy
   def resume
     if @buf
-      case rv = @to_io.kgio_trywrite(@buf)
-      when String # unlikely
-        @buf = rv # loop retry, socket buffer could've expanded
-      when Symbol
-        return rv
-      else # done writing, read more
-        @buf = @input ? @input.read(0x4000, @buf) : nil
+      case w = @to_io.write_nonblock(@buf, exception: false)
+      when :wait_writable, :wait_readable
+        return w
+      else # Integer
+        len = @buf.size
+        if w == len
+          @buf = @input ? @input.read(0x4000, @buf) : nil
+        else
+          tmp = @buf.byteslice(w, len - w)
+          @buf.clear
+          @buf = tmp # loop retry, socket buffer could've expanded
+        end
       end while @buf
-      read_response
-    else
-      read_response
     end
+    read_response
   end
 
   # returns a 3-element Rack response array on successful completion
@@ -64,7 +68,7 @@ class HTTP_Spew::Request
     timeout -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
     while :wait_readable == (rv = read_response) && timeout >= 0.0
       t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @to_io.kgio_wait_readable(timeout) if timeout > 0.0
+      @to_io.wait_readable(timeout) if timeout > 0.0
       timeout -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
     end
     rv
@@ -78,7 +82,7 @@ class HTTP_Spew::Request
   # Users do not need to call this directly, +resume+ will return the result
   # of this.
   def read_response
-    buf = @to_io.kgio_trypeek(0x4000) or
+    buf = @to_io.recv_nonblock(0x4000, Socket::MSG_PEEK, exception: false) or
       raise HttpSpew::EOF, "upstream server closed connection", []
     String === buf or return buf
 
@@ -91,7 +95,7 @@ class HTTP_Spew::Request
     end
 
     # discard the header data from the socket buffer
-    (hdr_len -= buf.size) > 0 and @to_io.kgio_read(hdr_len, buf)
+    (hdr_len -= buf.size) > 0 and @to_io.read(hdr_len, buf)
     @response = r << self
   end
 
@@ -102,10 +106,15 @@ class HTTP_Spew::Request
   # Called by Rack servers to write the response to a client
   def each
     buf = ""
-    while @to_io.kgio_read(0x4000, buf)
+    case @to_io.read_nonblock(0x4000, buf, exception: false)
+    when :wait_readable
+      @to_io.wait_readable
+    when nil
+      buf.clear
+      return
+    else
       yield buf
-    end
-    buf.clear
+    end while true
   end
 
   # Used internally by various HTTP_Spew elements to report errors
@@ -121,4 +130,13 @@ class HTTP_Spew::Request
     @to_io.close
     @input = nil
   end
+
+  def start_sock(ai)
+    ai = Addrinfo.new(ai) unless Addrinfo === ai
+    sock = Socket.new(ai.afamily, :SOCK_STREAM)
+    case sock.connect_nonblock(ai, exception: false)
+    when 0, :wait_writable
+    end
+    sock
+  end
 end

data/test/test_hit_n_run.rb

@@ -19,7 +19,8 @@ class TestHitNRun < Test::Unit::TestCase
   end
 
   def test_request_with_existing_socket
-    sock = Kgio::Socket.new(@sockaddr)
+    sock = TCPSocket.new(@addr, @port)
+    assert(BasicSocket === sock)
     req = HTTP_Spew::HitNRun.new(@env, nil, sock)
     assert_equal sock, req.to_io
     assert_nothing_raised { req.close }
@@ -30,8 +31,7 @@ class TestHitNRun < Test::Unit::TestCase
     req = HTTP_Spew::HitNRun.new(@env, nil, @sockaddr)
     sym = req.resume
     if sym == :wait_writable
-      set = Kgio.poll({req => sym}, 100)
-      assert_equal [ req ], set.keys
+      assert req.to_io.wait_writable(0.1)
       sym = req.resume
     end
     assert_equal HTTP_Spew::HitNRun::RESPONSE.object_id, sym.object_id
@@ -40,7 +40,7 @@ class TestHitNRun < Test::Unit::TestCase
   def test_request_loop
     req = HTTP_Spew::HitNRun.new(@env, nil, @sockaddr)
     until Array === (rv = req.resume)
-      Kgio.poll(req => rv)
+      req.__send__(rv)
     end
     assert_equal HTTP_Spew::HitNRun::RESPONSE.object_id, rv.object_id
   end

data/test/test_request.rb

@@ -19,7 +19,7 @@ class TestRequest < Test::Unit::TestCase
   end
 
   def test_request_with_existing_socket
-    sock = Kgio::Socket.new(@sockaddr)
+    sock = TCPSocket.new(@addr, @port)
     req = HTTP_Spew::Request.new(@env, nil, sock)
     assert_equal sock, req.to_io
     assert_nothing_raised { req.close }
@@ -31,13 +31,11 @@ class TestRequest < Test::Unit::TestCase
     sym = req.resume
     assert_kind_of(Symbol, sym)
     if sym == :wait_writable
-      set = Kgio.poll({req => sym}, 1000)
-      assert_equal [ req ], set.keys
+      assert req.to_io.wait_writable(1)
       sym = req.resume
     end
     assert_equal :wait_readable, sym
-    set = Kgio.poll({req => sym}, 1000)
-    assert_equal [ req ], set.keys
+    assert req.to_io.wait_readable(1)
     rv = req.resume
     assert_equal req, rv[2]
   end
@@ -45,7 +43,7 @@ class TestRequest < Test::Unit::TestCase
   def test_request_loop
     req = HTTP_Spew::Request.new(@env, nil, @sockaddr)
     until Array === (rv = req.resume)
-      Kgio.poll(req => rv)
+      req.to_io.__send__(rv) # wait_readable/wait_writable
     end
     assert_kind_of Array, rv
     assert_equal 3, rv.size

data/test/test_unexpected_response.rb

@@ -19,7 +19,7 @@ class TestRequest < Test::Unit::TestCase
   end
 
   def test_request_with_existing_socket
-    sock = Kgio::Socket.new(@sockaddr)
+    sock = TCPSocket.new(@addr, @port)
     req = HTTP_Spew::Request.new(@env, nil, sock)
     assert_equal sock, req.to_io
     assert_nothing_raised { req.close }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_spew
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
-- kcar hackers
+- http_spew hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kcar
@@ -30,39 +30,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: kgio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: olddoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: |-
   Do not use HTTP Spew for connecting to servers outside of your LAN.
   Do not use HTTP Spew without the permission of your server admins.
   Use HTTP Spew if you wish you could kinda multicast with HTTP...
-email: kcar@bogomips.org
+email: http_spew-public@bogomips.org
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -70,15 +42,6 @@ extra_rdoc_files:
 - README
 - NEWS
 - LATEST
-- lib/http_spew.rb
-- lib/http_spew/chunky_pipe.rb
-- lib/http_spew/class_methods.rb
-- lib/http_spew/content_md5.rb
-- lib/http_spew/headers.rb
-- lib/http_spew/hit_n_run.rb
-- lib/http_spew/input_spray.rb
-- lib/http_spew/request.rb
-- lib/http_spew/version.rb
 files:
 - ".document"
 - ".gitignore"
@@ -131,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -139,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: LAN-only HTTP spam^H^H^H^Hclient for Ruby
+summary: HTTP Spew - LAN-only HTTP spam^H^H^H^Hclient for Ruby
 test_files:
 - test/test_input_spray_with_md5.rb
 - test/test_mirror.rb