rfusefs 1.0.1.RC0 → 1.0.1.RC1

data/lib/fuse/fusedir.rb

@@ -123,6 +123,7 @@ module FuseFS
 
         # Write the contents of str to file at path
         # @abstract FuseFS api
+        # @return [void]
         def write_to(path,str);end
 
         # @abstract FuseFS api
@@ -131,6 +132,7 @@ module FuseFS
 
         # Delete the file at path
         # @abstract FuseFS api
+        # @return [void]
         def delete(path);end
 
         # @abstract FuseFS api
@@ -139,6 +141,7 @@ module FuseFS
 
         # Make a directory at path
         # @abstract FuseFS api
+        # @return [void]
         def mkdir(path);end
 
         # @abstract FuseFS api
@@ -147,15 +150,17 @@ module FuseFS
 
         # Remove the directory at path
         # @abstract FuseFS api
+        # @return [void]
         def rmdir(path);end
 
         # Neat toy. Called when a file is touched or has its timestamp explicitly modified
         # @abstract FuseFS api
+        # @return [void]
         def touch(path,modtime);end
 
         # Move a file or directory.
         # @abstract FuseFS api
-        # @return [Object] non nil/false to indicate the rename has been handled,
+        # @return [Boolean] true to indicate the rename has been handled,
         #                  otherwise will fallback to copy/delete
         def rename(from_path,to_path);end
 
@@ -163,7 +168,8 @@ module FuseFS
         # @abstract FuseFS api
         # @param mode [String] "r","w" or "rw", with "a" if file is opened for append
         # @param rfusefs [Boolean] will be "true" if RFuseFS extensions are available
-        # @return [Object] a non nil object if you want lower level control of file operations
+        # @return [nil] to indicate raw operations are not implemented
+        # @return [Object] a filehandle
         #                  Under RFuseFS this object will be passed back in to the other raw
         #                  methods as the optional parameter _raw_
         #
@@ -177,6 +183,7 @@ module FuseFS
         # This method can also be invoked (without raw) outside of an open file context. See
         # FUSE documentation on truncate() vs ftruncate()
         # @abstract FuseFS api
+        # @return [void]
         def raw_truncate(path,off,raw=nil);end
 
         # Read _sz_ bytes from file at path (or filehandle raw) starting at offset off
@@ -186,14 +193,17 @@ module FuseFS
         # @param [Fixnum] size
         # @param [Object] raw the filehandle returned by {#raw_open}
         # @abstract FuseFS api
+        # @return [void]
         def raw_read(path,offset,size,raw=nil);end
 
         # Write _sz_ bytes from file at path (or filehandle raw) starting at offset off
         # @abstract FuseFS api
+        # @return [void]
         def raw_write(path,off,sz,buf,raw=nil);end
 
         # Close the file previously opened at path (or filehandle raw)
         # @abstract FuseFS api
+        # @return [void]
         def raw_close(path,raw=nil);end
 
         # RFuseFS extension.
@@ -205,10 +215,12 @@ module FuseFS
 
         # RFuseFS extension.
         # Called when the filesystem is mounted
+        # @return [void]
         def mounted();end
 
         # RFuseFS extension.
         # Called when the filesystem is unmounted
+        # @return [void]
         def unmounted();end
 
     end

data/lib/fuse/rfusefs-fuse.rb

@@ -380,7 +380,7 @@ module FuseFS
             return wrap_context(ctx,__method__,path,name) if ctx
             result = @root.xattr(path)[name]
             raise Errno::ENODATA.new("No attribute #{name}") unless result
-            result
+            result.to_s
         end
 
         def listxattr(ctx,path)

data/lib/fusefs/pathmapper.rb

@@ -30,9 +30,15 @@ module FuseFS
 
             # @!visibility private
             def init_file(real_path,options)
-                @options = options
+                @options.merge!(options)
                 @real_path = real_path
                 @files = nil
+                self
+            end
+
+            def init_dir(options)
+                @options.merge!(options)
+                self
             end
 
             # @return [Boolean] true if node represents a file, otherwise false
@@ -147,19 +153,10 @@ module FuseFS
         # @return [MNode]
         #    a node representing the mapped path. See {#node}
         def map_file(real_path,new_path,options = {})
-            #split path into components 
-            components = new_path.to_s.scan(/[^\/]+/)
-
-            #create a hash of hashes to represent our directory structure
-            new_file = components.inject(@root) { |parent_dir, file|
-                parent_dir.files[file] ||= MNode.new(parent_dir)
-            }
-            new_file.init_file(real_path,options)
-          
-            return new_file
+            make_node(new_path).init_file(real_path,options)
         end
         alias :mapFile :map_file
-        
+
         # Retrieve in memory node for a mapped path
         #
         # @param [String] path
@@ -224,6 +221,13 @@ module FuseFS
             @allow_write && file?(path)
         end
 
+        # Note we don't impleemnt can_mkdir? so this can
+        # only be called by code. Really only useful to
+        # create empty directories
+        def mkdir(path,options = {})
+            make_node(path).init_dir(options)
+        end
+
         # @!visibility private
         def write_to(path,contents)
             File.open(unmap(path),"w") do |f|
@@ -306,6 +310,14 @@ module FuseFS
         end
 
         private
+       
+        def make_node(path)
+            #split path into components 
+            components = path.to_s.scan(/[^\/]+/)
+            components.inject(@root) { |parent_dir, file|
+                parent_dir.files[file] ||= MNode.new(parent_dir)
+            }
+        end
         
         def recursive_cleanup(dir_node,&block)
             dir_node.files.delete_if do |path,child| 

data/lib/rfusefs/version.rb

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

data/rfusefs.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = 'yard'
   s_extra_rdoc_files = 'History.rdoc'
 
-  s.add_dependency("rfuse", ">= 1.0.4RC0")
+  s.add_dependency("rfuse", ">= 1.0.4RC1")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")

data/spec/rfusefs_spec.rb

@@ -410,8 +410,6 @@ describe FuseFS do
         it "should raise ENODATA is no attribute is available" do
             lambda{@fuse.getxattr(nil,TEST_FILE,"user.xxxx") }.should raise_error(Errno::ENODATA)
         end
-
-
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfusefs
 version: !ruby/object:Gem::Version
-  version: 1.0.1.RC0
+  version: 1.0.1.RC1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rfuse
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4RC0
+        version: 1.0.4RC1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4RC0
+        version: 1.0.4RC1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +175,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2524811135440594792
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: