raindrops 0.1.0 → 0.2.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -2,6 +2,7 @@
 all::
 RUBY = ruby
 RAKE = rake
+RSYNC = rsync
 GIT_URL = git://git.bogomips.org/raindrops.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@@ -49,7 +50,10 @@ NEWS: GIT-VERSION-FILE
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE =
+latest: NEWS
+	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' $<
+
+SINCE = 0.1.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
@@ -67,10 +71,10 @@ cgit_atom := http://git.bogomips.org/cgit/raindrops.git/atom/?h=master
 atom = <link rel="alternate" title="Atom feed" href="$(1)" \
              type="application/atom+xml"/>
 
-# using rdoc 2.4.1+
+# using rdoc 2.5.x
 doc: .document NEWS ChangeLog
 	for i in $(man1_bins); do > $$i; done
-	rdoc -Na -t "$(shell sed -ne '1s/^= //p' README)"
+	rdoc -a -t "$(shell sed -ne '1s/^= //p' README)"
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document) doc/
 	cd doc && for i in $(base_bins); do \
@@ -169,4 +173,25 @@ test-unit: $(test_units)
 $(test_units): build
 	$(RUBY) -I lib:ext/raindrops $@
 
+# this requires GNU coreutils variants
+publish_doc:
+	-git set-file-times
+	$(RM) -r doc ChangeLog NEWS
+	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
+	$(MAKE) -s latest > doc/LATEST
+	find doc/images doc/js -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
+	$(MAKE) doc_gz
+	chmod 644 $$(find doc -type f)
+	$(RSYNC) -av doc/ raindrops.bogomips.org:/srv/raindrops/
+	git ls-files | xargs touch
+
+# 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:
+	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
+	for i in $(docs); do \
+	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+
 .PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test $(test_units)

data/README

@@ -87,7 +87,11 @@ combination of TCP or Unix domain socket names:
 
         use Raindrops::Middleware, :listeners => %w(0.0.0.0:80 /tmp/.sock)
 
-See the tests/ and examples/ directory for more examples
+See the tests/ and examples/ directory for more examples.
+
+If you're running Unicorn 0.98.0 or later, you don't have to pass in
+the :listeners array, Raindrops will automatically detect the listeners
+used by Unicorn master process.
 
 == Development
 
@@ -115,3 +119,12 @@ don't email the git mailing list or maintainer with raindrops patches.
 
 All feedback (bug reports, user/development discussion, patches, pull
 requests) go to the mailing list: mailto:raindrops@librelist.com
+
+The mailing list is mirrored to Gmane, all information about the
+group is here:
+
+http://gmane.org/info.php?group=gmane.comp.lang.ruby.raindrops.general
+
+Mailing list archives in mbox format may be downloaded here:
+
+http://raindrops.bogomips.org/archives/

data/examples/config.ru

@@ -0,0 +1,5 @@
+# sample stand-alone rackup application
+require 'rack/lobster'
+require 'raindrops'
+use Raindrops::Middleware
+run Rack::Lobster.new

data/ext/raindrops/linux_inet_diag.c

@@ -338,5 +338,5 @@ void Init_raindrops_linux_inet_diag(void)
 
 	page_size = getpagesize();
 
-	assert(OPLEN <= page_size && "bytecode OPLEN is no <= PAGE_SIZE");
+	assert(OPLEN <= page_size && "bytecode OPLEN is not <= PAGE_SIZE");
 }

data/lib/raindrops.rb

@@ -1,8 +1,8 @@
 # -*- encoding: binary -*-
 class Raindrops
 
-  # Raindrops is currently at version 0.1.0
-  VERSION = '0.1.0'
+  # Raindrops is currently at version 0.2.0
+  VERSION = '0.2.0'
 
   # Used to represent the number of +active+ and +queued+ sockets for
   # a single listen socket across all threads and processes on a

data/lib/raindrops/linux.rb

@@ -5,7 +5,8 @@ module 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 = "/proc/net/unix"
+  PROC_NET_UNIX_ARGS = %w(/proc/net/unix)
+  defined?(::Encoding) and PROC_NET_UNIX_ARGS.push({ :encoding => "binary" })
 
   # Get ListenStats from an array of +paths+
   #
