fsdb 0.5 → 0.6.0

data/tasks/svn.rake

@@ -0,0 +1,47 @@
+
+if HAVE_SVN
+
+unless PROJ.svn.root
+  info = %x/svn info ./
+  m = %r/^Repository Root:\s+(.*)$/.match(info)
+  PROJ.svn.root = (m.nil? ? '' : m[1])
+end
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
+
+namespace :svn do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show tags from the SVN repository'
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
+    tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
+    puts tags
+  end
+
+  desc 'Create a new tag in the SVN repository'
+  task :create_tag => 'svn:prereqs' do |t|
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
+
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    tag = File.join(svn.root, svn.tags, tag)
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating SVN tag '#{tag}'"
+    unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
+      abort "Tag creation failed" 
+    end
+  end
+
+end  # namespace :svn
+
+task 'gem:release' => 'svn:create_tag'
+
+end  # if PROJ.svn.path
+
+# EOF

data/tasks/test.rake

@@ -0,0 +1,40 @@
+
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'rake/testtask'
+
+namespace :test do
+
+  Rake::TestTask.new(:run) do |t|
+    t.libs = PROJ.libs
+    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+                   else PROJ.test.files end
+    t.ruby_opts += PROJ.ruby_opts
+    t.ruby_opts += PROJ.test.opts
+  end
+
+  if HAVE_RCOV
+    desc 'Run rcov on the unit tests'
+    task :rcov => :clobber_rcov do
+      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
+      opts = opts.join(' ')
+      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+              else PROJ.test.files end
+      files = files.join(' ')
+      sh "#{RCOV} #{files} #{opts}"
+    end
+
+    task :clobber_rcov do
+      rm_r 'coverage' rescue nil
+    end
+  end
+
+end  # namespace :test
+
+desc 'Alias to test:run'
+task :test => 'test:run'
+
+task :clobber => 'test:clobber_rcov' if HAVE_RCOV
+
+end
+
+# EOF

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/test/err.txt

@@ -0,0 +1,31 @@
+[corolla ~/ruby/prj/fsdb-0.4/test] nice -n 9 ruby test-concurrency.rb 10 1 10000
+[=============================>                              ]  49.55800% done/usr/local/lib/ruby/1.8/yaml.rb:193:in `end_object': method `write' called on terminated object (0x804e25c) (NotImplementedError)
+        from /usr/local/lib/ruby/1.8/yaml.rb:193:in `quick_emit'
+        from /usr/local/lib/ruby/1.8/yaml/rubytypes.rb:55:in `to_yaml'
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/formats.rb:138
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/formats.rb:138:in `[]'
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/formats.rb:60:in `dump'
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/database.rb:744:in `dump'
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/database.rb:621:in `[]='
+        from /usr/local/lib/ruby/site_ruby/1.8/fsdb/database.rb:620:in `open_write_lock'
+         ... 38 levels...
+        from test-concurrency.rb:58:in `start_processes'
+        from test-concurrency.rb:37:in `manage_children'
+        from test-concurrency.rb:31:in `run'
+        from test-concurrency.rb:354
+test-concurrency.rb:265:in `status_meter': undefined method `[]' for false:FalseClass (NoMethodError)
+        from test-concurrency.rb:265:in `sum'
+        from test-concurrency.rb:14:in `inject'
+        from test-concurrency.rb:14:in `each'
+        from test-concurrency.rb:14:in `inject'
+        from test-concurrency.rb:14:in `sum'
+        from test-concurrency.rb:265:in `status_meter'
+        from test-concurrency.rb:287:in `monitor'
+        from test-concurrency.rb:286:in `loop'
+        from test-concurrency.rb:289:in `monitor'
+        from test-concurrency.rb:285:in `initialize'
+        from test-concurrency.rb:285:in `new'
+        from test-concurrency.rb:285:in `monitor'
+        from test-concurrency.rb:38:in `manage_children'
+        from test-concurrency.rb:31:in `run'
+        from test-concurrency.rb:354

data/test/runs.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+catch :failure do
+  1000.times do
+    result = system "nice -n 19 test-concurrency.rb 1 1 1000"
+    throw :failure unless result
+  end
+  puts "All runs finished ok."
+end

