zbatery 0.3.0 → 0.3.1

data/.document

@@ -4,4 +4,4 @@ LICENSE
 NEWS
 README
 FAQ
-zbatery.1
+zbatery_1

data/ChangeLog

@@ -1,5 +1,39 @@
-ChangeLog from git://git.bogomips.org/zbatery.git (v0.1.1..v0.3.0)
+ChangeLog from git://git.bogomips.org/zbatery.git (v0.1.1..v0.3.1)
 
+    commit 7a3de46f4e5734c237e2bb731ee15c0c4bf0c099
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sun Jul 11 02:57:56 2010 +0000
+    
+        Zbatery v0.3.1 - quiet EOF errors from clients
+        
+        Eric Wong (3):
+              update local.mk.sample for 0.3.0
+              Fix documentation generation
+              bump Rainbows! (and Unicorn) dependencies
+    
+    commit 6ef21bfb48fd813f084f509f525f490d66b41bc4
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sun Jul 11 02:57:01 2010 +0000
+    
+        bump Rainbows! (and Unicorn) dependencies
+        
+        Unicorn 1.1.0 had constant resolution problems
+        with TeeInput
+    
+    commit a50a048a805e88c2ea01a1c8d0ad71391d3b11f8
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 10:09:54 2010 +0000
+    
+        Fix documentation generation
+        
+        .document needed to be updated for RDoc 2.5.x
+    
+    commit 35f28b9eeae69077003fc9d98779104d76da5531
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 09:58:53 2010 +0000
+    
+        update local.mk.sample for 0.3.0
+    
     commit d4f095ed8ed0da4f190280eb957c14b3f5e9a2e9
     Author: Eric Wong <normalperson@yhbt.net>
     Date:   Sat Jul 10 09:56:27 2010 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.3.0
+GIT_VERSION = 0.3.1

data/GIT-VERSION-GEN

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

data/NEWS

@@ -1,3 +1,10 @@
+=== 0.3.1 / 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
 
   Rainbows! v0.95.0 is more awesome than v0.94.0, so we've updated

data/lib/zbatery.rb

@@ -5,7 +5,7 @@ require 'rainbows'
 module Zbatery
 
   # current version of Zbatery
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 
   class << self
 

data/local.mk.sample

@@ -1,38 +1,33 @@
-
 # this is the local.mk file used by Eric Wong on his dev boxes.
 # GNUmakefile will source local.mk in the top-level source tree
 # if it is present.
 #
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
-RSYNC = rsync
 DLEXT := so
-gems := rack-1.0.1
-# gems += unicorn-0.95.2 # installed via setup.rb
-# gems += rainbows-0.8.0 # installed via setup.rb
-gems += rev-0.3.1
-gems += iobuffer-0.1.1
-gems += eventmachine-0.12.10
-gems += async_sinatra-0.1.5 sinatra-0.9.4
+
+# if you have a decent amount of RAM, setting TMPDIR to be on tmpfs
+# can significantly improve performance because uploads take a lot
+# of disk I/O due to the rewindability requirement in Rack.
+# TMPDIR := /dev/shm
+# export TMPDIR
 
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
-ifeq ($(r19),)
-  RUBY := $(prefix)/bin/ruby
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.8/gems/,$(gems))
+
+ifeq ($(r192),)
+  ifeq ($(r19),)
+    RUBY := $(prefix)/bin/ruby
+  else
+    prefix := $(prefix)/ruby-1.9
+    export PATH := $(prefix)/bin:$(PATH)
+    RUBY := $(prefix)/bin/ruby --disable-gems
+  endif
 else
-  prefix := $(prefix)/ruby-1.9
+  prefix := $(prefix)/ruby-1.9.2
   export PATH := $(prefix)/bin:$(PATH)
   RUBY := $(prefix)/bin/ruby --disable-gems
-  gems += case-0.5 revactor-0.1.5
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.9.1/gems/,$(gems))
-endif
-
-ifdef gem_paths
-  sp :=
-  sp +=
-  export RUBYLIB := $(subst $(sp),:,$(addsuffix /lib,$(gem_paths)))
 endif
 
 # pipefail is THE reason to use bash (v3+) or never revisions of ksh93
@@ -43,36 +38,10 @@ SHELL := /bin/ksh93 -e -o pipefail
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 TRACER = /usr/bin/time -v -o $(t_pfx).time
 
-full-test: test-18 test-19
+full-test: test-18 test-191 test-192
 test-18:
 	$(MAKE) test 2>&1 | sed -e 's!^!1.8 !'
-test-19:
-	$(MAKE) test r19=t 2>&1 | sed -e 's!^!1.9 !'
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
-
-# 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)
-	$(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/ dcvr:/srv/zbatery/
-	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
-
-# launches any of the following shells with RUBYLIB set
-irb sh bash ksh:
-	$@
+test-191:
+	$(MAKE) test r19=T 2>&1 | sed -e 's!^!1.9.1 !'
+test-192:
+	$(MAKE) test r192=T 2>&1 | sed -e 's!^!1.9.2 !'

data/t/test_isolate.rb

@@ -15,8 +15,8 @@ $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
   gem 'rack', '1.1.0'
-  gem 'unicorn', '1.1.0'
-  gem 'rainbows', '0.95.0'
+  gem 'unicorn', '1.1.1'
+  gem 'rainbows', '0.95.1'
 
   if engine == "ruby"
     gem 'sendfile', '1.0.0' # next Rubinius should support this

data/zbatery.gemspec

@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   # Unicorn were vulnerable to a remote DoS when exposed directly to
   # untrusted clients (a configuration only supported by Zbatery and Rainbows!,
   # Unicorn has never and will never be supported without trusted LAN clients.
-  s.add_dependency(%q<rainbows>, [">= 0.95.0", "<= 1.0.0"])
+  s.add_dependency(%q<rainbows>, [">= 0.95.1", "<= 1.0.0"])
   s.add_development_dependency(%q<isolate>, "~> 2.1.0")
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbatery
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Zbatery hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 +00:00
+date: 2010-07-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 355
+        hash: 353
         segments: 
         - 0
         - 95
-        - 0
-        version: 0.95.0
+        - 1
+        version: 0.95.1
     - - <=
       - !ruby/object:Gem::Version 
         hash: 23