http_spew 0.4.1 → 0.5.0

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.4.1
+GIT_VERSION = 0.5.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,6 +1,5 @@
 all::
 RSYNC_DEST := bogomips.org:/srv/bogomips/http_spew
-rfproject := rainbows
 rfpackage := http_spew
 
 RUBY_VERSION_FILE = lib/http_spew/version.rb
@@ -10,7 +9,7 @@ include pkg.mk
 $(RUBY_VERSION_FILE): GIT-VERSION-FILE
 	@$(RM) -f $@+
 	@echo >> $@+ '# -*- encoding: binary -*-'
-	@echo >> $@+ 'HTTP_Spew.const_set :VERSION, "$(GIT_VERSION)"'
+	@echo >> $@+ 'HTTP_Spew.const_set :VERSION, "$(GIT_VERSION)".freeze'
 	@mv $@+ $@
 
 build: $(RUBY_VERSION_FILE)

data/LATEST

@@ -1,4 +1,20 @@
-=== http_spew 0.4.1 / 2012-09-23 00:01 UTC
+=== http_spew 0.5.0 / 2016-10-31 20:43 UTC
 
-  Fix formatting of user-supplied headers.
+  This release requires Ruby 2.1 or later.
+
+  13 changes since 0.4.1:
+
+        gemspec: require kcar >= 0.3.1
+        test/helper: explicit redirect for Ruby 2.0.0
+        update packaging + docs (website)
+        allow all future GPL versions
+        add benchmark scripts
+        relax dependency on unicorn
+        declare empty classes with constant assignment
+        test_upload: use object_id to check matches
+        use frozen string literals for Ruby 2.1+
+        merge into kcar project and mailing list
+        dedicated mailing list
+        rely on opt_str_freeze in more places
+        use monotonic clock for timing
 

data/LICENSE

@@ -1,17 +1,14 @@
-HTTP Spew is copyrighted Free Software by all contributors, see logs in
+http_spew is copyrighted Free Software by all contributors, see logs in
 revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it under the terms of the GNU
-General Public License, version 2 *or* 3 ({GPLv3}[link:COPYING]) as
-published by the Free Software Foundation.  The project leader
-(Eric Wong) reserves the right to relicense HTTP Spew under future versions
-of the GPL.
+General Public License as published by the Free Software Foundation;
+either version 2 of the License, or (at your option) any later version.
 
-HTTP Spew is distributed in the hope that it will be useful, but WITHOUT
+http_spew is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-You should have received a copy of the GNU General Public License
-along with HTTP Spew; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+You should have received a copy of the GNU General Public License along
+with this program; if not, see https://www.gnu.org/licenses/gpl-2.0.txt

data/NEWS

@@ -1,3 +1,23 @@
+=== http_spew 0.5.0 / 2016-10-31 20:43 UTC
+
+  This release requires Ruby 2.1 or later.
+
+  13 changes since 0.4.1:
+
+        gemspec: require kcar >= 0.3.1
+        test/helper: explicit redirect for Ruby 2.0.0
+        update packaging + docs (website)
+        allow all future GPL versions
+        add benchmark scripts
+        relax dependency on unicorn
+        declare empty classes with constant assignment
+        test_upload: use object_id to check matches
+        use frozen string literals for Ruby 2.1+
+        merge into kcar project and mailing list
+        dedicated mailing list
+        rely on opt_str_freeze in more places
+        use monotonic clock for timing
+
 === http_spew 0.4.1 / 2012-09-23 00:01 UTC
 
   Fix formatting of user-supplied headers.

data/README

@@ -11,7 +11,6 @@ Use HTTP Spew if you wish you could kinda multicast with HTTP...
 * No support for DNS resolution (WONTFIX, ever)
 * No support for HTTPS
 * No support for keepalive (yet?)
-* No support for Ruby 1.8, this is Ruby 1.9-only
 * Not remotely RFC-compliant
 * Messes up analytics/reporting on servers
 * Resets server connections
