wrongdoc 1.3.0 → 1.4.0

data/.manifest

@@ -33,6 +33,7 @@ lib/wrongdoc/readme.rb
 lib/wrongdoc/release.rb
 man/man1/wrongdoc.1
 man/man5/dotwrongdoc.5
+pkg.mk
 setup.rb
 wrongdoc.gemspec
 wrongdoc_1

data/ChangeLog

@@ -1,5 +1,29 @@
 ChangeLog from http://git.bogomips.org/cgit/wrongdoc.git
 
+   commit c499a3a565b6fc9dd06af42d5f48f35e2a5ccd1b
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jan 27 21:53:27 2011 +0000
+   
+       wrongdoc 1.4.0 - cleanups and updates
+       
+       Eric Wong (2):
+             use pkg.mk from my other projects
+             bump rdoc dependency to 3.4
+   
+   commit 23d71019cf3cd2622a915cf89b29f426991a77bd
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jan 27 21:53:00 2011 +0000
+   
+       bump rdoc dependency to 3.4
+   
+   commit 83961a504c34813bbdcf1edd674850038fbb1bc1
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jan 27 21:50:59 2011 +0000
+   
+       use pkg.mk from my other projects
+       
+       I like Make :D
+   
    commit 898690ae2b01b3468675b01abe8efef5e6d52781
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Tue Jan 4 16:11:30 2011 -0800

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.3.0
+GIT_VERSION = 1.4.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,113 +1,18 @@
-# use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-MRI = ruby
-RUBY = ruby
-RSYNC = rsync
+RSYNC_DEST := bogomips.org:/srv/bogomips/wrongdoc
+rfproject := rainbows
+rfpackage := wrongdoc
+include pkg.mk
 WRONGDOC := $(RUBY) -I lib bin/wrongdoc
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-
 man1_paths := $(addprefix man/man1/, wrongdoc.1)
 man5_paths := $(addprefix man/man5/, dotwrongdoc.5)
 manpages := $(man1_paths) $(man5_paths)
 
 clean:
 	-$(MAKE) -C Documentation clean
-
 man html:
 	$(MAKE) -C Documentation $@
+pkg_extra += $(manpages)
 
