rfuse 1.0.4 → 1.0.5.RC0

data/ext/rfuse/extconf.rb

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

data/ext/rfuse/filler.c

@@ -34,12 +34,12 @@ VALUE rfiller_push(VALUE self, VALUE name, VALUE stat, VALUE offset) {
 
   //Allow nil return instead of a stat
   if (NIL_P(stat)) {
-    result = f->filler(f->buffer,StringValueCStr(name),NULL,NUM2LONG(offset));
+    result = f->filler(f->buffer,StringValueCStr(name),NULL,NUM2OFFT(offset));
   } else {
     struct stat st;
     memset(&st, 0, sizeof(st));
     rstat2stat(stat,&st);
-    result = f->filler(f->buffer,StringValueCStr(name),&st,NUM2LONG(offset));
+    result = f->filler(f->buffer,StringValueCStr(name),&st,NUM2OFFT(offset));
   }
 
   return result ? Qnil : self;

data/ext/rfuse/helper.c

@@ -12,9 +12,9 @@ void rstat2stat(VALUE rstat, struct stat *statbuf)
   statbuf->st_uid     = FIX2UINT(rb_funcall(rstat,rb_intern("uid"),0));
   statbuf->st_gid     = FIX2UINT(rb_funcall(rstat,rb_intern("gid"),0));
   statbuf->st_rdev    = FIX2ULONG(rb_funcall(rstat,rb_intern("rdev"),0));
-  statbuf->st_size    = FIX2ULONG(rb_funcall(rstat,rb_intern("size"),0));
-  statbuf->st_blksize = NUM2ULONG(rb_funcall(rstat,rb_intern("blksize"),0));
-  statbuf->st_blocks  = NUM2ULONG(rb_funcall(rstat,rb_intern("blocks"),0));
+  statbuf->st_size    = NUM2OFFT(rb_funcall(rstat,rb_intern("size"),0));
+  statbuf->st_blksize = NUM2SIZET(rb_funcall(rstat,rb_intern("blksize"),0));
+  statbuf->st_blocks  = NUM2SIZET(rb_funcall(rstat,rb_intern("blocks"),0));
 
   r_atime = rb_funcall(rstat,rb_intern("atime"),0);
   r_mtime = rb_funcall(rstat,rb_intern("mtime"),0);

data/ext/rfuse/helper.h

@@ -1,6 +1,7 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <ruby.h>
+#include "ruby-compat.h"
 #include <fuse.h>
 
 #ifndef _RFUSE_HELPER_H

data/ext/rfuse/rfuse.c

@@ -7,9 +7,11 @@
 #include <linux/kdev_t.h>
 
 #include <ruby.h>
+#include "ruby-compat.h"
 #include <fuse.h>
 #include <errno.h>
 #include <sys/statfs.h>
+
 #ifdef HAVE_SETXATTR
 #include <sys/xattr.h>
 #endif
@@ -23,27 +25,6 @@
 #include "pollhandle.h"
 #include "bufferwrapper.h"
 
-// Ruby 1.8 compatibility
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#endif
-
-#ifndef HAVE_RB_ERRINFO
-static VALUE rb_errinfo()
-{
-    return ruby_errinfo;
-}
-#endif
-
-static VALUE rb_filesystem_encode(VALUE str)
-{
-#ifdef HAVE_RUBY_ENCODING_H
-  return rb_enc_associate(str,rb_filesystem_encoding());
-#else
-  return str;
-#endif
-}
-//end 1.8 compat
 
 static VALUE mRFuse;
 static VALUE eRFuse_Error;
@@ -144,7 +125,7 @@ static int rf_readdir(const char *path, void *buf,
   fillerc->filler=filler;
   fillerc->buffer=buf;
   args[3]=rfiller_instance;
-  args[4]=INT2NUM(offset);
+  args[4]=OFFT2NUM(offset);
   args[5]=get_file_info(ffi);
 
   rb_protect((VALUE (*)())unsafe_readdir,(VALUE)args,&error);
@@ -177,7 +158,7 @@ static int rf_readlink(const char *path, char *buf, size_t size)
   struct fuse_context *ctx=fuse_get_context();
   init_context_path_args(args,ctx,path);
   
-  args[3]=INT2NUM(size);
+  args[3]=SIZET2NUM(size);
   res=rb_protect((VALUE (*)())unsafe_readlink,(VALUE)args,&error);  
   if (error)
   {
@@ -844,8 +825,8 @@ static int rf_read(const char *path,char * buf, size_t size,off_t offset,struct
   struct fuse_context *ctx=fuse_get_context();
   init_context_path_args(args,ctx,path);
   
-  args[3]=INT2NUM(size);
-  args[4]=INT2NUM(offset);
+  args[3]=SIZET2NUM(size);
+  args[4]=OFFT2NUM(offset);
   args[5]=get_file_info(ffi);
 
   res=rb_protect((VALUE (*)())unsafe_read,(VALUE) args,&error);
@@ -873,7 +854,7 @@ static int rf_read(const char *path,char * buf, size_t size,off_t offset,struct
 /*
    Write data to an open file
 
-   @overload write(context,path,size,offset,ffi)
+   @overload write(context,path,data,offset,ffi)
 
    @abstract Fuse operation {http://fuse.sourceforge.net/doxygen/structfuse__operations.html#897d1ece4b8b04c92d97b97b2dbf9768 write}
 
@@ -883,7 +864,7 @@ static int rf_read(const char *path,char * buf, size_t size,off_t offset,struct
    @param [Integer] offset
    @param [FileInfo] ffi
 
-   @return [Integer] exactly the number of bytes written except on error
+   @return [Integer] exactly the number of bytes requested except on error
    @raise [Errno]
 */
 static VALUE unsafe_write(VALUE *args)
@@ -901,7 +882,7 @@ static int rf_write(const char *path,const char *buf,size_t size,
   init_context_path_args(args,ctx,path);
 
   args[3]=rb_str_new(buf, size);
-  args[4]=INT2NUM(offset);
+  args[4]=OFFT2NUM(offset);
   args[5]=get_file_info(ffi);
 
   res = rb_protect((VALUE (*)())unsafe_write,(VALUE) args, &error);
@@ -1387,7 +1368,7 @@ static int rf_ftruncate(const char *path, off_t size,
 
   struct fuse_context *ctx = fuse_get_context();
   init_context_path_args(args,ctx,path);
-  args[3] = INT2NUM(size);
+  args[3] = OFFT2NUM(size);
   args[4] = get_file_info(ffi);
 
   rb_protect((VALUE (*)())unsafe_ftruncate,(VALUE) args,&error);
@@ -1587,7 +1568,7 @@ static int rf_bmap(const char *path, size_t blocksize, uint64_t *idx)
 
   struct fuse_context *ctx = fuse_get_context();
   init_context_path_args(args,ctx,path);
-  args[3] = INT2NUM(blocksize);
+  args[3] = SIZET2NUM(blocksize);
   args[4] = LL2NUM(*idx);
 
   res = rb_protect((VALUE (*)())unsafe_bmap,(VALUE) args, &error);

data/ext/rfuse/ruby-compat.h

@@ -0,0 +1,39 @@
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#define rb_filesystem_encode(STR) (rb_enc_associate(STR,rb_filesystem_encoding()))
+#else
+#define rb_filesystem_encode(STR)
+#endif
+
+#ifndef HAVE_RB_ERRINFO
+#define rb_errinfo() ruby_errinfo
+#endif
+
+#ifndef HAVE_RB_SET_ERRINFO
+#define rb_set_errinfo(v)  /*no-op*/
+#endif
+
+/* SIZET macros from ruby 1.9 */
+#ifndef SIZET2NUM
+#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+# define SIZET2NUM(v) ULL2NUM(v)
+# define SSIZET2NUM(v) LL2NUM(v)
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define SIZET2NUM(v) ULONG2NUM(v)
+# define SSIZET2NUM(v) LONG2NUM(v)
+#else
+# define SIZET2NUM(v) UINT2NUM(v)
+# define SSIZET2NUM(v) INT2NUM(v)
+#endif
+#endif
+
+#ifndef NUM2SIZET
+#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
+# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
+# define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
+#else
+# define NUM2SIZET(x) NUM2ULONG(x)
+# define NUM2SSIZET(x) NUM2LONG(x)
+#endif
+#endif
+

data/lib/rfuse/version.rb

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

data/lib/rfuse.rb

@@ -316,7 +316,7 @@ module RFuse
         def initialize(values={ })
             @f_bsize, @f_frsize, @f_blocks, @f_bfree, @f_bavail, @f_files, @f_ffree, @f_favail,@f_fsid, @f_flag,@f_namemax = Array.new(13,0)
             values.each_pair do |k,v|
-                prefix = k.startswith?("f_") ? "" : "f_"
+                prefix = k.to_s.start_with?("f_") ? "" : "f_"
                 instance_variable_set("@#{prefix}#{k}",v)
             end
         end

data/rfuse.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("yard")
   s.add_development_dependency("redcarpet")
   s.add_development_dependency("ffi-xattr")
+  s.add_development_dependency("sys-filesystem")
 end

data/spec/basic_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'pathname'
 require 'tempfile'
+require 'sys/filesystem'
 
 describe RFuse::Fuse do
 
@@ -138,7 +139,7 @@ describe RFuse::Fuse do
             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
@@ -154,27 +155,63 @@ describe RFuse::Fuse do
         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
+            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 "filesystem statistics" do
+
+        let (:statvfs) {
+            RFuse::StatVfs.new(
+                :bsize => 2048,
+                "frsize" => 1024,
+                "blocks" =>  9999,
+                "bfree" => 8888,
+                "bavail" => 7777,
+                "files" => 6000,
+                "ffree" => 5555)
+        }
+
+        it "should report filesystem statistics" do
+            mockfs.stub(:getattr).with(anything(),"/test").and_return(dir_stat)
+            mockfs.stub(:getattr).with(anything(),"/test/statfs").and_return(file_stat)
+            
+            mockfs.should_receive(:statfs).with(anything(),"/test/statfs").and_return(statvfs)
+
+            #also exercise StatVfs
+            statvfs.f_files=6666
+
+            with_fuse(mountpoint,mockfs) do
+
+                results = Sys::Filesystem.stat("#{mountpoint}/test/statfs")
+                results.block_size.should == 2048
+                results.fragment_size.should == 1024
+                results.blocks.should == 9999
+                results.blocks_available.should == 7777
+                results.blocks_free.should == 8888
+                results.files.should == 6666
+                results.files_available == 5555
+            end
+        end
+    end
+
     context "exceptions" do
 
         it "should capture exceptions appropriately" do
@@ -191,5 +228,18 @@ describe RFuse::Fuse do
             end
         end
 
+        it "should pass Errno exceptions through" do
+            mockfs.should_receive(:getattr).with(anything(),"/exceptions").and_raise(Errno::EPERM)
+
+            with_fuse(mountpoint,mockfs) do
+                begin
+                    File.stat("#{mountpoint}/exceptions")
+                    raise "should not get here"
+                rescue Errno::EPERM
+                    #all good
+                end
+            end
+        end
+
     end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rfuse
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.5.RC0
+  prerelease: 6
 platform: ruby
 authors:
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !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'
 description: Write userspace filesystems in Ruby
 email:
 - grant@lastweekend.com.au
@@ -143,6 +159,7 @@ files:
 - ext/rfuse/rfuse.c
 - ext/rfuse/rfuse.h
 - ext/rfuse/rfuse_mod.c
+- ext/rfuse/ruby-compat.h
 - lib/rfuse-ng.rb
 - lib/rfuse.rb
 - lib/rfuse/compat.rb
@@ -170,19 +187,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1177971616363714193
+      hash: -1417159270195176123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1177971616363714193
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby language binding for FUSE