@@ -39,7 +38,7 @@ You can get the latest source via git from the following locations:
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://bogomips.org/http_spew.git (cgit)
+* https://bogomips.org/http_spew.git
 * http://repo.or.cz/w/http_spew.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
@@ -54,8 +53,8 @@ don't email the git mailing list or maintainer with http_spew patches.
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:http.spew@librelist.org
+requests) go to the mailing list: mailto:http_spew-public@bogomips.org
 
-Mailing list archives in mbox format may be downloaded here:
+Mailing list archives may be viewed and downloaded here:
 
-http://bogomips.org/http_spew/archives/
+https://bogomips.org/http_spew-public/

data/benchmark/bm_content_md5.rb

@@ -0,0 +1,52 @@
+# -*- encoding: binary -*-
+require "./test/helper"
+require "benchmark"
+
+class TestBMContentMD5 < Test::Unit::TestCase
+  def setup
+    @addr, @port, @srv = start_server("./test/content-md5.ru", 1)
+    @sockaddr = Socket.pack_sockaddr_in(@port, @addr)
+    @env = {
+      "REQUEST_METHOD" => "PUT",
+      "REQUEST_URI" => "/",
+      "HTTP_HOST" => "example.com",
+    }
+    @tmpfiles = []
+    @bs = ENV['bs'] ? ENV['bs'].to_i : 1024 * 1024
+    @count = ENV['count'] ? ENV['count'].to_i : 1000
+    @cmd = %w(dd if=/dev/zero)
+    @cmd << "bs=#@bs"
+    @cmd << "count=#@count"
+  end
+
+  def teardown
+    Process.kill(:QUIT, @srv)
+    Process.waitpid2(@srv)
+    @tmpfiles.each { |tmp| tmp.closed? or tmp.close! }
+  end
+
+  def test_upload_with_md5
+    rd, wr = IO.pipe
+    pid = fork do
+      $stdout.reopen(wr)
+      rd.close
+      wr.close
+      exec(*@cmd)
+    end
+    wr.close
+    @env["CONTENT_LENGTH"] = (@bs * @count).to_s
+    @env["rack.input"] = rd
+    input = HTTP_Spew::ContentMD5.new(@env)
+    assert_nil @env["CONTENT_LENGTH"]
+    assert_equal "chunked", @env["HTTP_TRANSFER_ENCODING"]
+    req = HTTP_Spew::Request.new(@env, input, @sockaddr)
+    rv = nil
+    res = Benchmark.measure do
+      rv = req.run(100000)
+    end
+    assert_equal 200, rv[0].to_i
+    pid, status = Process.waitpid2(pid)
+    assert status.success?
+    p res
+  end
+end

data/benchmark/bm_content_md5_input_spray.rb