-$(manpages): man
-pkg_extra := GIT-VERSION-FILE ChangeLog LATEST NEWS $(manpages)
-
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	$(WRONGDOC) prepare
-
-.manifest: ChangeLog
-	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
-	  LC_ALL=C sort > $@+
-	mv $@+ $@
-
-doc: .document .wrongdoc.yml man html
-	find bin lib -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/
-	tar cf - man | (cd doc && tar xf -)
-
-publish_doc:
-	-git set-file-times
-	$(MAKE) doc
-	-find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
-	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ bogomips.org:/srv/bogomips/wrongdoc/
-	git ls-files | xargs touch
-
-ifneq ($(VERSION),)
-rfproject := rainbows
-rfpackage := wrongdoc
-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:
-	test x"$(shell umask)" = x0022
-	git rev-parse --verify refs/tags/v$(VERSION)^{}
-	git diff-index --quiet HEAD^0
-	test `git rev-parse --verify HEAD^0` = \
-	     `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
-
-$(pkggem): .manifest fix-perms
-	gem build $(rfpackage).gemspec
-	mkdir -p pkg
-	mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): .manifest fix-perms
-	@test -n "$(distdir)"
-	$(RM) -r $(distdir)
-	mkdir -p $(distdir)
-	tar cf - `cat .manifest` | (cd $(distdir) && tar xf -)
-	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
-	mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-release: verify package $(release_notes) $(release_changes)
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	gem push $(pkggem)
-	-rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
-endif
-
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test
+doc:: man html

data/LATEST

@@ -1,4 +1,6 @@
-=== wrongdoc 1.3.0 / 2011-01-05 00:13 UTC
+=== wrongdoc 1.4.0 - cleanups and updates / 2011-01-27 21:53 UTC
 
-  * update to rdoc 3.3
+  Eric Wong (2):
+        use pkg.mk from my other projects
+        bump rdoc dependency to 3.4
 

data/NEWS

@@ -1,3 +1,9 @@
+=== wrongdoc 1.4.0 - cleanups and updates / 2011-01-27 21:53 UTC
+
+  Eric Wong (2):
+        use pkg.mk from my other projects
+        bump rdoc dependency to 3.4
+
 === wrongdoc 1.3.0 / 2011-01-05 00:13 UTC
 
   * update to rdoc 3.3

data/pkg.mk

@@ -0,0 +1,168 @@
+RUBY = ruby
+RAKE = rake
+RSYNC = rsync
+WRONGDOC = wrongdoc
+
+GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+	@./GIT-VERSION-GEN
+-include GIT-VERSION-FILE
+-include local.mk
+DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+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)
+ext_h := $(wildcard $(ext)/*/*.h $(ext)/*.h)
+ext_src := $(wildcard $(ext)/*.c $(ext_h))
+ext_pfx_src := $(addprefix $(ext_pfx)/,$(ext_src))
+ext_d := $(ext_pfx)/$(ext)/.d
+$(ext)/extconf.rb: $(wildcard $(ext)/*.h)
+	@>> $@
+$(ext_d):
+	@mkdir -p $(@D)
+	@> $@
+$(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
+ext_sfx := _ext.$(DLEXT)
+ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
+$(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
+	@echo $^ == $@
+	$(MAKE) -C $(@D)
+lib := $(lib):$(ext_pfx)/$(ext)
+build: $(ext_dl)
+endif
+
+pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
+ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
+	$(WRONGDOC) prepare
+
+manifest:
+	$(RM) .manifest
+	$(MAKE) .manifest
+
+.manifest: ChangeLog
+	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
+		LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@
+	$(RM) $@+
+
+doc:: .document .wrongdoc.yml
+	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/
+
+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:
+	test x"$(shell umask)" = x0022
+	git rev-parse --verify refs/tags/v$(VERSION)^{}
+	git diff-index --quiet HEAD^0
+	test $$(git rev-parse --verify HEAD^0) = \
+	     $$(git rev-parse --verify refs/tags/v$(VERSION)^{})
+
+fix-perms:
+	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
+	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
+
+gem: $(pkggem)
+
+install-gem: $(pkggem)
+	gem install $(CURDIR)/$<
+
+$(pkggem): manifest fix-perms
+	gem build $(rfpackage).gemspec
+	mkdir -p pkg
+	mv $(@F) $@
+
+$(pkgtgz): distdir = $(basename $@)
+$(pkgtgz): HEAD = v$(VERSION)
+$(pkgtgz): manifest fix-perms
+	@test -n "$(distdir)"
+	$(RM) -r $(distdir)
+	mkdir -p $(distdir)
+	tar cf - $$(cat .manifest) | (cd $(distdir) && tar xf -)
+	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
+	mv $@+ $@
+
+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)
+	# 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
+test_units := $(wildcard test/test_*.rb)
+test: test-unit
+test-unit: $(test_units)
+$(test_units): build
+	$(RUBY) -I $(lib) $@
+
+# this requires GNU coreutils variants
+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
+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:
+	for i in $(docs); do \
+	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest

data/wrongdoc.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{rainbows}
   s.add_dependency(%q<nokogiri>, ['~> 1.4.4'])
   s.add_dependency(%q<tidy_ffi>, ['~> 0.1.3'])
-  s.add_dependency(%q<rdoc>, ['~> 3.3'])
+  s.add_dependency(%q<rdoc>, ['~> 3.4'])
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrongdoc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - wrongdoc hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +00:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,11 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
-        - 3
-        version: "3.3"
+        - 4
+        version: "3.4"
   type: :runtime
   version_requirements: *id003
 description: |-
@@ -134,6 +134,7 @@ files:
 - lib/wrongdoc/release.rb
 - man/man1/wrongdoc.1
 - man/man5/dotwrongdoc.5
+- pkg.mk
 - setup.rb
 - wrongdoc.gemspec
 - wrongdoc_1