couch-quilt 0.4.0 → 0.4.1

data/bin/couchquilt

@@ -14,43 +14,53 @@
 #    limitations under the License.
 #
 # usage:
-#  couchquilt ~/quilt http://localhost:5984
-
-QUILT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-require File.join(QUILT_ROOT, "lib/couchquilt")
+#  couchquilt http://localhost:5984 ~/quilt
 
 DEBUG = ARGV.delete("--debug")
-require File.join(File.dirname(__FILE__), '../lib/couchquilt/debugged_fs') if DEBUG
 
-if ARGV.empty?
+require File.expand_path("../../lib/couchquilt", __FILE__)
+require File.expand_path("../../lib/couchquilt/debugged_fs", __FILE__) if DEBUG
+
+# database server url defaults to http://127.0.0.1:5984
+ARGV.unshift "http://127.0.0.1:5984" if !ARGV[1] && ARGV[0] !~ /^-/
+
+server, mountpoint = ARGV
+
+unless server && mountpoint
   puts "usage:"
   puts "couchquilt [server] mountpoint [--debug]"
   exit
 end
 
-# database server url defaults to http://127.0.0.1:5984
-ARGV.unshift "http://127.0.0.1:5984" if ARGV.size < 2
-
-server     = ARGV[0]
-mountpoint = ARGV[1]
 
 # create mount point if needed
 Dir.mkdir(mountpoint) unless File.directory?(mountpoint)
 
-# init quilt fs
-quilt_fs_class = DEBUG ? Couchquilt::DebuggedFS : Couchquilt::FS
-FuseFS.set_root quilt_fs_class.new(server)
-FuseFS.mount_under mountpoint
-
-# listen for exit signals and unmount fuse
-trap("INT") do
-  puts "ancelling..."
-  FuseFS.unmount
-  FuseFS.exit
-  puts "Bye."
+def maybe_fork
+  if DEBUG
+    yield
+  else
+    p = fork { yield }
+    Process.detach p
+  end
+end
+
+# on debug mode we do not run in background
+maybe_fork do
+  # listen for exit signals and unmount fuse
+  trap("EXIT") do
+    FuseFS.unmount
+    FuseFS.exit
+  end
+
+  # init quilt fs
+  quilt_fs_class = DEBUG ? Couchquilt::DebuggedFS : Couchquilt::FS
+  FuseFS.set_root quilt_fs_class.new(server)
+  FuseFS.mount_under mountpoint
+
+  # actually do the Fuse mount
+  puts "Quilt maps #{server} to #{mountpoint}" if DEBUG
+
+  FuseFS.run
 end
 
-# actually do the Fuse mount
-puts "Quilt maps #{server} to #{mountpoint}"
-puts "Debug mode" if DEBUG
-FuseFS.run

data/couch-quilt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch-quilt}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J\303\266rg Schmidt"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-23}
   s.default_executable = %q{couchquilt}
   s.description = %q{Access CouchDB JSON documents from filesystem.}
   s.email = %q{schmidt@netzmerk.com}

data/lib/couchquilt/version.rb

@@ -1,3 +1,3 @@
 module Couchquilt
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Johannes J\xC3\xB6rg Schmidt"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: couchquilt
 dependencies: 
 - !ruby/object:Gem::Dependency