@@ -0,0 +1,59 @@
+require "./test/helper"
+require "benchmark"
+
+class TestBMContentMD5InputSpray < Test::Unit::TestCase
+  def setup
+    @nr = 4
+    @addr, @port, @srv = start_server("./test/content-md5.ru", @nr)
+    @sockaddr = Socket.pack_sockaddr_in(@port, @addr)
+    @env = {
+      "REQUEST_METHOD" => "PUT",
+      "REQUEST_URI" => "/",
+      "HTTP_HOST" => "example.com",
+    }
+    @tmpfiles = []
+    @bs = ENV['bs'] ? ENV['bs'].to_i : 1024 * 1024
+    @count = ENV['count'] ? ENV['count'].to_i : 1000
+    @cmd = %w(dd if=/dev/zero)
+    @cmd << "bs=#@bs"
+    @cmd << "count=#@count"
+  end
+
+  def teardown
+    Process.kill(:QUIT, @srv)
+    Process.waitpid2(@srv)
+    @tmpfiles.each { |tmp| tmp.closed? or tmp.close! }
+  end
+
+  def test_spray_with_md5
+    rd, wr = IO.pipe
+    pid = fork do
+      $stdout.reopen(wr)
+      rd.close
+      wr.close
+      exec(*@cmd)
+    end
+    wr.close
+    @env["CONTENT_LENGTH"] = (@bs * @count).to_s
+    @env["rack.input"] = rd
+    input = HTTP_Spew::ContentMD5.new(@env)
+    sprayer = HTTP_Spew::InputSpray.new(@env, @nr, input)
+    assert_nil @env["CONTENT_LENGTH"]
+    assert_equal "chunked", @env["HTTP_TRANSFER_ENCODING"]
+    reqs = sprayer.readers.map do |md5_input|
+      HTTP_Spew::Request.new(@env, md5_input, @sockaddr)
+    end
+    assert_equal @nr, reqs.size
+    rv = nil
+    res = Benchmark.measure do
+      rv = HTTP_Spew.wait_mt reqs.size, reqs, 3600
+    end
+    assert_equal @nr, rv.size
+    rv.each do |resp|
+      assert_equal 200, resp.response[0].to_i
+    end
+    pid, status = Process.waitpid2(pid)
+    assert status.success?
+    p res
+  end
+end

data/http_spew.gemspec

@@ -1,24 +1,23 @@
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
+require 'olddoc'
+extend Olddoc::Gemspec
 name, summary, title = readme_metadata
 
 Gem::Specification.new do |s|
   s.name = %q{http_spew}
   s.version = ENV["VERSION"].dup
