rstyx 0.3.0 → 0.3.1

data/lib/rstyx/server.rb

@@ -36,7 +36,7 @@
 # Copyright:: Copyright (c) 2005-2007 Rafael R. Sevilla
 # License:: GNU Lesser General Public License
 #
-# $Id: server.rb 231 2007-08-10 08:43:57Z dido $
+# $Id: server.rb 234 2007-08-14 11:17:13Z dido $
 #
 require 'thread'
 require 'monitor'
@@ -652,8 +652,9 @@ module RStyx
             rescue Exception => e
               # if there was a problem removing the file, ignore it
             end
-            sf.remove_client(sfc)
           end
+          sf.remove_client(sfc)
+          @fids.delete(fid)
         end
       end
 
@@ -865,7 +866,7 @@ module RStyx
     class SFile < Monitor
 
       attr_reader :name, :uid, :gid, :muid, :mtime
-      attr_accessor :permissions, :atime, :parent
+      attr_accessor :permissions, :atime, :parent, :version
 
       ##
       # Create a new file object with the given permissions.
@@ -921,6 +922,8 @@ module RStyx
         # The clients who have a connection to the file
         @clients = []
         @clients.extend(MonitorMixin)
+        # Change listeners
+        @changelisteners = []
       end
 
       ##
@@ -1121,7 +1124,7 @@ module RStyx
       # written to.  It should return the number of bytes actually
       # "written".
       #
-      def write(client, offset, count, data, truncate)
+      def write(client, offset, data, truncate)
         raise StyxException.new("Cannot write to this file")
       end
 
@@ -1184,12 +1187,25 @@ module RStyx
       def client_disconnected(cl)
       end
 
+      def add_changelistener(&block)
+        @changelisteners << block
+      end
+
       def contents_changed
         version_incr
+        @changelisteners.each do |listener|
+          listener.call(self)
+        end
       end
 
       def version_incr
-        self.version = ((self.version + 1) & 0xffffffffffffffff)
+        @version = ((@version + 1) & 0xffffffffffffffff)
+      end
+
+      def reply_write(count, session)
+        self.set_mtime(Time.now, session.user)
+        self.contents_changed
+        return(Message::Rwrite.new(:count => count))
       end
 
       def refresh
@@ -1293,11 +1309,38 @@ module RStyx
     class InMemoryFile < SFile
       attr_accessor :contents
 
+      def initialize(name, argv={ :permissions => 0666, :apponly => false,
+                       :excl => false, :uid => ENV["USER"],
+                       :gid => ENV["GROUP"] })
+        super(name, argv)
+        @contentslock = Mutex.new
+      end
+
       def read(client, offset, count)
         data = @contents[offset..(offset+count)]
         data ||= ""
         return(Message::Rread.new(:data => data))
       end
+
+      def write(client, offset, data, truncate)
+        @contentslock.synchronize do
+          # First write to the file
+          if @contents.nil?
+            @contents = ""
+          end
+
+          if offset > @contents.length
+            raise StyxException.new("attempt to write past the end of the file")
+          end
+
+          @contents[offset..(offset + data.length)] = data
+          if (truncate)
+            @contents = @contents[0..(offset+data.length)]
+          end
+          return(reply_write(data.length, client.session))
+        end
+      end
+
     end
 
   end                           # module Server

data/lib/rstyx/version.rb

@@ -20,7 +20,7 @@
 #
 # RStyx version code
 #
-# $Id: version.rb 232 2007-08-10 08:44:34Z dido $
+# $Id: version.rb 235 2007-08-14 11:17:48Z dido $
 #
 
 module RStyx
@@ -28,7 +28,7 @@ module RStyx
 
     MAJOR = 0
     MINOR = 3
-    TINY = 0
+    TINY = 1
 
     # The version of RStyx in use.
     STRING = [ MAJOR, MINOR, TINY ].join(".")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rstyx
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-08-10 00:00:00 +08:00
+  version: 0.3.1
+date: 2007-08-14 00:00:00 +08:00
 summary: RStyx is a Ruby implementation of the 9P2000/Styx distributed file protocol used on Plan 9 and Inferno.
 require_paths: 
 - lib