raindrops 0.13.0 → 0.19.2

data/lib/raindrops/linux.rb

@@ -8,15 +8,13 @@
 # Instead of snapshotting, Raindrops::Aggregate::LastDataRecv may be used
 # to aggregate statistics from +all+ accepted sockets as they arrive
 # based on the +last_data_recv+ field in Raindrops::TCP_Info
-require 'pathname'
 
 module Raindrops::Linux
 
   # The standard proc path for active UNIX domain sockets, feel free to call
   # String#replace on this if your /proc is mounted in a non-standard location
   # for whatever reason
-  PROC_NET_UNIX_ARGS = %w(/proc/net/unix)
-  defined?(::Encoding) and PROC_NET_UNIX_ARGS.push({ :encoding => "binary" })
+  PROC_NET_UNIX_ARGS = [ '/proc/net/unix', { encoding: "binary" }]
 
   # Get ListenStats from an array of +paths+
   #
@@ -43,10 +41,11 @@ def unix_listener_stats(paths = nil)
     else
       paths = paths.map do |path|
         path = path.dup
-        path.force_encoding(Encoding::BINARY) if defined?(Encoding)
+        path.force_encoding(Encoding::BINARY)
         if File.symlink?(path)
           link = path
-          path = Pathname.new(link).realpath.to_s
+          path = File.readlink(link)
+          path.force_encoding(Encoding::BINARY)
           rv[link] = rv[path] # vivify ListenerStats
         else
           rv[path] # vivify ListenerStats