-  s.authors = ["HTTP Spew hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
+  s.authors = ["kcar hackers"]
   s.description = readme_description
-  s.email = %q{http.spew@librelist.org}
+  s.email = %q{kcar@bogomips.org}
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
+  s.homepage = Olddoc.config['rdoc_url']
   s.summary = summary
-  s.rdoc_options = rdoc_options
-  s.rubyforge_project = %q{rainbows}
   s.test_files = Dir["test/test_*.rb"]
-  s.add_dependency(%q<kcar>, "~> 0.3")
+  s.add_dependency(%q<kcar>, [ "~> 0.3", ">= 0.3.1"])
   s.add_dependency(%q<kgio>, "~> 2.6")
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
+  s.add_development_dependency(%q<olddoc>, "~> 1.0")
+  s.required_ruby_version = '>= 2.1'
+  s.licenses = %w(GPL-2.0+)
 end

data/lib/http_spew/class_methods.rb

@@ -41,11 +41,11 @@ module HTTP_Spew::ClassMethods
   end
 
   def with_timeout(t)
-    t0 = Time.now
+    t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     yield
-    ensure
-      t[0] -= Time.now - t0
-      t[0] = 0.0 if t[0] < 0
+  ensure
+    t[0] -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
+    t[0] = 0.0 if t[0] < 0
   end
 
   # Returns an array of requests that are complete, including those
@@ -60,7 +60,7 @@ module HTTP_Spew::ClassMethods
       active << Thread.new do
         begin
           rv = req.run(timeout)
-          w.write([ i ].pack("v"))
+          w.write([ i ].pack("v".freeze))
           rv
         rescue => err
           err
@@ -69,7 +69,7 @@ module HTTP_Spew::ClassMethods
     end
     begin
       with_timeout(t) { r.kgio_wait_readable(t[0]) }
-      req_idx = r.read(2).unpack("v")[0]
+      req_idx = r.read(2).unpack("v".freeze)[0]
       thr = active[req_idx]
       with_timeout(t) { thr.join(t[0]) }
       rv = thr.value

data/lib/http_spew/content_md5.rb

@@ -7,17 +7,16 @@ class HTTP_Spew::ContentMD5
   attr_reader :content_md5
   attr_reader :bytes_digested
 
-  CRLF = "\r\n" # :nodoc:
-
   def initialize(env, input = env["rack.input"])
     if trailer = env["HTTP_TRAILER"]
       unless trailer.split(/\s*,\s*/).grep(/\AContent-MD5\z/i)[0]
-        trailer << (trailer.empty? ? "Content-MD5" : ",Content-MD5")
+        trailer << (trailer.empty? ? "Content-MD5".freeze
+                                   : ",Content-MD5".freeze)
       end
     else
-      env["HTTP_TRAILER"] = "Content-MD5"
+      env["HTTP_TRAILER"] = "Content-MD5".freeze
     end
-    env["HTTP_TRANSFER_ENCODING"] = "chunked"
+    env["HTTP_TRANSFER_ENCODING"] = "chunked".freeze
     @to_io, wr = HTTP_Spew::ChunkyPipe.new
     expect_md5 = env.delete("HTTP_CONTENT_MD5")
     expect_len = env.delete("CONTENT_LENGTH")
@@ -41,7 +40,7 @@ class HTTP_Spew::ContentMD5
             @bytes_digested += n
             wr.write("#{n.to_s(16)}\r\n")
             digest.update(buf)
-            wr.write(buf << CRLF)
+            wr.write(buf << "\r\n".freeze)
           end while input.read(0x4000, buf)
         end
         if expect_len && expect_len.to_i != @bytes_digested

data/lib/http_spew/headers.rb

@@ -1,18 +1,10 @@
 # -*- encoding: binary -*-
 module HTTP_Spew::Headers
-  # :stopdoc:
-  REQUEST_METHOD = "REQUEST_METHOD"
-  REQUEST_URI = "REQUEST_URI"
-  CRLF = "\r\n"
-  QUERY_STRING = "QUERY_STRING"
-  PATH_INFO = "PATH_INFO"
-  CONTENT_TYPE = "CONTENT_TYPE" # specified by Rack to be !/^HTTP_/
-  # :startdoc:
 
   # regenerates the request_uri from a Rack +env+
   def request_uri(env)
-    qs = env[QUERY_STRING]
-    qs.size == 0 ? env[PATH_INFO] : "#{env[PATH_INFO]}?#{qs}"
+    qs = env['QUERY_STRING']
+    qs.size == 0 ? env['PATH_INFO'] : "#{env['PATH_INFO']}?#{qs}"
   end
   module_function :request_uri
 
@@ -27,26 +19,25 @@ module HTTP_Spew::Headers
   #
   #   buf, input = env_to_headers(env, input)
   def env_to_headers(env, input)
-    req = "#{env[REQUEST_METHOD]} " \
-          "#{env[REQUEST_URI] || request_uri(env)} HTTP/1.1\r\n" \
+    req = "#{env['REQUEST_METHOD']} " \
+          "#{env['REQUEST_URI'] || request_uri(env)} HTTP/1.1\r\n" \
           "Connection: close\r\n"
-    uscore, dash = "_", "-"
     env.each do |key,value|
       %r{\AHTTP_(\w+)\z} =~ key or next
       key = $1
       %r{\A(?:VERSION|EXPECT|TRANSFER_ENCODING|CONNECTION|KEEP_ALIVE)\z}x =~
         key and next
 
-      key.tr!(uscore, dash)
+      key.tr!('_'.freeze, '-'.freeze)
       req << "#{key}: #{value}\r\n"
     end
     if input
       req << (input.respond_to?(:size) ?
              "Content-Length: #{input.size}\r\n" :
-             "Transfer-Encoding: chunked\r\n")
-      ct = env[CONTENT_TYPE] and req << "Content-Type: #{ct}\r\n"
+             "Transfer-Encoding: chunked\r\n".freeze)
+      ct = env['CONTENT_TYPE'] and req << "Content-Type: #{ct}\r\n"
     end
-    req << CRLF
+    req << "\r\n".freeze
     String === input ? (req << input) : [ req, input ]
   end
   module_function :env_to_headers

data/lib/http_spew/request.rb

