rfuse 1.0.5 → 1.1.0.RC0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f29302292efd2fca5a366cb8c385b9d7911398b
+  data.tar.gz: 6e83c7bfafa3a0d770be17bfb1ef45568bad0c66
+SHA512:
+  metadata.gz: c311a008c40bb1ec20b2a929b348e95cccca0181f93bd3ce93f19e29f9e0ea62907feb30d763a0695f42409f9efb2655a3497b20204f867ccbd32384685ebbf6
+  data.tar.gz: 608b039f1efdadf041935b208c79ad10266cb0a33adc7bdf896cc6ed1da758dafcfaab969f9e1027ba7bfc3d23ee2cc52133c8f64c866ce78a2301d1d6ba2ba5

data/.yardopts

@@ -1,2 +1,4 @@
+--no-private
+--markup=markdown
 -
 CHANGES.md

data/CHANGES.md

@@ -1,3 +1,15 @@
+1.1.0 - 2014/MM/DD
+------------------
+
+ * {RFuse::Fuse#trap_signals} a clean way of handling signals (with the self-pipe previously used for a graceful exit)
+ * Default signal handlers for "INT","TERM" (exit fuse), "USR1" (toggle FuseDelegator debugging)
+ * Introduce {RFuse.main} as Ruby equivalent of fuse_main() convenience method for starting filesystems
+
+1.0.5 - 2014/04/16
+------------------
+
+Bugfixes
+
 1.0.4 - 2013/12/19
 ------------------
 

data/README.md

@@ -20,25 +20,23 @@ Dependencies
 Installation
 ---------------
 
-    $ gem install rfuse
+    gem install rfuse
 
 Creating a filesystem
 ---------------------------
 
-Extend and implement the abstract methods of {RFuse::Fuse} (See also {RFuse::FuseDelegator})
+Create your filesystem as a class implementing the abstract FUSE methods from {RFuse::Fuse} as necessary.
+
+Run it with {RFuse.main}
 
 For a sample filesystem see sample/test-ruby.rb
 
 To run the example:
 
-     $ mkdir /tmp/fuse
-     $ ruby sample/test-ruby.rb /tmp/fuse
-
-..and there should be an empty in-memory filesystem mounted at /tmp/fuse
-
-     $ fusermount -u /tmp/fuse
+     mkdir /tmp/fuse
+     ruby sample/test-ruby.rb /tmp/fuse
 
-...should stop the example filesystem program.
+there should be an empty in-memory filesystem mounted at `/tmp/fuse`
 
 HISTORY
 ======

data/ext/rfuse/context.c

@@ -10,7 +10,7 @@ VALUE wrap_context (struct fuse_context *fctx) {
 }
 
 /*
-   @api private
+   @private
 */
 VALUE context_initialize(VALUE self){
   return self;
@@ -25,7 +25,7 @@ VALUE context_new(VALUE class){
 }
 
 /*
-   @return [Integer] User id of the caller
+  @return [Integer] User id of the caller
 */
 VALUE context_uid(VALUE self){
   struct fuse_context *ctx;
@@ -51,6 +51,14 @@ VALUE context_pid(VALUE self){
   return INT2FIX(ctx->pid);
 }
 
+/*
+ * @return [Fuse] the fuse object
+ */
+VALUE context_fuse(VALUE self) {
+  struct fuse_context *ctx;
+  Data_Get_Struct(self,struct fuse_context,ctx);
+  return (VALUE) ctx->private_data;
+}
 /*
    Document-class:  RFuse::Context
    Context object passed to every fuse operation
@@ -58,6 +66,8 @@ VALUE context_pid(VALUE self){
 void context_init(VALUE module) {
 #if 0
     module = rb_define_module("RFuse");
+    
+
 #endif
 
   VALUE cContext=rb_define_class_under(module,"Context",rb_cObject);
@@ -66,4 +76,5 @@ void context_init(VALUE module) {
   rb_define_method(cContext,"uid",context_uid,0);
   rb_define_method(cContext,"gid",context_gid,0);
   rb_define_method(cContext,"pid",context_pid,0);
+  rb_define_method(cContext,"fuse",context_fuse,0);
 }

data/ext/rfuse/file_info.c

@@ -56,6 +56,9 @@ VALUE release_file_info(struct fuse_context *ctx, struct fuse_file_info *ffi)
 
 }
 
+/*
+ * @private
+*/
 VALUE file_info_initialize(VALUE self){
   return self;
 }
@@ -135,7 +138,7 @@ void file_info_init(VALUE module) {
   rb_define_method(cFileInfo,"nonseekable=",file_info_nonseekable_assign,1);
   
   /*
-     Filehandle - can be any ruby object
+     @return [Object] user specified filehandle object. See {Fuse#open}
   */
   rb_define_attr(cFileInfo,"fh",1,1);
 }

data/ext/rfuse/filler.c

@@ -7,7 +7,7 @@ VALUE rfiller_initialize(VALUE self){
 }
 
 /*
-* @api private Never called
+* @private Never called
 */
 VALUE rfiller_new(VALUE class){
   VALUE self;

data/ext/rfuse/rfuse.c

@@ -1778,18 +1778,32 @@ VALUE rf_process(VALUE self)
 * @param [Array<String>] options fuse arguments (-h to see a list)
 */
 static VALUE rf_initialize(
-  VALUE self,
-  VALUE mountpoint_obj,
-  VALUE opts)
+  int argc,
+  VALUE* argv,
+  VALUE self)
 {
 
+  VALUE opts;
+  VALUE first_opt;
+  VALUE mountpoint_arg;
   VALUE mountpoint;
   struct intern_fuse *inf;
   int init_result;
   struct fuse_args *args;
 
+  rb_scan_args(argc, argv, "1*",&mountpoint_arg, &opts);
+
+  // Allow pre 1.0.6 style Fuse which forced options to be passed as an array
+  if (RARRAY_LEN(opts) == 1) {
+      first_opt = rb_ary_entry(opts,0);
+      if (TYPE(first_opt) == T_ARRAY) {
+         opts = first_opt;
+      }
+  }
   //Allow things like Pathname to be sent as a mountpoint
-  mountpoint = rb_obj_as_string(mountpoint_obj);
+  mountpoint = rb_obj_as_string(mountpoint_arg);
+
+  //Is this redundant if scan_args has populted opts?
   Check_Type(opts, T_ARRAY);
 
   Data_Get_Struct(self,struct intern_fuse,inf);
@@ -1930,12 +1944,17 @@ void rfuse_init(VALUE module)
   VALUE cFuse;
 
   mRFuse = module;
+ 
+  // The underlying FUSE library major version
+  rb_define_const(mRFuse,"FUSE_MAJOR_VERSION",INT2FIX(FUSE_MAJOR_VERSION));
+  // The underlyfing FUSE library minor versoin
+  rb_define_const(mRFuse,"FUSE_MINOR_VERSION",INT2FIX(FUSE_MINOR_VERSION));
       
   cFuse = rb_define_class_under(mRFuse,"Fuse",rb_cObject);
 
   rb_define_alloc_func(cFuse,rf_new);
 
-  rb_define_method(cFuse,"initialize",rf_initialize,2);
+  rb_define_method(cFuse,"initialize",rf_initialize,-1);
   rb_define_method(cFuse,"mounted?",rf_mounted,0);
   rb_define_method(cFuse,"invalidate",rf_invalidate,1);
   rb_define_method(cFuse,"unmount",rf_unmount,0);
@@ -1978,7 +1997,6 @@ void rfuse_init(VALUE module)
   rb_define_method(cFuse,"releasedir",unsafe_releasedir,0);
   rb_define_method(cFuse,"fsyncdir",unsafe_fsyncdir,0);
   rb_define_method(cFuse,"init",unsafe_init,0);
-  rb_define_method(cFuse,"destroy",unsafe_destroy,0);
   rb_define_method(cFuse,"access",unsafe_access,0);
   rb_define_method(cFuse,"create",unsafe_create,0);
   rb_define_method(cFuse,"ftruncate",unsafe_ftruncate,0);

data/lib/rfuse/version.rb

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