rfuse 1.0.3 → 1.0.4.RC0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"
+  - "2.0.0"
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libfuse-dev

data/CHANGES.md

@@ -1,9 +1,20 @@
+1.0.4 -
+------------------
+
+
+Bugfixes
+
+ * {RFuse.parse_options} fix if only local options supplied
+ * Fix for listing extended attributes
+ * Prevent old exceptions from raising at unmount
+
 1.0.3 - 2012/08/16
 ------------------
 
 Cleanup compile warnings
 
 Bugfixes
+
  * {RFuse::Fuse#statfs} potential segfault
  * {RFuse::Fuse#release} not receiving FileInfo
 

data/Rakefile

@@ -2,9 +2,15 @@
 require "bundler/gem_tasks"
 require 'yard'
 require 'rspec/core/rake_task'
+require 'rake/extensiontask'
 
 RSpec::Core::RakeTask.new(:spec)
 
 YARD::Rake::YardocTask.new 
 
+Rake::ExtensionTask.new('rfuse') do |ext|
+  ext.lib_dir = "lib/rfuse"
+end
+
+task :spec => :compile
 task :default => :spec

data/ext/rfuse/rfuse.c

@@ -52,8 +52,11 @@ static int unsafe_return_error(VALUE *args)
 {
 
   if (rb_respond_to(rb_errinfo(),rb_intern("errno"))) {
+    VALUE res;
     //We expect these and they get passed on the fuse so be quiet...
-    return rb_funcall(rb_errinfo(),rb_intern("errno"),0);
+    res = rb_funcall(rb_errinfo(),rb_intern("errno"),0);
+    rb_set_errinfo(Qnil);
+    return res;
   } else {
     VALUE info;
     VALUE bt_ary;
@@ -1003,7 +1006,7 @@ static int rf_setxattr(const char *path,const char *name,
    @param [String] name
 
    @return [String] attribute value
-   @raise [Errno]
+   @raise [Errno] Errno::ENODATA if attribute does not exist
 
 */
 static VALUE unsafe_getxattr(VALUE *args)

data/lib/rfuse/version.rb

@@ -1,3 +1,3 @@
 module RFuse
-  VERSION = "1.0.3"
+  VERSION = "1.0.4.RC0"
 end

data/lib/rfuse.rb

@@ -10,7 +10,7 @@ module RFuse
     def self.packxattr(xattrs)
         case xattrs
         when Array
-            xattrs.join("\000")
+            xattrs.join("\000").concat("\000")
         when String
             #assume already \0 separated list of keys
             xattrs
@@ -81,6 +81,10 @@ module RFuse
             result[:help]  =  true
         end
 
+        if argv.include?("-d")
+            result[:debug] = true
+        end
+
         opt_index = ( argv.find_index("-o") || -1 ) + 1
 
         if opt_index > 1 && opt_index < argv.length
@@ -98,12 +102,25 @@ module RFuse
                 local_opts.include?(opt_sym)
             end
 
-            argv[opt_index] = options.join(",")
+            if options.empty?
+                argv.slice!(opt_index - 1,2)
+            else
+                argv[opt_index] = options.join(",")
+            end
         end
 
         result
     end
 
+    # Generate a usage string
+    #
+    # @param [String] device a description of how the device field should be used
+    # @param [String] exec the executable
+    # @return [String] the usage string
+    def self.usage(device=nil,exec=File.basename($0))
+        "Usage:\n\t #{exec} #{device} mountpoint [-h] [-o [opt,optkey=value,...]]\n"
+    end
+
     class Fuse
 
         # Main processing loop

data/rfuse.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = 'CHANGES.md'
 
   s.add_development_dependency("rake")
+  s.add_development_dependency("rake-compiler")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
   s.add_development_dependency("redcarpet")

data/spec/basic_spec.rb

@@ -135,30 +135,44 @@ describe RFuse::Fuse do
 
         it "should read files" do
 
-            file_stat.size = 11
-            mockfs.stub(:getattr) { | ctx, path|
-                case path 
-                when "/test"
-                    file_stat
-                else
-                    raise Errno::ENOENT 
-                end
-
-            }
+            file_stat.size = 12
+            mockfs.stub(:getattr).with(anything(),"/test").and_return(file_stat)
 
+            
             reads = 0
             mockfs.stub(:read) { |ctx,path,size,offset,ffi|
                 reads += 2
-                "hello\000world"[offset,reads]
+                "hello\000world\000"[offset,reads]
             }
 
             with_fuse(mountpoint,mockfs) do
                 File.open("#{mountpoint}/test") do |f|
                     val = f.gets
-                    val.should == "hello\000world"
+                    val.should == "hello\000world\000"
                 end
             end
         end
+
+        it "should read over null characters in a real file" do
+           file_stat.size = 2
+           File.open("/tmp/nulltest","w") { |f| f.print "\000\000" }
+           
+           mockfs.stub(:getattr).with(anything(),"/testnull").and_return(file_stat)
+
+           mockfs.stub(:read) { |ctx,path,size,offset,ffi|
+               IO.read("/tmp/nulltest",size,offset)
+           }
+
+           with_fuse(mountpoint,mockfs) do
+               File.open("#{mountpoint}/testnull") do |f|
+                   val = f.gets
+                   val.should == "\000\000"
+                   val.size.should == 2
+                   puts val
+               end
+           end
+       end
+
     end
 
     context "exceptions" do

data/spec/options_spec.rb

@@ -67,6 +67,12 @@ describe RFuse do
             result[:debug].should be_true
         end
 
+        it "detects debug as -d" do
+            argv = [ "/mountpoint","-o","someopt","-d" ]
+            result = RFuse.parse_options(argv)
+            result[:debug].should be_true
+        end
+
         it "should remove local options" do
             argv = [ "/mountpoint","-o","debug,myoption" ]
             
@@ -75,7 +81,25 @@ describe RFuse do
             result[:debug].should be_true
             result[:myoption].should be_true
 
-            argv[2].should == "debug"
+            argv.should == [ "/mountpoint", "-o", "debug" ]
+        end
+
+        it "should remove the only local option" do
+            argv = ["/mountpoint","-o","myoption" ]
+
+            result = RFuse.parse_options(argv,:myoption)
+
+            result[:myoption].should be_true
+            argv.should == [ "/mountpoint" ]
+        end
+
+
+        it "parses the value from the only local option" do
+            argv = [ "adevice", "/mountpoint", "-o","someopt=somevalue"]
+            result = RFuse.parse_options(argv,:someopt)
+
+            result[:someopt].should == "somevalue"
+            argv.should == [ "/mountpoint" ]
         end
 
         it "should parse values from options" do
@@ -104,8 +128,7 @@ describe RFuse do
             result[:debug].should be_true
             result[:default_permissions].should be_true
 
-            argv.length.should == 3
-            argv.join(" ").should == "/mountpoint -o rw,debug,default_permissions"
+            argv.should == [ "/mountpoint" , "-o", "rw,debug,default_permissions" ]
         end
 
     end

data/spec/xattr_spec.rb

@@ -14,6 +14,8 @@ describe RFuse::Fuse do
                     "1"
                 when "user.two"
                     "2"
+                else
+                    ""
                 end
             }
 
@@ -32,8 +34,14 @@ describe RFuse::Fuse do
                 xattr['user.one'].should == "1"
                 xattr['user.two'].should == "2"
                 xattr['user.three']= "updated"
+                xattr['xxxxx'].should be_nil
                 xattr.remove('user.one')
+                # And now with a non-ruby system #TODO. There'd be a way to guard this properly
+                if system("getfattr --version")
+                    system("getfattr -d #{mountpoint}/myfile").should be_true
+                else
+                    puts "Warning Skipping getfattr test"
+                end
             end
         end
-
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rfuse
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4.RC0
+  prerelease: 6
 platform: ruby
 authors:
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  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
@@ -101,6 +117,7 @@ extra_rdoc_files:
 - CHANGES.md
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGES.md
 - Gemfile
@@ -151,12 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 927008359791353354
 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