@@ -55,17 +55,17 @@ class HTTP_Spew::Request
   # returns a 3-element Rack response array on successful completion
   # returns an Exception if one was raised
   def run(timeout)
-    t0 = Time.now
+    t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     buf, @buf = @buf, nil # make inspect nicer
     @to_io.write(buf)
     if @input
       @to_io.write(buf) while @input.read(0x4000, buf)
     end
-    timeout -= (Time.now - t0)
+    timeout -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
     while :wait_readable == (rv = read_response) && timeout >= 0.0
-      t0 = Time.now
+      t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       @to_io.kgio_wait_readable(timeout) if timeout > 0.0
-      timeout -= (Time.now - t0)
+      timeout -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
     end
     rv
     rescue => e

data/lib/http_spew/version.rb

@@ -1,2 +1,2 @@
 # -*- encoding: binary -*-
-HTTP_Spew.const_set :VERSION, "0.4.1"
+HTTP_Spew.const_set :VERSION, "0.5.0".freeze

data/lib/http_spew.rb

@@ -8,20 +8,20 @@ module HTTP_Spew
   autoload :HitNRun, "http_spew/hit_n_run"
   autoload :InputSpray, "http_spew/input_spray"
 
-  class Error < RuntimeError; end
-  class TimeoutError < Error; end
-  class ConnectionReset < Error; end
-  class RequestError < Error; end
-  class UnexpectedResponse < RequestError; end
-  class ChecksumError < HTTP_Spew::Error; end
-  class LengthError < HTTP_Spew::Error; end
-  class NoWritersError < HTTP_Spew::Error; end
-  class EOF < EOFError; end
+  Error = Class.new(RuntimeError)
+  TimeoutError = Class.new(Error)
+  ConnectionReset = Class.new(Error)
+  RequestError = Class.new(Error)
+  UnexpectedResponse = Class.new(RequestError)
+  ChecksumError = Class.new(Error)
+  LengthError = Class.new(Error)
+  NoWritersError = Class.new(Error)
+  EOF = Class.new(EOFError)
 
-  require "http_spew/version"
-  require "http_spew/headers"
-  require "http_spew/request"
-  require "http_spew/class_methods"
+  require_relative "http_spew/version"
+  require_relative "http_spew/headers"
+  require_relative "http_spew/request"
+  require_relative "http_spew/class_methods"
 
   extend HTTP_Spew::ClassMethods
 end

data/pkg.mk

@@ -1,7 +1,8 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
-WRONGDOC = wrongdoc
+OLDDOC = olddoc
+RDOC = rdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -12,14 +13,6 @@ RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 lib := lib
 
