rfuse 1.0.0 → 1.0.2

data/.yardopts

@@ -0,0 +1,2 @@
+-
+CHANGES.md

data/CHANGES.md

@@ -1,3 +1,12 @@
+1.0.2- 2012/08/09
+-----------------
+
+Support Ruby 1.8 (tested with 1.8.7)
+
+Bugfixes
+
+ * {RFuse::Fuse#utimens} fixed to correctly convert time to nanoseconds
+ * Exceptions in {RFuse::Fuse#getattr} fixed to output backtrace etc
 
 1.0.0
 ----------------

data/README.md

@@ -3,7 +3,7 @@ RFuse
 
 http://rubygems.org/gems/rfuse
 
-FUSE bindings for Ruby 1.9  
+FUSE bindings for Ruby 
 
 FUSE (Filesystem in USErspace) is a simple interface for userspace programs to export a virtual filesystem to the linux kernel. FUSE aims to provide a secure method for non privileged users to create and mount their own filesystem implementations.
 
@@ -14,7 +14,7 @@ For a more ruby-ish API for creating filesystems see {http://rubygems.org/gems/r
 Dependencies
 --------------
 
- * Ruby 1.9
+ * Ruby 1.8 or 1.9
  * Fuse 2.8
 
 Installation

data/Rakefile

@@ -5,8 +5,6 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-YARD::Rake::YardocTask.new do |t|
-      t.files   = ['lib/**/*.rb', 'ext/**/*.c','-','CHANGES.md']   # optional
-end
+YARD::Rake::YardocTask.new 
 
 task :default => :spec

data/ext/rfuse/extconf.rb

@@ -5,6 +5,11 @@ $CFLAGS << ' -Wall'
 $CFLAGS << ' -D_FILE_OFFSET_BITS=64'
 $CFLAGS << ' -DFUSE_USE_VERSION=26'
 
+
+if have_func("rb_errinfo") 
+    puts "Have rb_errinfo"
+end
+
 if have_library('fuse')
   create_makefile('rfuse/rfuse')
 else

data/ext/rfuse/rfuse.c

@@ -14,7 +14,6 @@
 #include <sys/xattr.h>
 //#endif
 
-#include <ruby/encoding.h>
 #include "helper.h"
 #include "intern_rfuse.h"
 #include "filler.h"
@@ -24,13 +23,32 @@
 #include "pollhandle.h"
 #include "bufferwrapper.h"
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#endif
+
+#ifndef HAVE_RB_ERRINFO
+static VALUE rb_errinfo()
+{
+    return ruby_errinfo;
+}
+#endif
 
 static VALUE mRFuse;
 static VALUE eRFuse_Error;
 
+static VALUE rb_filesystem_encode(VALUE str)
+{
+#ifdef HAVE_RUBY_ENCODING_H
+  return rb_enc_associate(str,rb_filesystem_encoding());
+#else
+  return str;
+#endif
+}
+
 static int unsafe_return_error(VALUE *args)
 {
- 
+
   if (rb_respond_to(rb_errinfo(),rb_intern("errno"))) {
     //We expect these and they get passed on the fuse so be quiet...
     return rb_funcall(rb_errinfo(),rb_intern("errno"),0);
@@ -73,7 +91,7 @@ static void init_context_path_args(VALUE *args,struct fuse_context *ctx,const ch
   args[0] = ctx->private_data;
   args[1] = wrap_context(ctx);
   args[2] = rb_str_new2(path);
-  rb_enc_associate(args[2],rb_filesystem_encoding());
+  rb_filesystem_encode(args[2]);
 }
 /*
  @overload readdir(context,path,filler,offset,ffi)
@@ -275,13 +293,14 @@ static int rf_getattr(const char *path, struct stat *stbuf)
   
   res=rb_protect((VALUE (*)())unsafe_getattr,(VALUE) args,&error);
 
-  if (res == Qnil) {
-      return -ENOENT;
-  }
   if (error)
   {
     return -(return_error(ENOENT));
   }
+  
+  if (res == Qnil) {
+      return -ENOENT;
+  }
   else
   {
     rstat2stat(res,stbuf);
@@ -733,7 +752,7 @@ static int rf_symlink(const char *path,const char *as)
   init_context_path_args(args,ctx,path);
   
   args[3]=rb_str_new2(as);
-  rb_enc_associate(args[3],rb_filesystem_encoding());
+  rb_filesystem_encode(args[3]);
   
   res=rb_protect((VALUE (*)())unsafe_symlink,(VALUE) args,&error);
 
@@ -768,7 +787,7 @@ static int rf_rename(const char *path,const char *as)
   init_context_path_args(args,ctx,path);
 
   args[3]=rb_str_new2(as);
-  rb_enc_associate(args[3],rb_filesystem_encoding());
+  rb_filesystem_encode(args[3]);
   
   res=rb_protect((VALUE (*)())unsafe_rename,(VALUE) args,&error);
 
@@ -802,7 +821,7 @@ static int rf_link(const char *path,const char * as)
   struct fuse_context *ctx=fuse_get_context();
   init_context_path_args(args,ctx,path);
   args[3]=rb_str_new2(as);
-  rb_enc_associate(args[3],rb_filesystem_encoding());
+  rb_filesystem_encode(args[3]);
   res=rb_protect((VALUE (*)())unsafe_link,(VALUE) args,&error);
 
   return error ? -(return_error(ENOENT)) : 0;
@@ -1585,17 +1604,17 @@ static int rf_utimens(const char * path, const struct timespec tv[2])
   struct fuse_context *ctx = fuse_get_context();
   init_context_path_args(args,ctx,path);
 
-  // tv_sec * 1000000 + tv_nsec
+  // tv_sec * 1000000000 + tv_nsec
   args[3] = rb_funcall(
     rb_funcall(
-      INT2NUM(tv[0].tv_sec), rb_intern("*"), 1, INT2NUM(1000000)
+      INT2NUM(tv[0].tv_sec), rb_intern("*"), 1, INT2NUM(1000000000)
     ),
     rb_intern("+"), 1, INT2NUM(tv[0].tv_nsec)
   );
 
   args[4] = rb_funcall(
     rb_funcall(
-      INT2NUM(tv[1].tv_sec), rb_intern("*"), 1, INT2NUM(1000000)
+      INT2NUM(tv[1].tv_sec), rb_intern("*"), 1, INT2NUM(1000000000)
     ),
     rb_intern("+"), 1, INT2NUM(tv[1].tv_nsec)
   );
@@ -1675,7 +1694,7 @@ static int rf_ioctl(const char *path, int cmd, void *arg,
   int   error = 0;
 
   args[0] = rb_str_new2(path);
-  rb_enc_associate(args[0],rb_filesystem_encoding());
+  rb_filesystem_encode(args[0]);
   args[1] = INT2NUM(cmd);
   args[2] = wrap_buffer(arg);
   args[3] = get_file_info(ffi);
@@ -1715,7 +1734,7 @@ static int rf_poll(const char *path, struct fuse_file_info *ffi,
   int   error = 0;
 
   args[0] = rb_str_new2(path);
-  rb_enc_associate(args[0],rb_filesystem_encoding());
+  rb_filesystem_encode(args[0]);
   args[1] = get_file_info(ffi);
   args[2] = wrap_pollhandle(ph);
   args[3] = INT2NUM(*reventsp);
@@ -1756,7 +1775,11 @@ VALUE rf_unmount(VALUE self)
   struct intern_fuse *inf;
   Data_Get_Struct(self,struct intern_fuse,inf);
 
-  fuse_exit(inf->fuse);
+  rb_funcall(self,rb_intern("ruby_unmount"),0);
+
+  if (inf->fuse != NULL)  {
+      fuse_exit(inf->fuse);
+  }
 
   if (inf->fc != NULL) {
       fuse_unmount(inf->mountpoint, inf->fc);
@@ -1773,7 +1796,7 @@ VALUE rf_mountname(VALUE self)
   struct intern_fuse *inf;
   Data_Get_Struct(self,struct intern_fuse,inf);
   VALUE result = rb_str_new2(inf->mountpoint);
-  rb_enc_associate(result,rb_filesystem_encoding());
+  rb_filesystem_encode(result);
 
   return result;
 }

data/lib/rfuse/compat.rb

@@ -0,0 +1,20 @@
+
+unless IO.instance_methods.include?(:autoclose?)
+    class IO
+        def self.for_fd(fd, mode_string, options = {})
+            IO.new(fd,mode_string)
+        end
+
+        def autoclose?
+            true
+        end
+    end
+end
+
+unless Time.instance_methods.include?(:nsec)
+    class Time
+        def nsec
+            usec * 1000
+        end
+    end
+end

data/lib/rfuse/version.rb

@@ -1,3 +1,3 @@
 module RFuse
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/rfuse.rb

@@ -1,6 +1,7 @@
 require 'fcntl'
 require 'rfuse/version'
 require 'rfuse/rfuse'
+require 'rfuse/compat'
 
 # Ruby FUSE (Filesystem in USErspace) binding
 module RFuse
@@ -30,7 +31,6 @@ module RFuse
         #
         # @return [void]
         # @raise [RFuse::Error] if already running or not mounted
-        #
         def loop()
             raise RFuse::Error, "Already running!" if @running
             raise RFuse::Error, "FUSE not mounted" unless mounted?
@@ -80,6 +80,18 @@ module RFuse
             # ruby to do anything with it during GC
             @fuse_io = IO.for_fd(fd(),"r",:autoclose => false) 
         end
+
+        # Called by C unmount before doing all the FUSE stuff
+        def ruby_unmount
+            @pr.close if @pr && !@pr.closed?
+            @pw.close if @pw && !@pw.closed?
+
+            # Ideally we want this IO to avoid autoclosing at GC, but
+            # in Ruby 1.8 we have no way to do that. A work around is to close
+            # the IO here. FUSE won't necessarily like that but it is the best
+            # we can do
+            @fuse_io.close() if @fuse_io && !@fuse_io.closed? && @fuse_io.autoclose?
+        end
     end
 
     #This class is useful to make your filesystem implementation

data/rfuse.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["grant@lastweekend.com.au"]
   s.homepage    = "http://rubygems.org/gems/rfuse"
   s.summary     = %q{Ruby language binding for FUSE}
-  s.description = %q{Ruby language binding for FUSE. It was forked from rfuse and modified for Ruby 1.9.2.}
+  s.description = %q{Write userspace filesystems in Ruby}
 
   s.files         = `git ls-files`.split("\n")
   s.extensions    = 'ext/rfuse/extconf.rb'
@@ -18,6 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.has_rdoc = 'yard'
+  s.extra_rdoc_files = 'CHANGES.md'
+
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")

data/spec/basic_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 require 'pathname'
+require 'tempfile'
 
 describe RFuse::Fuse do
-   
+
     let(:dir_stat) { RFuse::Stat.directory(0444) }
     let(:file_stat) { RFuse::Stat.file(0444) }
     let!(:mockfs) { m = mock("fuse"); m.stub(:getattr).and_return(nil); m }
@@ -26,7 +27,7 @@ describe RFuse::Fuse do
             fuse.mounted?.should be_false
             lambda { fuse.loop }.should raise_error(RFuse::Error)
         end
-       
+
         it "should handle a Pathname as a mountpoint" do
             fuse = RFuse::FuseDelegator.new(mockfs,Pathname.new(mountpoint))
             fuse.mounted?.should be_true
@@ -57,7 +58,7 @@ describe RFuse::Fuse do
 
             mockfs.should_receive(:readdir) do | ctx, path, filler,offset,ffi | 
                 filler.push("hello",nil,0)
-                filler.push("world",nil,0)
+            filler.push("world",nil,0)
             end
 
             with_fuse(mountpoint,mockfs) do
@@ -83,38 +84,50 @@ describe RFuse::Fuse do
 
     context "timestamps" do
 
+
         it "should support stat with subsecond resolution" do
-           begin
-               atime = Time.now() + 60
-               sleep(0.001)
-           end until atime.usec != 0
-
-           begin
-               mtime = Time.now() + 600
-               sleep(0.001)
-           end until mtime.usec != 0
-
-           begin
-                ctime = Time.now() + 3600
-                sleep(0.001)
-           end until ctime.usec != 0
-
-           file_stat.atime = atime
-           file_stat.mtime = mtime
-           file_stat.ctime = ctime
-
-
-           # ruby can't set file times with ns res, o we are limited to usecs
-           mockfs.stub(:getattr).with(anything(),"/nanos").and_return(file_stat)
-
-           with_fuse(mountpoint,mockfs) do
-               stat = File.stat("#{mountpoint}/nanos")
-               stat.atime.should == atime
-               stat.ctime.should == ctime
-               stat.mtime.should == mtime
-           end
+            testns = Tempfile.new("testns")
+            stat = File.stat(testns.path)
+
+            # so if this Ruby has usec resolution for File.stat
+            # we'd expect to skip this test 1 in 100,000 times...
+            no_usecs = (stat.mtime.usec == 0)
+
+            if no_usecs
+                puts "Skipping due to no usec resolution for File.stat"
+            else
+                atime,mtime,ctime =  usec_times(60,600,3600)
+
+                file_stat.atime = atime
+                file_stat.mtime = mtime
+                file_stat.ctime = ctime
+
+                # ruby can't set file times with ns res, o we are limited to usecs
+                mockfs.stub(:getattr).with(anything(),"/nanos").and_return(file_stat)
+
+                with_fuse(mountpoint,mockfs) do
+                    stat = File.stat("#{mountpoint}/nanos")
+                    stat.atime.usec.should == atime.usec
+                    stat.atime.should == atime
+                    stat.ctime.should == ctime
+                    stat.mtime.should == mtime
+                end
+            end
         end
 
+        it "should set file access and modification times subsecond resolution" do
+            atime,mtime = usec_times(60,600)
+
+            atime_ns = (atime.to_i * (10**9)) + (atime.nsec) 
+            mtime_ns = (mtime.to_i * (10**9)) + (mtime.nsec)
+
+            mockfs.stub(:getattr).with(anything(),"/usec").and_return(file_stat)
+            mockfs.should_receive(:utimens).with(anything,"/usec",atime_ns,mtime_ns)
+
+            with_fuse(mountpoint,mockfs) do
+                File.utime(atime,mtime,"#{mountpoint}/usec").should == 1
+            end
+        end
         it "should set file access and modification times" do
 
             atime = Time.now()
@@ -134,12 +147,12 @@ describe RFuse::Fuse do
 
         it "should create files" do
 
-           mockfs.stub(:getattr).with(anything(),"/newfile").and_return(nil,file_stat)
-           mockfs.should_receive(:mknod).with(anything(),"/newfile",file_mode(0644),0,0)
-         
-           with_fuse(mountpoint,mockfs) do
+            mockfs.stub(:getattr).with(anything(),"/newfile").and_return(nil,file_stat)
+            mockfs.should_receive(:mknod).with(anything(),"/newfile",file_mode(0644),0,0)
+
+            with_fuse(mountpoint,mockfs) do
                 File.open("#{mountpoint}/newfile","w",0644) { |f| }
-           end
+            end
         end
 
         # ruby doesn't seem to have a native method to create these
@@ -158,7 +171,7 @@ describe RFuse::Fuse do
                 end
 
             }
-            
+
             reads = 0
             mockfs.stub(:read) { |ctx,path,size,offset,ffi|
                 reads += 2
@@ -173,4 +186,22 @@ describe RFuse::Fuse do
             end
         end
     end
+
+    context "exceptions" do
+
+        it "should capture exceptions appropriately" do
+
+            mockfs.should_receive(:getattr).with(anything(),"/exceptions").and_raise(RuntimeError)
+
+            with_fuse(mountpoint,mockfs) do
+                begin
+                    File.stat("#{mountpoint}/exceptions")
+                    raise "should not get here"
+                rescue Errno::ENOENT
+                    #all good
+                end
+            end
+        end
+
+    end
 end

data/spec/spec_helper.rb

@@ -47,5 +47,17 @@ module RFuseHelper
     def tempmount()
         Dir.mktmpdir("rfuse-spec")
     end
+
+    # Generate a set of times with non-zero usec values
+    def usec_times(*increments)
+        increments.collect { |inc|
+            begin
+                time = Time.now() + inc
+                sleep(0.001)
+            end until time.usec != 0
+            time
+        }
+    end
+
 end
 include RFuseHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfuse
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,16 +91,17 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby language binding for FUSE. It was forked from rfuse and modified
-  for Ruby 1.9.2.
+description: Write userspace filesystems in Ruby
 email:
 - grant@lastweekend.com.au
 executables: []
 extensions:
 - ext/rfuse/extconf.rb
-extra_rdoc_files: []
+extra_rdoc_files:
+- CHANGES.md
 files:
 - .gitignore
+- .yardopts
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -127,6 +128,7 @@ files:
 - ext/rfuse/rfuse_mod.c
 - lib/rfuse-ng.rb
 - lib/rfuse.rb
+- lib/rfuse/compat.rb
 - lib/rfuse/version.rb
 - lib/rfuse_ng.rb
 - rfuse.gemspec
@@ -161,4 +163,4 @@ signing_key:
 specification_version: 3
 summary: Ruby language binding for FUSE
 test_files: []
-has_rdoc: 
+has_rdoc: yard