RubyGems - zbatery - Versions diffs - 0.5.0 → 0.6.0 - Mend

zbatery 0.5.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

data/.document CHANGED Viewed

@@ -5,3 +5,4 @@ NEWS
 README
 FAQ
 zbatery_1
+LATEST

data/.gitignore CHANGED Viewed

@@ -16,3 +16,4 @@ pkg/
 /.manifest
 /GIT-VERSION-FILE
 /man
+/LATEST

data/.manifest CHANGED Viewed

@@ -1,6 +1,7 @@
 .document
 .gitignore
 .manifest
+.wrongdoc.yml
 COPYING
 ChangeLog
 Documentation/.gitignore
@@ -10,6 +11,7 @@ FAQ
 GIT-VERSION-FILE
 GIT-VERSION-GEN
 GNUmakefile
+LATEST
 LICENSE
 NEWS
 README
@@ -18,6 +20,7 @@ bin/zbatery
 lib/zbatery.rb
 local.mk.sample
 man/man1/zbatery.1
+man/man1/zbatery.1
 setup.rb
 t/.gitignore
 t/GNUmakefile

data/.wrongdoc.yml ADDED Viewed

@@ -0,0 +1,7 @@
+---
+cgit_url: http://git.bogomips.org/cgit/zbatery.git
+git_url: git://git.bogomips.org/zbatery.git
+rdoc_url: http://zbatery.bogomip.org/
+changelog_start: v0.3.1
+merge_html:
+  zbatery_1: Documentation/zbatery.1.html

data/ChangeLog CHANGED Viewed

@@ -1,36 +1,54 @@
-ChangeLog from git://git.bogomips.org/zbatery.git (v0.3.1..v0.5.0)
+ChangeLog from http://git.bogomips.org/cgit/zbatery.git (v0.3.1..v0.6.0)
-    commit 454417bf65dccd9b56e6c8d8272a4cbfd432f94b
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Nov 20 03:31:47 2010 +0000
-        Zbatery 0.5.0 - Rainbows! 2.0.x sync
-        This release syncs up with the latest from Rainbows! 2.0.x
-        and Unicorn 3.0.x.  See Rainbows! and Unicorn release notes
-        and changelogs for relevant details.
-    commit f3aa4b5c01c9ff7d72c6ce5bfde398d556e15d5a
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Thu Oct 28 09:44:45 2010 +0000
-        Zbatery 0.4.0 - Rainbows! 1.0.x sync
-        This release syncs up with the latest from Rainbows! 1.0.x
-        and Unicorn 2.0.x
-    commit 7a01cae820a175c2f7fd85e43f2e06ec8174340d
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Thu Oct 28 09:43:15 2010 +0000
-        updates for Rainbows! 1.0.0
-        There are some internal API changes here.
-    commit c37172c8febcec7f8a491b6e229260ca607e14b0
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 20:03:57 2010 +0000
-        bump dependencies on Unicorn + Rainbows!
-        Small fixes from both that are worth having to ease support.
+   commit 2549a23a1a6b18097292acf7dff8e40b6f59ed91
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Dec 29 09:18:59 2010 +0000
+       Zbatery 0.6.0 - Rainbows! 2.1.x resync
+   commit 4b72673e4614d0942c8ac9fab9caf7ac2c9f19f0
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Dec 29 09:18:14 2010 +0000
+       packaging updates (wrongdoc!)
+   commit 1e3d8e09d4fe7ad2eaa69200226ddc9931b89f7b
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Dec 29 09:00:36 2010 +0000
+       resync with Rainbows! 2.1.0
+   commit 454417bf65dccd9b56e6c8d8272a4cbfd432f94b
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sat Nov 20 03:31:47 2010 +0000
+       Zbatery 0.5.0 - Rainbows! 2.0.x sync
+       This release syncs up with the latest from Rainbows! 2.0.x
+       and Unicorn 3.0.x.  See Rainbows! and Unicorn release notes
+       and changelogs for relevant details.
+   commit f3aa4b5c01c9ff7d72c6ce5bfde398d556e15d5a
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Oct 28 09:44:45 2010 +0000
+       Zbatery 0.4.0 - Rainbows! 1.0.x sync
+       This release syncs up with the latest from Rainbows! 1.0.x
+       and Unicorn 2.0.x
+   commit 7a01cae820a175c2f7fd85e43f2e06ec8174340d
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Oct 28 09:43:15 2010 +0000
+       updates for Rainbows! 1.0.0
+       There are some internal API changes here.
+   commit c37172c8febcec7f8a491b6e229260ca607e14b0
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sat Aug 28 20:03:57 2010 +0000
+       bump dependencies on Unicorn + Rainbows!
+       Small fixes from both that are worth having to ease support.

data/GIT-VERSION-FILE CHANGED Viewed

	@@ -1 +1 @@
1	- GIT_VERSION = 0.5.0
1	+ GIT_VERSION = 0.6.0

data/GIT-VERSION-GEN CHANGED Viewed

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

data/GNUmakefile CHANGED Viewed

@@ -4,15 +4,11 @@ MRI = ruby
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
-GIT_URL = git://git.bogomips.org/zbatery.git
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 -include local.mk
-ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
-endif
 ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 endif
@@ -43,77 +39,40 @@ clean:
 	-$(MAKE) -C Documentation clean
 	$(RM) $(setup_rb_files) $(t_log)
-man:
-	$(MAKE) -C Documentation install-man
+man html:
+	$(MAKE) -C Documentation install-$@
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog
+pkg_extra := GIT-VERSION-FILE ChangeLog LATEST NEWS $(man1_paths)
 manifest: $(pkg_extra) man
 	$(RM) .manifest
 	$(MAKE) .manifest
 .manifest:
-	(git ls-files && \
-         for i in $@ $(pkg_extra) $(man1_paths); \
+	(git ls-files && for i in $@ $(pkg_extra) $(man1_paths); \
 	 do echo $$i; done) | LC_ALL=C sort > $@+
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
-NEWS: GIT-VERSION-FILE
-	$(RAKE) -s news_rdoc > $@+
-	mv $@+ $@
-SINCE = 0.3.1
-ChangeLog: LOG_VERSION = \
-  $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
-          echo $(GIT_VERSION) || git describe)
-ifneq ($(SINCE),)
-ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION)
-endif
-ChangeLog: GIT-VERSION-FILE
-	@echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+
-	@echo >> $@+
-	git log $(log_range) | sed -e 's/^/    /' >> $@+
-	mv $@+ $@
-news_atom := http://zbatery.bogomip.org/NEWS.atom.xml
-cgit_atom := http://git.bogomips.org/cgit/zbatery.git/atom/?h=master
-atom = <link rel="alternate" title="Atom feed" href="$(1)" \
-             type="application/atom+xml"/>
+ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
+	wrongdoc prepare
-# using rdoc 2.5.x+
-doc: .document NEWS ChangeLog
+doc: .document ChangeLog GIT-VERSION-FILE
 	for i in $(man1_rdoc); do echo > $$i; done
 	find bin lib -type f -name '*.rbc' -exec rm -f '{}' ';'
-	rdoc -t "$(shell sed -ne '1s/^= //p' README)"
+	$(RM) -r doc
+	wrongdoc all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document)  doc/
-	$(MAKE) -C Documentation install-html install-man
+	install -m644 $(shell grep '^[A-Z]' .document) doc/
 	install -m644 $(man1_paths) doc/
-	cd doc && for i in $(base_bins); do \
-	  $(RM) 1.html $${i}.1.html; \
-	  sed -e '/"documentation">/r man1/'$$i'.1.html' \
-		< $${i}_1.html > tmp && mv tmp $${i}_1.html; \
-	  ln $${i}_1.html $${i}.1.html; \
-	  done
-	$(MRI) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \
-	  doc/ChangeLog.html
-	$(MRI) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
-	  doc/NEWS.html doc/README.html
-	$(RAKE) -s news_atom > doc/NEWS.atom.xml
-	cd doc && ln README.html tmp && mv tmp index.html
 	$(RM) $(man1_rdoc)
 # publishes docs to http://zbatery.bogomip.org/
 publish_doc:
 	-git set-file-times
-	$(RM) -r doc ChangeLog NEWS
-	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-	awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' \
-	 < NEWS > doc/LATEST
-	find doc/images doc/js -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
+	$(RM) -r doc
+	$(MAKE) doc
+	find doc/images -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:03' doc/rdoc.css
 	$(MAKE) doc_gz
 	chmod 644 $$(find doc -type f)
 	$(RSYNC) -av doc/ zbatery.bogomip.org:/srv/zbatery/
