rfusefs 1.0.1 → 1.0.2.RC0

data/lib/fusefs/sqlitemapper.rb

@@ -1,12 +1,14 @@
 require 'fusefs/pathmapper'
 require 'sqlite3'
-require 'rb-inotify'
 require 'thread'
 
 module FuseFS
 
     class SqliteMapperFS < PathMapperFS
 
+        # The database file
+        attr_reader :db_path
+
         # The database connection
         attr_reader :db
 
@@ -43,19 +45,13 @@ module FuseFS
         end
 
         # FuseFS callback when the filesystem is mounted
-        # performs the initial scan and starts watching the database for changes
+        # Starts the scanning loop and performs the initial scan
         # @api FuseFS
         def mounted()
+            @mounted = true
             @mutex = Mutex.new
             @cv = ConditionVariable.new
-            @mounted = true
-
-            notifier = start_notifier
-
-
-            @scan_thread = Thread.new() do
-                scan_loop(notifier)
-            end
+            @scan_thread = Thread.new() { scan_loop() }
         end
 
         # FuseFS callback when filesystem is unmounted
@@ -64,10 +60,16 @@ module FuseFS
         # @api FuseFS
         def unmounted()
             @mounted = false
-            @mutex.synchronize { @cv.signal }
+            @mutex.synchronize { @cv.signal() }
             @scan_thread.join
         end
 
+
+        # Trigger a rescan of the database
+        def rescan()
+            @mutex.synchronize { @cv.signal() }
+        end
+
         # Executes the sql query and passes each row to map_row (or the block passed in {#initialize})
         #
         # Subclasses can override this method for pre/post scan processing, calling super as required
@@ -76,30 +78,19 @@ module FuseFS
                 new_path, real_path, options =  map_row(row)
                 options ||= {}
                 options[:sqlite_scan_id] = @scan_id
-                map_file(new_path, real_path, options)
+                begin
+                    map_file(new_path, real_path, options)
+                rescue StandardError => e
+                    puts e
+                    puts e.backtrace.join("\n")
+                end
             end
             cleanup() { |file_node| file_node.options[:sqlite_scan_id] != @scan_id }
         end
 
         private
 
-        def start_notifier
-            notifier = INotify::Notifier.new()
-            modified = false
-            notifier.watch(@db_path,:modify, :close_write) do |event|
-                modified = true if event.flags.include?(:modify)
-                if event.flags.include?(:close_write) && modified
-                    @mutex.synchronize {@cv.signal}
-                    modified = false
-                end
-            end
-
-            Thread.new { notifier.run }
-
-            notifier
-        end
-
-        def scan_loop(notifier)
+        def scan_loop()
             @mutex.synchronize() do
                 @scan_id = 0
                 while @mounted
@@ -118,7 +109,6 @@ module FuseFS
                     end
                     @cv.wait(@mutex) 
                 end
-                notifier.stop   
             end
         end
     end

data/lib/rfusefs.rb

@@ -48,7 +48,12 @@ module FuseFS
         options = RFuse.parse_options(argv,*options)
 
         if options[:mountpoint]
-            fs = yield options
+            begin
+                fs = yield options
+            rescue StandardError => ex
+                puts ex.message
+                puts ex.backtrace.join("\n")
+            end
 
             puts RFuse.usage(device,exec) if options[:help] || !fs
             puts "Options:\n"  if options[:help]
@@ -62,18 +67,24 @@ module FuseFS
     end
 
     # Start the FuseFS root at mountpoint with opts. 
+    #
+    # If not previously set, Signal traps for "TERM" and "INT" are added
+    # to exit the filesystem
+    #
     # @param [Object] root see {set_root}
     # @param mountpoint [String] {mount_under}
     # @param [String...] opts FUSE mount options see {mount_under}
     # @note RFuseFS extension
     # @return [void]
     def FuseFS.start(root,mountpoint,*opts)
-        Signal.trap("TERM") { FuseFS.exit() }
-        Signal.trap("INT") { FuseFS.exit() }
+        set_default_traps("TERM","INT") { FuseFS.exit }
         FuseFS.set_root(root)
-        FuseFS.mount_under(mountpoint,*opts)
-        FuseFS.run
-        FuseFS.unmount()
+        begin
+            FuseFS.mount_under(mountpoint,*opts)
+            FuseFS.run
+        ensure
+            FuseFS.unmount()
+        end
     end
 
     # Forks {FuseFS.start} so you can access your filesystem with ruby File
@@ -100,7 +111,6 @@ module FuseFS
         if (mountpoint)
             if @mounts.has_key?(mountpoint)
                 pid = @mounts[mountpoint]
-                print "Sending TERM to forked FuseFS (#{pid})\n"
                 Process.kill("TERM",pid)
                 Process.waitpid(pid)
             else
@@ -143,16 +153,14 @@ module FuseFS
     def FuseFS.run
         @fs.mounted()
         @fuse.loop if @fuse.mounted? 
+    ensure
         @fs.unmounted()
     end
 
     #  Exit the run loop and teardown FUSE   
     #  Most useful from Signal.trap() or Kernel.at_exit()  
     def FuseFS.exit
-        @running = false
-
         if @fuse
-            print "Exitting FUSE #{@fuse.mountname}\n"
             @fuse.exit
         end
     end
@@ -176,5 +184,16 @@ module FuseFS
     def self.handle_editor(bool)
         #do nothing
     end
+
+    private
+    
+    def self.set_default_traps(*signals,&block)
+        signals.each do |sig|
+            old_proc = Signal.trap(sig,block)
+            unless "DEFAULT".eql?(old_proc)
+                Signal.trap(sig,old_proc)
+            end
+        end
+    end
 end
 

data/lib/rfusefs/version.rb

@@ -1,3 +1,3 @@
 module RFuseFS
-    VERSION="1.0.1"
+    VERSION="1.0.2.RC0"
 end

data/rfusefs.gemspec

@@ -26,5 +26,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency("yard")
   s.add_development_dependency("redcarpet")
   s.add_development_dependency("sqlite3")
-  s.add_development_dependency("rb-inotify")
 end

data/spec/sqlitemapper_spec.rb

@@ -102,14 +102,14 @@ describe "SqliteMapper" do
             it "should add new files" do
                 fixture.pathmap("added.txt","/textfiles/added.txt")
                 fixture.db_force_write()
-                sleep(0.3)
+                fs.rescan; sleep(0.3)
                 fs.file?("/textfiles/added.txt").should be_true
             end
 
             it "should remove files and directories no longer mapped" do
                 fixture.unpathmap("/textfiles/hello")
                 fixture.db_force_write()
-                sleep(0.3)
+                fs.rescan; sleep(0.3)
                 fs.file?("/textfiles/hello").should be_false
                 fs.directory?("/textfiles").should be_false
             end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rfusefs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2.RC0
+  prerelease: 6
 platform: ruby
 authors:
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rfuse
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A more Ruby like way to write FUSE filesystems - inspired by (compatible
   with) FuseFS, implemented over RFuse
 email:
@@ -178,12 +162,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Filesystem in Ruby Userspace