@@ -57,7 +56,7 @@ def unix_listener_stats(paths = nil)
     paths = /^\w+: \d+ \d+ (\d+) \d+ (\d+)\s+\d+ (#{paths.join('|')})$/n
 
     # no point in pread since we can't stat for size on this file
-    File.read(*PROC_NET_UNIX_ARGS).scan(paths) do |s|
+    File.read(PROC_NET_UNIX_ARGS[0], encoding: 'binary').scan(paths) do |s|
       path = s[-1]
       case s[0]
       when "00000000" # client sockets

data/lib/raindrops/middleware.rb

@@ -62,9 +62,9 @@
 # = Demo Server
 #
 # There is a server running this middleware (and Watcher) at
-#  http://raindrops-demo.bogomips.org/_raindrops
+#  https://yhbt.net/raindrops-demo/_raindrops
 #
-# Also check out the Watcher demo at http://raindrops-demo.bogomips.org/
+# Also check out the Watcher demo at https://yhbt.net/raindrops-demo/
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.
@@ -77,11 +77,9 @@ class Raindrops::Middleware
   # and both counters are updated atomically.
   #
   # This is supported on all operating systems supported by Raindrops
-  class Stats < Raindrops::Struct.new(:calling, :writing)
-  end
+  Stats = Raindrops::Struct.new(:calling, :writing)
 
   # :stopdoc:
-  PATH_INFO = "PATH_INFO"
   require "raindrops/middleware/proxy"
   # :startdoc:
 
@@ -111,7 +109,7 @@ def initialize(app, opts = {})
 
   # standard Rack endpoint
   def call(env) # :nodoc:
-    env[PATH_INFO] == @path and return stats_response
+    env['PATH_INFO'] == @path and return stats_response
     begin
       @stats.incr_calling
 

data/lib/raindrops/middleware/proxy.rb

@@ -27,9 +27,9 @@ def to_path
 
   # Rack servers use +respond_to?+ to check for the presence of +close+
   # and +to_path+ methods.
-  def respond_to?(m)
+  def respond_to?(m, include_all = false)
     m = m.to_sym
-    :close == m || @body.respond_to?(m)
+    :close == m || @body.respond_to?(m, include_all)
   end
 
   # Avoid breaking users of non-standard extensions (e.g. #body)

data/lib/raindrops/watcher.rb

@@ -8,7 +8,7 @@
 # Raindrops::Watcher is a stand-alone Rack application for watching
 # any number of TCP and UNIX listeners (all of them by default).
 #
-# It depends on the {Aggregate RubyGem}[http://rubygems.org/gems/aggregate]
+# It depends on the {Aggregate RubyGem}[https://rubygems.org/gems/aggregate]
 #
 # In your Rack config.ru:
 #
@@ -35,28 +35,28 @@
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.txt
+# e.g.: curl https://yhbt.net/raindrops-demo/active/0.0.0.0%3A80.txt
 #
 # === GET /active/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.html
+# e.g.: curl https://yhbt.net/raindrops-demo/active/0.0.0.0%3A80.html
 #
 # === GET /queued/$LISTENER.txt
 #
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.txt
+# e.g.: curl https://yhbt.net/raindrops-demo/queued/0.0.0.0%3A80.txt
 #
 # === GET /queued/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
+# e.g.: curl https://yhbt.net/raindrops-demo/queued/0.0.0.0%3A80.html
 #
 # === POST /reset/$LISTENER
 #
@@ -95,9 +95,9 @@
 #
 # = Demo Server
 #
-# There is a server running this app at http://raindrops-demo.bogomips.org/
+# There is a server running this app at https://yhbt.net/raindrops-demo/
 # The Raindrops::Middleware demo is also accessible at
-# http://raindrops-demo.bogomips.org/_raindrops
+# https://yhbt.net/raindrops-demo/_raindrops
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.
@@ -106,7 +106,7 @@ class Raindrops::Watcher
   attr_reader :snapshot
   include Rack::Utils
   include Raindrops::Linux
-  DOC_URL = "http://raindrops.bogomips.org/Raindrops/Watcher.html"
+  DOC_URL = "https://yhbt.net/raindrops/Raindrops/Watcher.html"
   Peak = Struct.new(:first, :last)
 
   def initialize(opts = {})
@@ -244,10 +244,10 @@ def agg_to_hash(reset_at, agg, current, peak)
   def histogram_txt(agg)
     updated_at, reset_at, agg, current, peak = *agg
     headers = agg_to_hash(reset_at, agg, current, peak)
-    body = agg.to_s
+    body = agg.to_s # 7-bit ASCII-clean
     headers["Content-Type"] = "text/plain"
     headers["Expires"] = (updated_at + @delay).httpdate
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -265,7 +265,7 @@ def histogram_html(agg, addr)
       "</body>"
     headers["Content-Type"] = "text/html"
     headers["Expires"] = (updated_at + @delay).httpdate
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -364,7 +364,7 @@ def index
         "for more information and options." \
       "</p>" \
       "</body></html>"
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -382,7 +382,7 @@ def initialize(rdmon, addr, env) # :nodoc:
       q = Rack::Utils.parse_query env["QUERY_STRING"]
       @active_min = q["active_min"].to_i
       @queued_min = q["queued_min"].to_i
-      len = Rack::Utils.bytesize(addr)
+      len = addr.size
       len = 35 if len > 35
       @fmt = "%20s % #{len}s % 10u % 10u\n"
       case env["HTTP_VERSION"]

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
+	$(RDOC) -f dark216
+	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
+	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:
@@ -101,7 +86,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): manifest fix-perms
 	gem build $(rfpackage).gemspec
@@ -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,16 +126,15 @@ 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)/
+	$(RSYNC) -av doc/ $(RSYNC_DEST)/ \
+		--exclude index.html* --exclude created.rid*
 	git ls-files | xargs touch
 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
