tdb 0.5.0 → 0.6.1

data/pkg.mk

@@ -0,0 +1,175 @@
+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)
+else
+build:
+endif
+
+pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
+ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
+	$(WRONGDOC) prepare
+NEWS LATEST: ChangeLog
+
+manifest:
+	$(RM) .manifest
+	$(MAKE) .manifest
+
+.manifest: $(pkg_extra)
+	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
+		LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@
+	$(RM) $@+
+
+doc:: .document .wrongdoc.yml $(pkg_extra)
+	-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 LC_ALL=C 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) $@ $(RUBY_TEST_OPTS)
+
+# 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
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/tdb.gemspec

@@ -7,21 +7,17 @@ name, summary, title = readme_metadata
 Gem::Specification.new do |s|
   s.name = %q{tdb}
   s.version = ENV["VERSION"].dup
-
   s.homepage = 'http://bogomips.org/ruby-tdb/'
   s.authors = ["Ruby tdb hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
   s.email = %q{ruby.tdb@librelist.org}
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
   s.rdoc_options = rdoc_options
-  s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{qrp}
   s.summary = summary
   s.test_files = Dir['test/test_*.rb']
   s.extensions = %w(ext/tdb/extconf.rb)
-  s.add_development_dependency('wrongdoc', '~> 1.3')
-
-  # s.license = %w(LGPL) # disabled for compatibility with older RubyGems
+  s.add_development_dependency('wrongdoc', '~> 1.6.2')
+  s.licenses = %w(LGPLv2.1+)
 end

data/test/test_tdb.rb

@@ -16,6 +16,10 @@ class TestTdb < Test::Unit::TestCase
     @tdb.close if @tdb && ! @tdb.closed?
   end
 
+  def test_create_file_null_byte_in_path
+    assert_raises(ArgumentError) { TDB.new("hello.tdb\0") }
+  end
+
   def test_create_file
     assert_nothing_raised do
       @tmp = Tempfile.new('tdb')
@@ -188,8 +192,9 @@ class TestTdb < Test::Unit::TestCase
   def test_alternate_hashes
     results = {}
     expect = TDB::HASHES.to_a.map { |k,v| [ k.to_s, v.to_s ] }.sort
-    %w(default jenkins_lookup3 djb2 djb3 fnv1a
-       murmur1 murmur1_aligned murmur2 murmur2a murmur2_aligned).each do |h|
+    %w(default siphash24 jenkins_lookup3 djb2 djb3 fnv1a
+       murmur1 murmur1_aligned murmur2 murmur2a murmur2_aligned
+       murmur3a murmur3f).each do |h|
       assert_nothing_raised do
         tdb = TDB.new(nil, :hash => h.to_sym)
         TDB::HASHES.each do |k,v|
@@ -275,6 +280,23 @@ class TestTdb < Test::Unit::TestCase
     assert ! @tdb.include?("hello")
   end
 
+  def test_fork
+    @tmp = Tempfile.new('tdb')
+    File.unlink(@tmp.path)
+    @tdb = TDB.new(@tmp.path)
+    @tdb["hello"] = "world"
+    pid = fork do
+      assert_equal "world", @tdb["hello"]
+      @tdb["hello"] = "WORLD"
+      @tdb["#$$"] = "NO"
+      exit 0
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?, status.inspect
+    assert_equal "WORLD", @tdb["hello"]
+    assert_equal "NO", @tdb[pid.to_s]
+  end
+
   def test_fetch_reuse_buf
     assert_nothing_raised do
       @tmp = Tempfile.new('tdb')

data/test/test_tdb_hash_functions.rb

@@ -12,4 +12,34 @@ class TestHashFunctions < Test::Unit::TestCase
       assert_kind_of Integer, __send__("tdb_hash_#{name}", "hello")
     end
   end
+
+  def test_distro_sequential
+    TDB::HASHES.each do |name,_|
+      next if :default == name
+      m = method "tdb_hash_#{name}"
+      tmp = Hash.new { |h,k| h[k] = 0 }
+      (1..100000).each do |s|
+        tmp[m.call(s.to_s) % 7] += 1
+      end
+      assert_equal 7, tmp.size
+      tmp.each_value do |v|
+        assert_in_delta 100000/7.0, v, 1000
+      end
+    end
+  end
+
+  def test_distro_random
+    TDB::HASHES.each do |name,_|
+      next if :default == name
+      m = method "tdb_hash_#{name}"
+      tmp = Hash.new { |h,k| h[k] = 0 }
+      100000.times do
+        tmp[m.call(rand.to_s) % 7] += 1
+      end
+      assert_equal 7, tmp.size
+      tmp.each_value do |v|
+        assert_in_delta 100000/7.0, v, 1000
+      end
+    end
+  end
 end

data/test/test_tdb_mt.rb

@@ -81,6 +81,7 @@ class Test_TDB_MT < Test::Unit::TestCase
     m += [ :include?, :member? ]
     m.sort!
     unwrapped = ( (m - mt) | (mt - m)).uniq
+    unwrapped -= [ :initialize ]
     assert unwrapped.empty?, "unwrapped methods: #{unwrapped.inspect}"
     @tdb = TDB.new(nil)
     respond_to?(:refute_match) and

metadata

@@ -1,49 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tdb
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+version: !ruby/object:Gem::Version
+  version: 0.6.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ruby tdb hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-17 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: wrongdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :development
-  version_requirements: *id001
-description: |-
-  TDB is much like other DBM implementations, except it allows concurrent
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+description: ! 'TDB is much like other DBM implementations, except it allows concurrent
+
   writer processes.  TDB was initially developed for Samba, but is used by
+
   other projects as well.  These Ruby bindings allow Ruby apps to read and
-  write to the same databases used by Samba!
+
+  write to the same databases used by Samba!'
 email: ruby.tdb@librelist.org
 executables: []
-
-extensions: 
+extensions:
 - ext/tdb/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - Hash_Functions
@@ -54,7 +49,7 @@ extra_rdoc_files:
 - lib/tdb/mt.rb
 - ext/tdb/tdb.c
 - LATEST
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -79,54 +74,48 @@ files:
 - ext/tdb/lookup3.c
 - ext/tdb/murmur1.c
 - ext/tdb/murmur2.c
+- ext/tdb/murmur3.c
 - ext/tdb/rbtdb.h
+- ext/tdb/siphash24.c
 - ext/tdb/tdb.c
 - lib/tdb.rb
 - lib/tdb/mt.rb
+- pkg.mk
 - setup.rb
 - tdb.gemspec
 - test/test_tdb.rb
 - test/test_tdb_hash_functions.rb
 - test/test_tdb_mt.rb
-has_rdoc: true
 homepage: http://bogomips.org/ruby-tdb/
-licenses: []
-
+licenses:
+- LGPLv2.1+
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - tdb - Trivial Database bindings for Ruby
 - -W
-- http://git.bogomips.org/cgit/ruby-tdb.git/tree/%s
-require_paths: 
+- http://bogomips.org/ruby-tdb.git/tree/%s
+require_paths:
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: qrp
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Trivial Database bindings for Ruby
-test_files: 
+test_files:
 - test/test_tdb_mt.rb
 - test/test_tdb_hash_functions.rb
 - test/test_tdb.rb