-ifeq ($(shell test -f script/isolate_for_tests && echo t),t)
-isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk
-$(isolate_libs): script/isolate_for_tests
-	@$(RUBY) script/isolate_for_tests
--include $(isolate_libs)
-lib := $(lib):$(ISOLATE_LIBS)
-endif
-
 ext := $(firstword $(wildcard ext/*))
 ifneq ($(ext),)
 ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION)
@@ -36,7 +29,7 @@ $(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d)
 	install -m 644 $< $@
 $(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h)
 	$(RM) -f $(@D)/*.o
-	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb
+	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb $(EXTCONF_ARGS)
 ext_sfx := _ext.$(DLEXT)
 ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
 $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
@@ -48,10 +41,10 @@ else
 build:
 endif
 
-pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	$(WRONGDOC) prepare
-NEWS LATEST: ChangeLog
+pkg_extra += GIT-VERSION-FILE NEWS LATEST
+NEWS: GIT-VERSION-FILE .olddoc.yml
+	$(OLDDOC) prepare
+LATEST: NEWS
 
 manifest:
 	$(RM) .manifest
@@ -63,28 +56,20 @@ manifest:
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc:: .document .wrongdoc.yml $(pkg_extra)
+doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(WRONGDOC) all
-	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	$(RDOC) -f oldweb
+	$(OLDDOC) merge
+	if test -f COPYING; then install -m644 COPYING doc/COPYING; fi
+	install -m644 NEWS doc/NEWS
+	install -m644 NEWS.atom.xml doc/NEWS.atom.xml
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
 pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	$(WRONGDOC) release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	$(WRONGDOC) release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release
 verify:
@@ -120,31 +105,18 @@ $(pkgtgz): manifest fix-perms
 
 package: $(pkgtgz) $(pkggem)
 
-test-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	@echo rubyforge add_release -f \
-	  -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	@echo gem push $(pkggem)
-	@echo rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+release:: verify package
 	# push gem to RubyGems.org
 	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
 
-all:: test
+all:: check
 test_units := $(wildcard test/test_*.rb)
-test: test-unit
+test: check
+check: test-unit
 test-unit: $(test_units)
 $(test_units): build
 	$(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
@@ -154,8 +126,6 @@ ifneq ($(RSYNC_DEST),)
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
-	find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
 	$(MAKE) doc_gz
 	$(RSYNC) -av doc/ $(RSYNC_DEST)/
 	git ls-files | xargs touch
@@ -163,13 +133,18 @@ endif
 
 # Create gzip variants of the same timestamp as the original so nginx
 # "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
+doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.gz$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
 check-warnings:
-	@(for i in $$(git ls-files '*.rb'|grep -v '^setup\.rb$$'); \
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
 	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
-.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+ifneq ($(PLACEHOLDERS),)
+$(PLACEHOLDERS):
+	echo olddoc_placeholder > $@
+endif
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc check test $(test_units) manifest
 .PHONY: check-warnings

data/test/helper.rb

@@ -10,6 +10,7 @@ require "rack"
 require "tempfile"
 $-w = true
 require "http_spew"
+HAVE_UNICORN = `which unicorn 2>/dev/null`.size > 0
 
 def start_server(config, worker_processes = 4, rewindable_input = false)
   ENV["RACK_ENV"] = "deployment"
@@ -32,7 +33,8 @@ EOF
   cfg.flush
   pid = fork do
     ENV["UNICORN_FD"] = sock.fileno.to_s
-    exec "unicorn", "-l#{addr}:#{port}", "-c#{cfg.path}", config
+    redirect = { sock => sock } if RUBY_VERSION.to_f >= 2.0
+    exec "unicorn", "-l#{addr}:#{port}", "-c#{cfg.path}", config, redirect
   end
   File.open(fifo_path).close
   File.unlink fifo_path

data/test/test_content_md5.rb

@@ -102,4 +102,4 @@ class TestContentMD5 < Test::Unit::TestCase
     assert_equal expect_md5, input.content_md5
     assert_equal 123 * 8 * 1021 * 13, input.bytes_digested
   end
-end
+end if HAVE_UNICORN

data/test/test_hit_n_run.rb

@@ -44,4 +44,4 @@ class TestHitNRun < Test::Unit::TestCase
     end
     assert_equal HTTP_Spew::HitNRun::RESPONSE.object_id, rv.object_id
   end
-end
+end if HAVE_UNICORN

data/test/test_input_spray_with_md5.rb

@@ -60,9 +60,9 @@ class TestInputSprayWithMD5 < Test::Unit::TestCase
       HTTP_Spew::Request.new(@env, md5_input, @sockaddr)
     end
     assert_equal @nr, reqs.size
-    t0 = Time.now
+    t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     rv = HTTP_Spew.wait_mt reqs.size, reqs, 3600
-    elapsed = Time.now - t0
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
     assert(elapsed <= 30, "took too long: #{elapsed}s")
     assert_equal @nr, rv.size
     rv.each { |r|
@@ -104,4 +104,4 @@ class TestInputSprayWithMD5 < Test::Unit::TestCase
     assert_equal expect_md5, input.content_md5
     assert_equal 123 * 8 * 1021 * 13, input.bytes_digested
   end
-end
+end if HAVE_UNICORN