@@ -171,5 +142,10 @@ check-warnings:
 	@(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/raindrops.gemspec

@@ -1,33 +1,26 @@
 # -*- encoding: binary -*-
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 test_files = manifest.grep(%r{\Atest/test_.*\.rb\z})
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
-name, summary, title = readme_metadata
 
 Gem::Specification.new do |s|
   s.name = %q{raindrops}
-  s.version = ENV["VERSION"].dup
-
+  s.version = (ENV["VERSION"] ||= '0.18.0').dup
   s.authors = ["raindrops hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
-  s.description = readme_description
-  s.email = %q{raindrops@librelist.org}
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{raindrops-public@yhbt.net}
   s.extensions = %w(ext/raindrops/extconf.rb)
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
-  s.summary = summary
-  s.rdoc_options = rdoc_options
-  s.rubyforge_project = %q{rainbows}
+  s.homepage = 'https://yhbt.net/raindrops/'
+  s.summary = 'real-time stats for preforking Rack servers'
+  s.required_ruby_version = '>= 1.9.3'
   s.test_files = test_files
   s.add_development_dependency('aggregate', '~> 0.2')
-  s.add_development_dependency('io-extra', [ '~> 1.2', '>= 1.2.3'])
+  s.add_development_dependency('test-unit', '~> 3.0')
   s.add_development_dependency('posix_mq', '~> 2.0')
-  s.add_development_dependency('rack', '~> 1.2')
-  s.add_development_dependency('unicorn', '>= 0.98')
-  s.add_development_dependency('wrongdoc', ['~> 1.6.2', '>= 1.6.2'])
-
-  s.licenses = %w(LGPLv2.1+)
+  s.add_development_dependency('rack', [ '>= 1.2', '< 3.0' ])
+  s.licenses = %w(LGPL-2.1+)
 end

data/test/ipv6_enabled.rb

@@ -2,8 +2,8 @@ def ipv6_enabled?
   tmp = TCPServer.new(ENV["TEST_HOST6"] || '::1', 0)
   tmp.close
   true
-  rescue => e
-    warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:"
-    warn "  #{e.class}: #{e}"
-    false
+rescue => e
+  warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:"
+  warn "  #{e.class}: #{e}"
+  false
 end

data/test/test_aggregate_pmq.rb

@@ -3,7 +3,7 @@
 pmq = begin
   Raindrops::Aggregate::PMQ
 rescue LoadError => e
-  warn "W: #{e} skipping test"
+  warn "W: #{e} skipping #{__FILE__}"
   false
 end
 if RUBY_VERSION.to_f < 1.9

data/test/test_inet_diag_socket.rb

@@ -8,7 +8,7 @@ class TestInetDiagSocket < Test::Unit::TestCase
   def test_new
     sock = Raindrops::InetDiagSocket.new
     assert_kind_of Socket, sock
-    assert_kind_of Fixnum, sock.fileno
+    assert_kind_of Integer, sock.fileno
     flags = sock.fcntl(Fcntl::F_GETFD)
     assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
     assert_nil sock.close

data/test/test_last_data_recv_unicorn.rb

@@ -7,7 +7,7 @@
 pmq = begin
   Raindrops::Aggregate::PMQ
 rescue LoadError => e
-  warn "W: #{e} skipping test"
+  warn "W: #{e} skipping #{__FILE__}"
   false
 end
 if RUBY_VERSION.to_f < 1.9

data/test/test_linux.rb

@@ -76,6 +76,7 @@ def test_unix_all_unused
 
     assert_equal 0, stats[tmp.path].active
     assert_equal 0, stats[tmp.path].queued
+    us.close
   end
 
   def test_unix_resolves_symlinks
@@ -151,8 +152,8 @@ def test_tcp_reuse_sock
     assert_equal 1, stats.size
     assert_equal 0, stats[addr].queued
     assert_equal 1, stats[addr].active
-    ensure
-      nlsock.close
+  ensure
+    nlsock.close
   end
 
   def test_tcp_multi
@@ -214,6 +215,13 @@ def test_tcp_multi
     assert_equal 0, stats[addr1].active
     assert_equal 1, stats[addr2].queued
     assert_equal 1, stats[addr2].active
+
+    # make sure we don't leave "true" placeholders in results if a
+    # listener becomes invalid (even momentarily).
+    s2.close
+    stats = tcp_listener_stats(addrs)
+    assert stats.values.all? { |x| x.instance_of?(Raindrops::ListenStats) },
+      "placeholders left: #{stats.inspect}"
   end
 
   # tries to overflow buffers