data/test/test-file-lock.rb

@@ -0,0 +1,78 @@
+if ARGV.delete '-p'
+  require '../posixlock/posixlock'
+end
+
+$stdout.sync = true
+$stderr.sync = true
+
+Thread.abort_on_exception = true
+
+# Apparently, locks are per descriptor. This deadlocks w/old flock, but not
+# with posix (fcntl) flock:
+#
+File.open("/tmp/file-lock-test", "w") do |fd1|
+  File.open("/tmp/file-lock-test", "r") do |fd2|
+    fd1.write "from the writer 0"
+    fd1.flock(File::LOCK_EX)
+    fd2.flock(File::LOCK_SH)
+  end
+end
+puts "EXITING"; exit
+
+thread1 = Thread.new do
+  100.times do |i|
+    Thread.critical = true
+    File.open("/tmp/file-lock-test", "w") do |fd|
+      period = 0.001
+      until fd.flock(File::LOCK_EX|File::LOCK_NB)
+        Thread.critical = false
+        sleep period
+        period *= 2 if period < 1
+        Thread.critical = true
+      end
+      puts "Got write lock"
+      Thread.critical = false
+
+      fd.write "GARBAGE "*5
+      fd.rewind
+      sleep 0.0001
+      fd.write "from the writer #{i}"
+      
+      Thread.critical = true
+      puts "Releasing write lock"
+      fd.flock(File::LOCK_UN)
+      Thread.critical = false
+    end
+  end
+end
+
+thread2 = Thread.new do
+  100.times do
+    Thread.critical = true
+    File.open("/tmp/file-lock-test", "r") do |fd|
+      period = 0.001
+      until fd.flock(File::LOCK_SH|File::LOCK_NB)
+      Thread.critical = false
+        sleep period
+        period *= 2 if period < 1
+        Thread.critical = true
+      end
+      puts "Got read lock"
+      Thread.critical = false
+
+      s = fd.read
+      unless s =~ /^from the writer \d+/
+        raise "String was #{s.inspect}"
+      end
+      
+      Thread.critical = true
+      puts "Releasing read lock"
+      fd.flock(File::LOCK_UN)
+      Thread.critical = false
+    end
+  end
+end
+
+thread1.join
+thread2.join
+puts "Done."

data/test/test-util.rb

@@ -0,0 +1 @@
+#!/usr/bin/env ruby

data/test/trap.rb

@@ -0,0 +1,31 @@
+trap 'INT' do
+  puts "Parent trap"
+end
+
+if false
+
+  fork do
+    trap "INT" do
+      puts "Child trap"
+    end
+    sleep
+  end
+  
+  Process.wait
+
+else
+
+  thread = Thread.new do
+    system %{
+      ruby -e 'trap "INT" do
+        puts "Child trap"
+      end
+      sleep'
+    }
+  end
+
+  thread.join
+
+end
+
+# same behavior on linux, solaris7, qnx6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fsdb
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.6.0
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -9,83 +9,246 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -06:00
+date: 2009-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: bones
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.1
     version: 
-description: FSDB is a file system data base. FSDB provides a thread-safe, process-safe Database class which uses the native file system as its back end and allows multiple file formats and serialization methods. Users access objects in terms of their paths relative to the base directory of the database. It's very light weight (the state of a Database is essentially just a path string, and code size is very small, under 1K lines, all ruby).
-email: vjoel@users.sourceforge.net'
+description: |
+  A file system data base. Provides a thread-safe, process-safe Database class. Each entry is a separate file referenced by its relative path. Allows multiple file formats and serialization methods. Pure ruby and very light weight.
+
+email: vjoel@users.sourceforge.net
 executables: []
 
 extensions: 
 - ext/fsdb/extconf.rb
 extra_rdoc_files: 
-- lib/fsdb/database.rb
-- lib/fsdb/file-lock.rb
-- lib/fsdb/modex.rb
-- lib/fsdb/mutex.rb
-- lib/fsdb/util.rb
-- README
-- RELEASE-NOTES
-- test/test-modex.rb
-- test/test-mutex.rb
+- History.txt
+- README.txt
+- junk/rf.txt
+- junk/solaris-bug.txt
+- misc/fsdb-blorubu.txt
+- misc/mtime-and-file-id.txt
+- misc/posixlock.txt
+- test/err.txt
 files: 
+- History.txt
+- README.txt
 - bench/bench.rb
 - examples/client.rb
+- examples/flat.rb
 - examples/formats.rb
+- examples/fsdb-example.rb
 - examples/fsdb-examples.rb
 - examples/indexes.rb
+- examples/rbformat.rb
 - examples/server.rb
 - examples/simple.rb
 - examples/yaml.rb
+- examples/yaml2.rb
+- ext/fsdb/MANIFEST
 - ext/fsdb/extconf.rb
 - ext/fsdb/fcntl-lock.c
-- ext/fsdb/MANIFEST
+- junk/OLDRakefile
+- junk/OLDRakefile2
+- junk/check-cache.rb
+- junk/create-lock.rb
+- junk/doc/old-api/classes/FSDB.html
+- junk/doc/old-api/classes/FSDB/Database.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000029.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000030.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000031.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000032.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000033.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000034.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000035.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000036.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000037.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000038.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000039.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000040.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000041.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000042.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000043.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000044.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000045.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000046.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000047.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000048.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000049.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000050.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000051.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000052.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000053.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000054.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000055.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000056.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000057.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000058.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000059.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000060.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000061.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000062.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000063.html
+- junk/doc/old-api/classes/FSDB/Database.src/M000064.html
+- junk/doc/old-api/classes/FSDB/Database/AbortedTransaction.html
+- junk/doc/old-api/classes/FSDB/Database/CreateFileError.html
+- junk/doc/old-api/classes/FSDB/Database/DirIsImmutableError.html
+- junk/doc/old-api/classes/FSDB/Database/DirNotEmptyError.html
+- junk/doc/old-api/classes/FSDB/Database/FormatError.html
+- junk/doc/old-api/classes/FSDB/Database/MissingFileError.html
+- junk/doc/old-api/classes/FSDB/Database/MissingObjectError.html
+- junk/doc/old-api/classes/FSDB/Database/NotDirError.html
+- junk/doc/old-api/classes/FSDB/Database/PathComponentError.html
+- junk/doc/old-api/classes/FSDB/DatabaseDebuggable.html
+- junk/doc/old-api/classes/FSDB/DatabaseDebuggable.src/M000005.html
+- junk/doc/old-api/classes/FSDB/DatabaseDebuggable.src/M000007.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000006.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000007.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000008.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000009.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000010.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000011.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000012.html
+- junk/doc/old-api/classes/FSDB/DirectoryIterators.src/M000013.html
+- junk/doc/old-api/classes/FSDB/ForkSafely.html
+- junk/doc/old-api/classes/FSDB/Modex.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000024.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000025.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000026.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000027.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000028.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000029.html
+- junk/doc/old-api/classes/FSDB/Modex.src/M000030.html
+- junk/doc/old-api/classes/FSDB/Modex/ForkSafely.html
+- junk/doc/old-api/classes/FSDB/Mutex.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000018.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000019.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000020.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000021.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000022.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000023.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000024.html
+- junk/doc/old-api/classes/FSDB/Mutex.src/M000025.html
+- junk/doc/old-api/classes/FSDB/Mutex/ForkSafely.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000012.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000013.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000014.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000015.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000016.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000017.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000018.html
+- junk/doc/old-api/classes/FSDB/PathUtilities.src/M000019.html
+- junk/doc/old-api/classes/FSDB/PathUtilities/InvalidPathError.html
+- junk/doc/old-api/classes/File.html
+- junk/doc/old-api/classes/File.src/M000001.html
+- junk/doc/old-api/classes/File.src/M000002.html
+- junk/doc/old-api/classes/File.src/M000003.html
+- junk/doc/old-api/classes/File.src/M000004.html
+- junk/doc/old-api/classes/File.src/M000005.html
+- junk/doc/old-api/classes/File.src/M000006.html
+- junk/doc/old-api/created.rid
+- junk/doc/old-api/files/README.html
+- junk/doc/old-api/files/RELEASE-NOTES.html
+- junk/doc/old-api/files/fsdb_txt.html
+- junk/doc/old-api/files/lib/fsdb/database_rb.html
+- junk/doc/old-api/files/lib/fsdb/file-lock_rb.html
+- junk/doc/old-api/files/lib/fsdb/modex_rb.html
+- junk/doc/old-api/files/lib/fsdb/mutex_rb.html
+- junk/doc/old-api/files/lib/fsdb/util_rb.html
+- junk/doc/old-api/fr_class_index.html
+- junk/doc/old-api/fr_file_index.html
+- junk/doc/old-api/fr_method_index.html
+- junk/doc/old-api/index.html
+- junk/doc/old-api/rdoc-style.css
+- junk/file-lock-nb.rb
+- junk/fl.rb
+- junk/flock-test.rb
+- junk/fsdb.kateproject
+- junk/fsdb.prj
+- junk/fsdb.sf
+- junk/insert-dir.rb
+- junk/lock-test-bug.rb
+- junk/lock-test-too-simple.rb
+- junk/lock-test.rb
+- junk/mkrdoc
+- junk/restore-fsdb.rb
+- junk/rf.txt
+- junk/solaris-bug-fixed.rb
+- junk/solaris-bug.rb
+- junk/solaris-bug.txt
+- junk/sync.rb
+- junk/test-file-lock.html
+- junk/test-file-lock.rb
+- junk/test-processes.rb
+- junk/test-threads.rb
+- junk/wiki-mutex.rb
+- lib/fsdb.rb
 - lib/fsdb/compat.rb
 - lib/fsdb/database.rb
+- lib/fsdb/delegatable.rb
+- lib/fsdb/faster-modex.rb
+- lib/fsdb/faster-mutex.rb
 - lib/fsdb/file-lock.rb
-- lib/fsdb/formats/yaml.rb
 - lib/fsdb/formats.rb
+- lib/fsdb/formats/yaml.rb
 - lib/fsdb/modex.rb
 - lib/fsdb/mutex.rb
 - lib/fsdb/nonpersistent-attr.rb
+- lib/fsdb/persistent.rb
 - lib/fsdb/platform.rb
+- lib/fsdb/read-write-object.rb
+- lib/fsdb/server.rb
 - lib/fsdb/util.rb
-- lib/fsdb.rb
-- Manifest
-- Rakefile
-- README
-- RELEASE-NOTES
-- script/mkrdoc
+- misc/fsdb-blorubu.txt
+- misc/mtime-and-file-id.txt
+- misc/posixlock.txt
+- rakefile
+- tasks/ann.rake
+- tasks/bones.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/notes.rake
+- tasks/post_load.rake
+- tasks/rdoc.rake
+- tasks/rubyforge.rake
+- tasks/setup.rb
+- tasks/spec.rake
+- tasks/svn.rake
+- tasks/test.rake
+- tasks/zentest.rake
+- test/err.txt
+- test/runs.rb
 - test/test-all.rb
+- test/test-concurrency.rb
 - test/test-concurrency/init.rb
 - test/test-concurrency/test-object.rb
-- test/test-concurrency.rb
+- test/test-file-lock.rb
 - test/test-formats.rb
 - test/test-fsdb.rb
 - test/test-modex.rb
 - test/test-mutex.rb
+- test/test-util.rb
 - test/test.rb
-- fsdb.gemspec
+- test/trap.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/fsdb/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Fsdb
 - --main
-- README
+- README.txt
 require_paths: 
 - lib
 - ext
@@ -99,14 +262,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: FSDB
-rubygems_version: 1.2.0
+rubyforge_project: fsdb
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
-summary: FSDB is a file system data base. FSDB provides a thread-safe, process-safe Database class which uses the native file system as its back end and allows multiple file formats and serialization methods. Users access objects in terms of their paths relative to the base directory of the database. It's very light weight (the state of a Database is essentially just a path string, and code size is very small, under 1K lines, all ruby).
+specification_version: 3
+summary: File System Database
 test_files: []