@@ -123,7 +82,6 @@ publish_doc:
 # "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
@@ -138,10 +96,10 @@ release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes):
-	$(RAKE) -s release_changes > $@+
+	wrongdoc release_changes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-	GIT_URL=$(GIT_URL) $(RAKE) -s release_notes > $@+
+	wrongdoc release_notes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 # ensures we're actually on the tagged $(VERSION), only used for release
@@ -172,8 +130,8 @@ $(pkgtgz): manifest fix-perms
 	@test -n "$(distdir)"
 	$(RM) -r $(distdir)
 	mkdir -p $(distdir)
-	tar c `cat .manifest` | (cd $(distdir) && tar x)
-	cd pkg && tar c $(basename $(@F)) | gzip -9 > $(@F)+
+	tar cf - $$(cat .manifest) | (cd $(distdir) && tar xf -)
+	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
 	mv $@+ $@
 package: $(pkgtgz) $(pkggem)

data/LATEST ADDED Viewed

@@ -0,0 +1,5 @@
+=== Zbatery 0.6.0 - Rainbows! 2.1.x resync /
+  All the latest and greatest changes from Rainbows! 2.1.0:
+    http://git.bogomips.org/cgit/rainbows.git/tag/?id=v2.1.0

data/NEWS CHANGED Viewed

@@ -1,27 +1,32 @@
-=== 0.5.0 / 2010-11-20 03:32 UTC
+=== Zbatery 0.6.0 - Rainbows! 2.1.x resync / 2010-12-29 09:20 UTC
+  All the latest and greatest changes from Rainbows! 2.1.0:
+    http://git.bogomips.org/cgit/rainbows.git/tag/?id=v2.1.0
+=== Zbatery 0.5.0 - Rainbows! 2.0.x sync / 2010-11-20 03:32 UTC
   This release syncs up with the latest from Rainbows! 2.0.x
   and Unicorn 3.0.x.  See Rainbows! and Unicorn release notes
   and changelogs for relevant details.
-=== 0.4.0 / 2010-10-28 09:45 UTC
+=== Zbatery 0.4.0 - Rainbows! 1.0.x sync / 2010-10-28 09:45 UTC
   This release syncs up with the latest from Rainbows! 1.0.x
   and Unicorn 2.0.x and includes minor bugfixes from both.
-=== 0.3.1 / 2010-07-11 02:58 UTC
+=== Zbatery v0.3.1 - quiet EOF errors from clients / 2010-07-11 02:58 UTC
   Eric Wong (3):
     update local.mk.sample for 0.3.0
     Fix documentation generation
     bump Rainbows! (and Unicorn) dependencies
-=== 0.3.0 / 2010-07-10 09:58 UTC
+=== Zbatery v0.3.0 - for newer Rainbows! / 2010-07-10 09:58 UTC
   Rainbows! v0.95.0 is more awesome than v0.94.0, so we've updated
   ourselves to use it and be more awesome as well!
-=== 0.2.1 / 2010-04-19 21:16 UTC
+=== Zbatery 0.2.1 - use a less-broken parser from Unicorn / 2010-04-19 21:16 UTC
   This release fixes a denial-of-service vector for deployments
   exposed directly to untrusted clients.
@@ -48,7 +53,7 @@
   This bug affects all previously released versions of Rainbows!
   and Zbatery.
-=== 0.2.0 / 2010-03-01 10:42 UTC
+=== Zbatery 0.2.0 - Unicorn/Rainbows! resync / 2010-03-01 10:42 UTC
   This release resyncs against the latest features/cleanups
   in Unicorn 0.97.0 and Rainbows! 0.91.0
@@ -62,7 +67,7 @@
       disable more Unicorn methods
       support Unicorn 0.96.0+ ready_pipe daemonization
-=== 0.1.1 / 2010-02-13 09:26 UTC
+=== Zbatery 0.1.1 / 2010-02-13 09:26 UTC
   Unicorn had a memory that didn't affect Unicorn, but only
   Rainbows!, so we bumped the dependency on Rainbows!
@@ -70,13 +75,9 @@
   Also some minor documentation updates.
-=== 0.1.0 / 2009-12-22 22:59 UTC
+=== Zbatery 0.1.0 / 2009-12-22 22:59 UTC
   This gem release allows compatibility with newer versions of
   Rainbows!  This also fixes a bug when $stdout is not redirected
   to a file.