@@ -36,13 +37,11 @@ module Linux
     paths = / 00000000 \d+ (\d+)\s+\d+ (#{paths.join('|')})$/n
 
     # no point in pread since we can't stat for size on this file
-    File.open(PROC_NET_UNIX, "rb") do |fp|
-      fp.read.scan(paths).each do |s|
-        path = s.last
-        case s.first.to_i
-        when 2 then rv[path].queued += 1
-        when 3 then rv[path].active += 1
-        end
+    File.read(*PROC_NET_UNIX_ARGS).scan(paths) do |s|
+      path = s.last
+      case s.first.to_i
+      when 2 then rv[path].queued += 1
+      when 3 then rv[path].active += 1
       end
     end
 

data/lib/raindrops/middleware.rb

@@ -13,7 +13,12 @@ class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix)
 
   def initialize(app, opts = {})
     super(app, opts[:stats] || Stats.new, opts[:path] || "/_raindrops")
-    if tmp = opts[:listeners]
+    tmp = opts[:listeners]
+    if tmp.nil? && defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
+      tmp = Unicorn.listener_names
+    end
+
+    if tmp
       self.tcp = tmp.grep(/\A[^:]+:\d+\z/)
       self.unix = tmp.grep(%r{\A/})
       self.tcp = nil if tcp.empty?
@@ -21,7 +26,7 @@ class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix)
     end
   end
 
-  # standard Rack endpoing
+  # standard Rack endpoint
   def call(env)
     env[PATH_INFO] == path ? stats_response : dup._call(env)
   end
@@ -45,8 +50,7 @@ class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix)
   # the Rack server should call this after #each (usually ensure-d)
   def close
     stats.decr_writing
-    ensure
-      app.close if app.respond_to?(:close)
+    app.close if app.respond_to?(:close)
   end
 
   def stats_response

data/raindrops.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
 
   s.files = manifest
   s.homepage = %q{http://raindrops.bogomips.org/}
-  s.summary = %q{real-time stats for Rack servers}
+  s.summary = %q{real-time stats for preforking Rack servers}
   s.rdoc_options = [ "-Na", "-t", "raindrops - #{s.summary}" ]
   s.require_paths = %w(lib)
-  s.rubyforge_project = %q{raindrops}
+  s.rubyforge_project = %q{rainbows}
 
   s.test_files = test_files
 

data/test/test_linux.rb

@@ -138,7 +138,7 @@ class TestLinux < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = nr_sock.times.map { s.accept }
+        socks = (1..nr_sock).times.map { s.accept }
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us
@@ -149,7 +149,7 @@ class TestLinux < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = nr_sock.times.map { TCPSocket.new(TEST_ADDR, port) }
+        socks = (1..nr_sock).times.map { TCPSocket.new(TEST_ADDR, port) }
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us

data/test/test_raindrops.rb

@@ -80,7 +80,7 @@ class TestRaindrops < Test::Unit::TestCase
   end
 
   def test_big
-    expect = 256.times.map { 0 }
+    expect = (1..256).map { 0 }
     rd = Raindrops.new(256)
     assert_equal expect, rd.to_ary
     assert_nothing_raised { rd[255] = 5 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +00:00
+date: 2010-05-05 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - README
 - Rakefile
 - TODO
+- examples/config.ru
 - examples/linux-tcp-listener-stats.rb
 - ext/raindrops/extconf.rb
 - ext/raindrops/linux_inet_diag.c
@@ -72,7 +73,7 @@ post_install_message:
 rdoc_options: 
 - -Na
 - -t
-- raindrops - real-time stats for Rack servers
+- raindrops - real-time stats for preforking Rack servers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,11 +90,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: raindrops
+rubyforge_project: rainbows
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: real-time stats for Rack servers
+summary: real-time stats for preforking Rack servers
 test_files: 
 - test/test_linux.rb
 - test/test_linux_middleware.rb