rfusefs 1.0.2.RC2 → 1.1.1.rc20201114.37

data/lib/fusefs/metadir.rb

@@ -1,7 +1,7 @@
 module FuseFS
 
     # A full in-memory filesystem defined with hashes. It is writable to the
-    # user that mounted it 
+    # user that mounted it
     # may create and edit files within it, as well as the programmer
     # === Usage
     #   root = Metadir.new()
@@ -14,10 +14,10 @@ module FuseFS
     # Because Metadir is fully recursive, you can mount your own or other defined
     # directory structures under it. For example, to mount a dictionary filesystem
     # (see samples/dictfs.rb), use:
-    #   
+    #
     #   root.mkdir("/dict",DictFS.new())
-    # 
-    class MetaDir 
+    #
+    class MetaDir
 
         DEFAULT_FS = FuseDir.new()
 
@@ -66,7 +66,7 @@ module FuseFS
         # Extended attributes
         def xattr(path)
             pathmethod(:xattr,path) do | path |
-               @xattr[path] 
+               @xattr[path]
             end
         end
 

data/lib/fusefs/pathmapper.rb

@@ -1,13 +1,19 @@
-require 'ffi-xattr'
 
 module FuseFS
+  begin
+    require 'ffi-xattr'
+    HAS_FFI_XATTR = true
+  rescue LoadError
+    warn "ffi-xattr not available, extended attributes will not be mapped"
+    HAS_FFI_XATTR = false
+  end
 
     # A FuseFS that maps files from their original location into a new path
     # eg tagged audio files can be mapped by title etc...
     #
     class PathMapperFS < FuseDir
 
-        # Represents a mappted file or directory
+        # Represents a mapped file or directory
         class MNode
 
             # Merge extended attributes with the ones from the underlying file
@@ -17,7 +23,7 @@ module FuseFS
 
                 def initialize(node)
                     @node = node
-                    @file_xattr = ::Xattr.new(node.real_path.to_s) if node.file?
+                    @file_xattr = ::Xattr.new(node.real_path.to_s) if node.file? && HAS_FFI_XATTR
                 end
 
                 def [](key)
@@ -26,12 +32,12 @@ module FuseFS
 
                 def []=(key,value)
                     raise Errno::EACCES if additional.has_key?(key) || node.directory?
-                    file_xattr[key] = value
+                    file_xattr[key] = value if file_xattr
                 end
 
                 def delete(key)
                     raise Errno::EACCES if additional.has_key?(key) || node.directory?
-                    file_xattr.remove(key)
+                    file_xattr.remove(key) if file_xattr
                 end
 
                 def keys
@@ -106,10 +112,10 @@ module FuseFS
             end
 
             # Compatibility and convenience method
-            # @param [:pm_real_path,String,Symbol] key 
-            # @return [String] {#real_path} if key == :pm_real_path 
+            # @param [:pm_real_path,String,Symbol] key
+            # @return [String] {#real_path} if key == :pm_real_path
             # @return [MNode] the node representing the file named key
-            # @return [Object] shortcut for {#options}[key] 
+            # @return [Object] shortcut for {#options}[key]
             def[](key)
                 case key
                 when :pm_real_path
@@ -173,12 +179,12 @@ module FuseFS
         #
         # @return [StatsHelper] accumulated filesystem statistics
         attr_reader :stats
-        
+
         # Creates a new Path Mapper filesystem over an existing directory
         # @param [String] dir
         # @param [Hash] options
         # @yieldparam [String] file path to map
-        # @yieldreturn [String] 
+        # @yieldreturn [String]
         # @see #initialize
         # @see #map_directory
         def PathMapperFS.create(dir,options={ },&block)
@@ -201,7 +207,7 @@ module FuseFS
             @use_raw_file_access = options[:use_raw_file_access]
             @allow_write = options[:allow_write]
         end
-        
+
         # Recursively find all files and map according to the given block
         # @param [String...] dirs directories to list
         # @yieldparam [String] file path to map
@@ -250,17 +256,17 @@ module FuseFS
             node = node(path)
             (node && node.file?) ? node.real_path : nil
         end
-        
+
         # Deletes files and directories.
         # Yields each {#node} in the filesystem and deletes it if the block returns true
         #
         # Useful if your filesystem is periodically remapping the entire contents and you need
         # to delete entries that have not been touched in the latest scan
         #
-        # @yieldparam [Hash] filesystem node 
+        # @yieldparam [Hash] filesystem node
         # @yieldreturn [true,false] should this node be deleted
         def cleanup(&block)
-           recursive_cleanup(@root,&block) 
+           recursive_cleanup(@root,&block)
         end
 
 
@@ -373,7 +379,7 @@ module FuseFS
             file.sysseek(offset)
             file.syswrite(buf[0,sz])
         end
-        
+
         # @!visibility private
         def raw_sync(path,datasync,file=nil)
             file = @openfiles[path] unless file
@@ -387,7 +393,7 @@ module FuseFS
         # @!visibility private
         def raw_close(path,file=nil)
             file = @openfiles.delete(path) unless file
-           
+
             if file && !file.closed?
                 begin
                     flags = file.fcntl(Fcntl::F_GETFL) & Fcntl::O_ACCMODE

data/lib/fusefs/sqlitemapper.rb

@@ -15,7 +15,7 @@ module FuseFS
         # Maintains a count of the number of times through the scan loop
         attr_reader :scan_id
 
-        # 
+        #
         #
         # @param [String] db_path Path to Sqlite database
         # @param [String] sql query
@@ -55,7 +55,7 @@ module FuseFS
         end
 
         # FuseFS callback when filesystem is unmounted
-        # 
+        #
         # Stops the database watching threads
         # @api FuseFS
         def unmounted()
@@ -88,6 +88,11 @@ module FuseFS
             cleanup() { |file_node| file_node.options[:sqlite_scan_id] != @scan_id }
         end
 
+        # Rescan on HUP signal
+        def sighup
+          rescan()
+        end
+
         private
 
         def scan_loop()

data/lib/rfusefs.rb

@@ -45,28 +45,14 @@ module FuseFS
     #   end
     #
     def FuseFS.main(argv=ARGV,options=[],option_usage="",device=nil,exec=File.basename($0))
-        options = RFuse.parse_options(argv,*options)
-
-        if options[:mountpoint]
-            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]
-
-            FuseFS.start(fs,*argv) if fs || options[:help] 
-
-            puts option_usage if options[:help]
-        else
-            puts "rfusefs: failed, no mountpoint provided",RFuse.usage(device,exec)
+        RFuse.main(argv,options,option_usage,device,exec) do |options,argv|
+            root = yield options
+            FuseFS.set_root(root)
+            FuseFS.mount_under(*argv)
         end
     end
 
-    # Start the FuseFS root at mountpoint with opts. 
+    # Start the FuseFS root at mountpoint with opts.
     #
     # If not previously set, Signal traps for "TERM" and "INT" are added
     # to exit the filesystem
@@ -77,7 +63,6 @@ module FuseFS
     # @note RFuseFS extension
     # @return [void]
     def FuseFS.start(root,mountpoint,*opts)
-        set_default_traps("TERM","INT") { FuseFS.exit }
         FuseFS.set_root(root)
         begin
             FuseFS.mount_under(mountpoint,*opts)
@@ -88,7 +73,7 @@ module FuseFS
     end
 
     # Forks {FuseFS.start} so you can access your filesystem with ruby File
-    # operations (eg for testing). 
+    # operations (eg for testing).
     # @note This is an *RFuseFS* extension
     # @return [void]
     def FuseFS.mount(root,mountpoint,*opts)
@@ -126,43 +111,40 @@ module FuseFS
         end
     end
 
-    # Set the root virtual directory 
+    # Set the root virtual directory
     # @param root [Object] an object implementing a subset of {FuseFS::API}
     # @return [void]
     def FuseFS.set_root(root)
-        @fs=RFuseFS.new(root)
+        @fs=Fuse::Root.new(root)
     end
 
     # This will cause FuseFS to virtually mount itself under the given path. {set_root} must have
     # been called previously.
     # @param [String] mountpoint an existing directory where the filesystem will be virtually mounted
     # @param [Array<String>] args
+    # @return [Fuse] the mounted fuse filesystem
     #  These are as expected by the "mount" command. Note in particular that the first argument
     #  is expected to be the mount point. For more information, see http://fuse.sourceforge.net
     #  and the manual pages for "mount.fuse"
-    def FuseFS.mount_under(mountpoint, *args)    
-        @fuse = RFuse::FuseDelegator.new(@fs,mountpoint,*args)
+    def FuseFS.mount_under(mountpoint, *args)
+        @fuse = Fuse.new(@fs,mountpoint,*args)
     end
 
-    # This is the main loop waiting on then executing filesystem operations from the
-    # kernel. 
-    #    
+    # This is the main loop waiting on, then executing, filesystem operations from the
+    # kernel.
+    #
     # Note: Running in a separate thread is generally not useful. In particular
-    #       you cannot access your filesystem using ruby File operations.
+    #       you cannot use Ruby File operations to access your filesystem from
+    #       within the ruby process that calls run.
     # @note RFuseFS extension
     def FuseFS.run
-        @fs.mounted()
-        @fuse.loop if @fuse.mounted? 
-    ensure
-        @fs.unmounted()
+        @fuse.run()
     end
 
-    #  Exit the run loop and teardown FUSE   
-    #  Most useful from Signal.trap() or Kernel.at_exit()  
+    #  Exit the run loop and teardown FUSE
+    #  Most useful from Signal.trap() or Kernel.at_exit()
     def FuseFS.exit
-        if @fuse
-            @fuse.exit
-        end
+        @fuse.exit if @fuse
     end
 
     # @return [Fixnum] the calling process uid
@@ -188,15 +170,5 @@ module FuseFS
         #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.2.RC2"
+    VERSION="1.1.1"
 end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rfusefs
 version: !ruby/object:Gem::Version
-  version: 1.0.2.RC2
-  prerelease: 6
+  version: 1.1.1.rc20201114.37
 platform: ruby
 authors:
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rfuse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5RC0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5RC0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   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'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   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'
 - !ruby/object:Gem::Dependency
   name: ffi-xattr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
 description: A more Ruby like way to write FUSE filesystems - inspired by (compatible
@@ -145,15 +128,14 @@ email:
 - grant@lastweekend.com.au
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- CHANGES.md
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- History.rdoc
-- README.rdoc
-- Rakefile
-- TODO.txt
+- ".yardopts"
+- CHANGES.md
+- LICENSE
+- README.md
+- TODO.md
 - lib/fuse/fusedir.rb
 - lib/fuse/rfusefs-fuse.rb
 - lib/fusefs.rb
@@ -163,48 +145,27 @@ files:
 - lib/fusefs/sqlitemapper.rb
 - lib/rfusefs.rb
 - lib/rfusefs/version.rb
-- rfusefs.gemspec
-- samples/demo.rb
-- samples/dictfs.rb
-- samples/hello.rb
-- samples/openurifs.rb
-- samples/railsfs.rb
-- samples/sqlfs.rb
-- samples/yamlfs.rb
-- spec-fusefs/fusefs_spec.rb
-- spec/metadir_spec.rb
-- spec/mount_unmount_spec.rb
-- spec/pathmapper_spec.rb
-- spec/rfusefs_spec.rb
-- spec/sample_spec.rb
-- spec/spec_helper.rb
-- spec/sqlitemapper_spec.rb
 homepage: http://rubygems.org/gems/rfusefs
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1145013380842573975
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Filesystem in Ruby Userspace
 test_files: []
-has_rdoc: yard