-=== 0.0.0 / 2009-12-10 08:49 UTC
-  Initial release of Rainbows! without fork()

data/Rakefile CHANGED Viewed

@@ -1,112 +1,27 @@
 # -*- encoding: binary -*-
 autoload :Gem, 'rubygems'
-# most tasks are in the GNUmakefile which offers better parallelism
-def tags
-  timefmt = '%Y-%m-%dT%H:%M:%SZ'
-  @tags ||= `git tag -l`.split(/\n/).map do |tag|
-    if %r{\Av[\d\.]+\z} =~ tag
-      header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
-      header = header.split(/\n/)
-      tagger = header.grep(/\Atagger /).first
-      body ||= "initial"
-      {
-        :time => Time.at(tagger.split(/ /)[-2].to_i).utc.strftime(timefmt),
-        :tagger_name => %r{^tagger ([^<]+)}.match(tagger)[1].strip,
-        :tagger_email => %r{<([^>]+)>}.match(tagger)[1].strip,
-        :id => `git rev-parse refs/tags/#{tag}`.chomp!,
-        :tag => tag,
-        :subject => subject,
-        :body => body,
-      }
-    end
-  end.compact.sort { |a,b| b[:time] <=> a[:time] }
-end
-cgit_url = "http://git.bogomips.org/cgit/zbatery.git"
-git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/zbatery.git'
-desc 'prints news as an Atom feed'
-task :news_atom do
-  require 'nokogiri'
-  new_tags = tags[0,10]
-  puts(Nokogiri::XML::Builder.new do
-    feed :xmlns => "http://www.w3.org/2005/Atom" do
-      id! "http://zbatery.bogomip.org/NEWS.atom.xml"
-      title "Zbatery news"
-      subtitle "HTTP server without a fork stuck in it"
-      link! :rel => 'alternate', :type => 'text/html',
-            :href => 'http://zbatery.bogomip.org/NEWS.html'
-      updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time])
-      new_tags.each do |tag|
-        entry do
-          title tag[:subject]
-          updated tag[:time]
-          published tag[:time]
-          author {
-            name tag[:tagger_name]
-            email tag[:tagger_email]
-          }
-          url = "#{cgit_url}/tag/?id=#{tag[:tag]}"
-          link! :rel => "alternate", :type => "text/html", :href =>url
-          id! url
-          message_only = tag[:body].split(/\n.+\(\d+\):\n {6}/s).first.strip
-          content({:type =>:text}, message_only)
-          content(:type =>:xhtml) { pre tag[:body] }
-        end
-      end
-    end
-  end.to_xml)
-end
-desc 'prints RDoc-formatted news'
-task :news_rdoc do
-  tags.each do |tag|
-    time = tag[:time].tr!('T', ' ').gsub!(/:\d\dZ/, ' UTC')
-    puts "=== #{tag[:tag].sub(/^v/, '')} / #{time}"
-    puts ""
-    body = tag[:body]
-    puts tag[:body].gsub(/^/sm, "  ").gsub(/[ \t]+$/sm, "")
-    puts ""
-  end
-end
-desc "print release changelog for Rubyforge"
-task :release_changes do
-  version = ENV['VERSION'] or abort "VERSION= needed"
-  version = "v#{version}"
-  vtags = tags.map { |tag| tag[:tag] =~ /\Av/ and tag[:tag] }.sort
-  prev = vtags[vtags.index(version) - 1]
-  if prev
-    system('git', 'diff', '--stat', prev, version) or abort $?
-    puts ""
-    system('git', 'log', "#{prev}..#{version}") or abort $?
-  else
-    system('git', 'log', version) or abort $?
-  end
-end
-desc "print release notes for Rubyforge"
-task :release_notes do
-  spec = Gem::Specification.load('zbatery.gemspec')
-  puts spec.description.strip
-  puts ""
-  puts "* #{spec.homepage}"
-  puts "* #{spec.email}"
-  puts "* #{git_url}"
-  _, _, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
-  print "\nChanges:\n\n"
-  puts body
-end
+cgit_url = "http://git.bogomips.org/cgit/rainbows.git"
+git_url = 'git://git.bogomips.org/rainbows.git'
 desc "read news article from STDIN and post to rubyforge"
 task :publish_news do
   require 'rubyforge'
