diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-02-02 18:37:59 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-02-02 18:40:04 -0800 |
commit | 0592c5201798b56859fa359887f61c59622a54dd (patch) | |
tree | d1d22f087b2b3cb4352a26d3e928f34021144c74 | |
parent | 8b999a96c8f0edb4bfd7291c12e2725493a7c0df (diff) | |
download | kcar-0592c5201798b56859fa359887f61c59622a54dd.tar.gz |
It's easier on me, and we can drop JavaScript from our site!
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | .wrongdoc.yml | 4 | ||||
-rw-r--r-- | GNUmakefile | 198 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | Rakefile | 121 | ||||
-rw-r--r-- | kcar.gemspec | 34 | ||||
-rw-r--r-- | pkg.mk | 168 |
7 files changed, 214 insertions, 317 deletions
@@ -18,3 +18,5 @@ pkg/ /man tags TAGS +/tmp +/LATEST diff --git a/.wrongdoc.yml b/.wrongdoc.yml new file mode 100644 index 0000000..4a5d841 --- /dev/null +++ b/.wrongdoc.yml @@ -0,0 +1,4 @@ +--- +cgit_url: http://bogomips.org/kcar.git +git_url: git://bogomips.org/kcar.git +rdoc_url: http://bogomips.org/kcar/ diff --git a/GNUmakefile b/GNUmakefile index 6902760..6c7a3cd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,198 +1,14 @@ -# use GNU Make to run tests in parallel, and without depending on RubyGems all:: -RUBY = ruby -RAKE = rake +RSYNC_DEST := bogomips.org:/srv/bogomips/kcar RAGEL = ragel -GIT_URL = git://git.bogomips.org/kcar.git RLFLAGS = -G2 -RSYNC = rsync - -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 - -install: $(bins) - $(prep_setup_rb) - $(RM) -r .install-tmp - mkdir .install-tmp - cp -p bin/* .install-tmp - $(RUBY) setup.rb all - $(RM) $^ - mv .install-tmp/* bin/ - $(RM) -r .install-tmp - $(prep_setup_rb) - -setup_rb_files := .config InstalledFiles -prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean - -clean: - -$(MAKE) -C ext/kcar clean - $(RM) $(setup_rb_files) ext/kcar/Makefile - -pkg_extra := GIT-VERSION-FILE NEWS ChangeLog ext/kcar/kcar.c -manifest: $(pkg_extra) - $(RM) .manifest - $(MAKE) .manifest - -.manifest: - (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 $@+ $@ - -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) -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://bogomips.org/kcar/NEWS.atom.xml -cgit_atom := http://git.bogomips.org/cgit/kcar.git/atom/?h=master -atom = <link rel="alternate" title="Atom feed" href="$(1)" \ - type="application/atom+xml"/> - -# using rdoc 2.5.x -doc: .document NEWS ChangeLog - rdoc -a -t "$(shell sed -ne '1s/^= //p' README)" - install -m644 COPYING doc/COPYING - install -m644 $(shell grep '^[A-Z]' .document) doc/ - $(RUBY) -i -p -e \ - '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \ - doc/ChangeLog.html - $(RUBY) -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 - -ifneq ($(VERSION),) rfproject := rainbows rfpackage := kcar -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): - $(RAKE) -s release_changes > $@+ - $(VISUAL) $@+ && test -s $@+ && mv $@+ $@ -$(release_notes): - GIT_URL=$(GIT_URL) $(RAKE) -s 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 c `cat .manifest` | (cd $(distdir) && tar x) - cd pkg && tar c $(basename $(@F)) | gzip -9 > $(@F)+ - mv $@+ $@ - -package: $(pkgtgz) $(pkggem) - -test-release: verify package $(release_notes) $(release_changes) -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 Gemcutter - 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 - -ext := ext/kcar/kcar_ext.$(DLEXT) -hdr := $(wildcard $(addprefix ext/kcar/,*.h)) -ragel: $(ext) -ext/kcar/Makefile: ext/kcar/extconf.rb - cd $(@D) && $(RUBY) extconf.rb - ext/kcar/kcar.c: ext/kcar/kcar.rl ext/kcar/kcar_http_common.rl cd $(@D) && $(RAGEL) kcar.rl -C $(RLFLAGS) -o $(@F) - -$(ext): ext/kcar/kcar.c $(hdr) ext/kcar/Makefile - $(MAKE) -C $(@D) - -all:: test - -build: $(ext) -test_units := $(wildcard test/test_*.rb) -test: test-unit -test-unit: $(test_units) -$(test_units): build - $(RUBY) -w -I lib:ext/kcar $@ - -# 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/ dcvr:/srv/bogomips/kcar/ - 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) +include pkg.mk +ifneq ($(VERSION),) +release:: + $(RAKE) raa_update VERSION=$(VERSION) + $(RAKE) publish_news VERSION=$(VERSION) +endif @@ -64,13 +64,13 @@ through the body with body.each. You can get the latest source via git from the following locations: - git://git.bogomips.org/kcar.git + git://bogomips.org/kcar.git git://repo.or.cz/kcar.git (mirror) You may browse the code from the web and download the latest snapshot tarballs here: -* http://git.bogomips.org/cgit/kcar.git (cgit) +* http://bogomips.org/cgit/kcar.git (cgit) * http://repo.or.cz/w/kcar.git (gitweb) Inline patches (from "git format-patch") to the mailing list are @@ -1,8 +1,26 @@ -desc "read news article from STDIN and post to rubyforge" +# -*- encoding: binary -*- +require 'wrongdoc' +cgit_url = Wrongdoc.config[:cgit_url] +git_url = Wrongdoc.config[:git_url] + +desc "post news article 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('kcar.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!" @@ -14,105 +32,8 @@ task :publish_news do rf.post_news('rainbows', subject, body) end -def tags - timefmt = '%Y-%m-%dT%H:%M:%SZ' - @tags ||= `git tag -l`.split(/\n/).map do |tag| - next if tag == "v0.0.0" - 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], - :tagger_email => %r{<([^>]+)>}.match(tagger)[1], - :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/kcar.git" -git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/kcar.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://kcar.rubyforge.org/NEWS.atom.xml" - title "Kcar news" - subtitle File.readlines("README").first - link! :rel => 'alternate', :type => 'text/html', - :href => 'http://bogomips.org/kcar/' - updated( (new_tags.first[:time] rescue nil) || Time.now ) - 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 - content(:type => 'text') { 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] - system('git', 'diff', '--stat', prev, version) or abort $? - puts "" - system('git', 'log', "#{prev}..#{version}") or abort $? -end - -desc "print release notes for Rubyforge" -task :release_notes do - require 'rubygems' - - spec = Gem::Specification.load('kcar.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 - desc "post to RAA" task :raa_update do - require 'rubygems' require 'net/http' require 'net/netrc' rc = Net::Netrc.locate('kcar-raa') or abort "~/.netrc not found" diff --git a/kcar.gemspec b/kcar.gemspec index bb224e2..8bd033b 100644 --- a/kcar.gemspec +++ b/kcar.gemspec @@ -1,40 +1,26 @@ ENV["VERSION"] or abort "VERSION= must be specified" manifest = File.readlines('.manifest').map! { |x| x.chomp! } -summary = File.readlines("README")[0].gsub(/\A=\s+\S+[^\w]+/, '').strip -description = File.read("README").split(/\n\n/)[1].strip +require 'wrongdoc' +extend Wrongdoc::Gemspec +name, summary, title = readme_metadata Gem::Specification.new do |s| s.name = %q{kcar} - s.version = ENV["VERSION"] - - s.homepage = 'http://bogomips.org/kcar/' + s.version = ENV["VERSION"].dup + s.homepage = Wrongdoc.config[:rdoc_url] s.authors = ["kcar hackers"] s.date = Time.now.utc.strftime('%Y-%m-%d') - s.description = description - s.email = %q{kcar@librelist.com} - - 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.description = readme_description + s.email = %q{kcar@librelist.org} + s.extra_rdoc_files = extra_rdoc_files(manifest) s.files = manifest - s.rdoc_options = [ - "-a", - "-t", - summary - ] + s.rdoc_options = rdoc_options s.require_paths = %w(lib ext) s.rubyforge_project = %q{rainbows} s.summary = summary s.test_files = Dir['test/test_*.rb'] s.extensions = %w(ext/kcar/extconf.rb) + s.add_development_dependency('wrongdoc', '~> 1.5') # s.license = %w(GPL Ruby) # disabled for compatibility with older RubyGems end @@ -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 RbConfig::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 |