-  IO.select([STDIN], nil, nil, 1) or abort "E: news must be read from stdin"
-  msg = STDIN.readlines
+  spec = Gem::Specification.load('zbatery.gemspec')
+  tmp = Tempfile.new('rf-news')
+  _, subject, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
+  tmp.puts subject
+  tmp.puts
+  tmp.puts spec.description.strip
+  tmp.puts ""
+  tmp.puts "* #{spec.homepage}"
+  tmp.puts "* #{spec.email}"
+  tmp.puts "* #{git_url}"
+  tmp.print "\nChanges:\n\n"
+  tmp.puts body
+  tmp.flush
+  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
+  msg = File.readlines(tmp.path)
   subject = msg.shift
   blank = msg.shift
   blank == "\n" or abort "no newline after subject!"
@@ -165,9 +80,8 @@ task :fm_update do
   uri = URI.parse('http://freshmeat.net/projects/zbatery/releases.json')
   rc = Net::Netrc.locate('zbatery-fm') or abort "~/.netrc not found"
   api_token = rc.password
-  changelog = tags.find { |t| t[:tag] == "v#{version}" }[:body]
+  _, subject, body = `git cat-file tag v#{version}`.split(/\n\n/, 3)
   tmp = Tempfile.new('fm-changelog')
-  tmp.syswrite(changelog)
   system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
   changelog = File.read(tmp.path).strip

data/lib/zbatery.rb CHANGED Viewed

@@ -4,8 +4,8 @@ require 'rainbows'
 module Zbatery
-  # version of Zbatery, currently 0.5.0
-  VERSION = "0.5.0"
+  # version of Zbatery, currently 0.6.0
+  VERSION = "0.6.0"
   class << self
@@ -36,6 +36,7 @@ module Rainbows
       build_app! unless preload_app
       Rainbows::Response.setup(self.class)
       Rainbows::MaxBody.setup
+      Rainbows::RackInput.setup
       Rainbows::ProcessClient.const_set(:APP, @app)
       logger.info "Zbatery #@use worker_connections=#@worker_connections"

data/t/GNUmakefile CHANGED Viewed

@@ -23,11 +23,9 @@ models += WriterThreadPool
 models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
-models += Rev
+models += Coolio
 models += EventMachine
 models += NeverBlock
-models += RevThreadSpawn
-models += RevThreadPool
 ifeq ($(RUBY_ENGINE),ruby)
   rp := )
@@ -35,8 +33,10 @@ ifeq ($(RUBY_ENGINE),ruby)
   ifeq ($(ONENINE),true)
     models += Revactor
     models += FiberSpawn
-    models += RevFiberSpawn
+    models += CoolioFiberSpawn
     models += FiberPool
+    models += CoolioThreadSpawn
+    models += CoolioThreadPool
   endif
 endif

data/t/test-lib.sh CHANGED Viewed

@@ -126,7 +126,7 @@ EOF
 		if test $# -ge 1
 		then
 			echo "  use :$1"
-			test $# -eq 2 && echo "  worker_connections $2"
+			test $# -ge 2 && echo "  worker_connections $2"
 			if test $# -eq 3
 			then
 				echo "  keepalive_timeout $3"
@@ -175,6 +175,7 @@ req_curl_chunked_upload_err_check () {
 case $model in
 Rev) require_check rev Rev::VERSION ;;
+Coolio) require_check coolio Coolio::VERSION ;;
 Revactor) require_check revactor Revactor::VERSION ;;
 EventMachine) require_check eventmachine EventMachine::VERSION ;;
 esac

data/t/test_isolate.rb CHANGED Viewed

@@ -15,14 +15,14 @@ $stdout.reopen($stderr)
 Isolate.now!(opts) do
   gem 'rack', '1.2.1'
-  gem 'unicorn', '3.0.0'
-  gem 'rainbows', '2.0.0'
+  gem 'unicorn', '3.2.1'
+  gem 'rainbows', '2.1.0'
   if engine == "ruby"
     gem 'sendfile', '1.0.0' # next Rubinius should support this
     gem 'iobuffer', '0.1.3'
-    gem 'rev', '0.3.2'
+    gem 'cool.io', '1.0.0'
     gem 'eventmachine', '0.12.10'
     gem 'sinatra', '1.0.0'
@@ -39,4 +39,8 @@ Isolate.now!(opts) do
 end
 $stdout.reopen(old_out)
-puts Dir["#{path}/gems/*-*/lib"].map { |x| File.expand_path(x) }.join(':')
+# don't load the old Rev if it exists, Cool.io 1.0.0 is compatible with it,
+# even for everything Revactor uses.
+dirs = Dir["#{path}/gems/*-*/lib"]
+dirs.delete_if { |x| x =~ %r{/rev-[\d\.]+/lib} }
+puts dirs.map { |x| File.expand_path(x) }.join(':')

data/zbatery.gemspec CHANGED Viewed

@@ -1,45 +1,27 @@
 # -*- encoding: binary -*-
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-# don't bother with tests that fork, not worth our time to get working
-# with `gem check -t` ... (of course we care for them when testing with
-# GNU make when they can run in parallel)
-test_files = manifest.grep(%r{\Atest/unit/test_.*\.rb\z}).map do |f|
-  File.readlines(f).grep(/\bfork\b/).empty? ? f : nil
-end.compact
+require 'wrongdoc'
+extend Wrongdoc::Gemspec
+name, summary, title = readme_metadata
 Gem::Specification.new do |s|
   s.name = %q{zbatery}
-  s.version = ENV["VERSION"]
+  s.version = ENV["VERSION"].dup
   s.authors = ["Zbatery hackers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
-  s.description = File.read("README").split(/\n\n/)[1]
+  s.description = readme_description
   s.email = %q{rainbows-talk@rubyforge.org}
   s.executables = %w(zbatery)
-  s.extra_rdoc_files = File.readlines('.document').map! do |x|
-    x.chomp!
-    if File.directory?(x)
-      manifest.grep(%r{\A#{x}/})
-    elsif File.file?(x)
-      x
-    else
-      nil
-    end
-  end.flatten.compact
+  s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
-  s.homepage = %q{http://zbatery.bogomip.org/}
-  s.summary = %q{Rack HTTP server without a fork stuck in it}
-  s.rdoc_options = [ "-t", "Zbatery - #{s.summary}" ]
+  s.homepage = Wrongdoc.config[:rdoc_url]
+  s.summary = summary
+  s.rdoc_options = rdoc_options
   s.require_paths = %w(lib)
   s.rubyforge_project = %q{rainbows}
-  s.test_files = test_files
   # rainbows has a boatload of optional dependencies
   # required:
   #   unicorn + rack
@@ -50,7 +32,8 @@ Gem::Specification.new do |s|
   #   espace-neverblock + eventmachine
   #   async_sinatra + sinatra + eventmachine
   #
-  s.add_dependency(%q<rainbows>, ["~> 2.0.0"])
+  s.add_dependency(%q<rainbows>, ["~> 2.1.0"])
+  s.add_development_dependency(%q<wrongdoc>, "~> 1.1")
   s.add_development_dependency(%q<isolate>, "~> 3.0.0")
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zbatery
 version: !ruby/object:Gem::Version
-  hash: 11
+  hash: 7
   prerelease: false
   segments:
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Zbatery hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-11-20 00:00:00 +00:00
+date: 2010-12-29 00:00:00 +00:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -26,18 +26,33 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 15
+        hash: 11
         segments:
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: isolate
+  name: wrongdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        hash: 13
+        segments:
+        - 1
+        - 1
+        version: "1.1"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency
+  name: isolate
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,7 +64,7 @@ dependencies:
         - 0
         version: 3.0.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |-
   Zbatery is an HTTP server for Rack applications on systems that either
   do not support fork(), or have no memory (nor need) to run the
@@ -70,10 +85,12 @@ extra_rdoc_files:
 - NEWS
 - README
 - FAQ
+- LATEST
 files:
 - .document
 - .gitignore
 - .manifest
+- .wrongdoc.yml
 - COPYING
 - ChangeLog
 - Documentation/.gitignore
@@ -83,6 +100,7 @@ files:
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- LATEST
 - LICENSE
 - NEWS
 - README
@@ -116,7 +134,9 @@ licenses: []
 post_install_message:
 rdoc_options:
 - -t
-- Zbatery - Rack HTTP server without a fork stuck in it
+- "Zbatery: Rack HTTP server without a fork stuck in it"
+- -W
+- http://git.bogomips.org/cgit/zbatery.git/tree/%s
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement