rstyx 0.3.1 → 0.3.2

data/lib/rstyx/version.rb

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

data/tests/tc_styxservproto.rb

@@ -18,10 +18,11 @@
 # Foundation, Inc., 51 Franklin St., Fifth Floor, Boston, MA
 # 02110-1301 USA.
 #
-# $Id: tc_styxservproto.rb 222 2007-07-09 08:15:44Z dido $
+# $Id: tc_styxservproto.rb 239 2007-08-17 04:56:29Z dido $
 #
 require 'test/unit'
 require 'flexmock'
+require 'flexmock/test_unit'
 require 'rstyx/server'
 
 ##
@@ -92,6 +93,10 @@ module RStyx
         return(@@mock.iounit)
       end
 
+      def clunk(fid)
+        return(@@mock.clunk(fid))
+      end
+
     end
   end
 end
@@ -124,35 +129,36 @@ class FakeConnection
   end
 
   def method_missing(meth, *args)
-    @selfmock.call(meth, *args)
+    @selfmock.send(meth, *args)
   end
 end
 
 class TestStyxServProto < Test::Unit::TestCase
   def test_tversion
-    FlexMock.use("sessmock") do |sessmock|
-      serv = FakeConnection.new(nil, sessmock, nil)
-      sessmock.should_receive(:reset_session).with(Integer).returns do |m|
-        assert_equal(1024, m)
-      end
-      resp = serv.tversion(RStyx::Message::Tversion.new(:version => "9P2000",
-                                                        :msize => 1024))
-      assert_equal(RStyx::Message::Rversion, resp.class)
-      assert_equal("9P2000", resp.version)
-      assert_equal(8216, resp.msize)
-    end
+    sessmock1 = flexmock
+    selfmock = flexmock(:get_peername => nil)
+    serv = FakeConnection.new(selfmock, sessmock1, nil)
+    sessmock1.should_receive(:reset_session).with(Integer).returns do |m|
+      assert_equal(1024, m)
 
-    FlexMock.use("sessmock") do |sessmock|
-      serv = FakeConnection.new(nil, sessmock, nil)
-      resp = serv.tversion(RStyx::Message::Tversion.new(:version => "foo",
-                                                        :msize => 1024))
-      assert_equal(RStyx::Message::Rerror, resp.class)
-      assert_equal("Unsupported protocol version foo (must be 9P2000)", resp.ename)
     end
+    resp = serv.tversion(RStyx::Message::Tversion.new(:version => "9P2000",
+                                                      :msize => 1024))
+    assert_equal(RStyx::Message::Rversion, resp.class)
+    assert_equal("9P2000", resp.version)
+    assert_equal(8216, resp.msize)
+
+    sessmock = flexmock
+    serv = FakeConnection.new(selfmock, sessmock, nil)
+    resp = serv.tversion(RStyx::Message::Tversion.new(:version => "foo",
+                                                      :msize => 1024))
+    assert_equal(RStyx::Message::Rerror, resp.class)
+    assert_equal("Unsupported protocol version foo (must be 9P2000)", resp.ename)
   end
 
   def test_tauth
-    serv = FakeConnection.new(nil, nil, nil)
+    selfmock = flexmock(:get_peername => nil)
+    serv = FakeConnection.new(selfmock, nil, nil)
     resp = serv.tauth(RStyx::Message::Tauth.new(:fid => 1,
                                                 :afid => 2,
                                                 :uname => "foo",
@@ -162,10 +168,11 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_tattach
+    selfmock = flexmock(:get_peername => nil)
     # Test no version negotiation error
     FlexMock.use("sessmock") do |sessmock|
       sessmock.should_receive(:version_negotiated?).returns(false)
-      serv = FakeConnection.new(nil, sessmock, nil)
+      serv = FakeConnection.new(selfmock, sessmock, nil)
       assert_raises(RStyx::StyxException) do
         serv.tattach(RStyx::Message::Tattach.new(:fid => 1,
                                                  :afid => 2,
@@ -178,7 +185,7 @@ class TestStyxServProto < Test::Unit::TestCase
     FlexMock.use("sessmock") do |sessmock|
       sessmock.should_receive(:version_negotiated?).returns(true)
       sessmock.should_receive(:has_fid?).with(1).returns(true)
-      serv = FakeConnection.new(nil, sessmock, nil)
+      serv = FakeConnection.new(selfmock, sessmock, nil)
       assert_raises(RStyx::StyxException) do
         serv.tattach(RStyx::Message::Tattach.new(:fid => 1,
                                                  :afid => 2,
@@ -195,7 +202,7 @@ class TestStyxServProto < Test::Unit::TestCase
         sessmock.should_receive(:[]=).with(1, rootmock)
         # Return a phony QID with a distinctive pattern
         rootmock.should_receive(:qid).returns(RStyx::Message::Qid.new(0x12345678, 0x87654321, 0xfeedfacec0ffeee))
-        serv = FakeConnection.new(nil, sessmock, rootmock)
+        serv = FakeConnection.new(selfmock, sessmock, rootmock)
         resp = serv.tattach(RStyx::Message::Tattach.new(:fid => 1,
                                                         :afid => 2,
                                                         :uname => "foo",
@@ -208,17 +215,19 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_tflush
+    selfmock = flexmock(:get_peername => nil)
     FlexMock.use("sessmock") do |sessmock|
       sessmock.should_receive(:flush_tag).with(100)
-      serv = FakeConnection.new(nil, sessmock, nil)
+      serv = FakeConnection.new(selfmock, sessmock, nil)
       resp = serv.tflush(RStyx::Message::Tflush.new(:oldtag => 100))
       assert_equal(RStyx::Message::Rflush, resp.class)
     end
   end
 
   def test_twalk
+    selfmock = flexmock(:get_peername => nil)
     # Test for wnames > MAXWELEM
-    serv = FakeConnection.new(nil, nil, nil)
+    serv = FakeConnection.new(selfmock, nil, nil)
     assert_raises(RStyx::StyxException) do
       serv.twalk(RStyx::Message::Twalk.new(:fid => 1,
                                            :newfid => 2,
@@ -235,7 +244,7 @@ class TestStyxServProto < Test::Unit::TestCase
       FlexMock.use("filemock") do |filemock|
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:client).returns(:pwn3d)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                :newfid => 43,
@@ -250,7 +259,7 @@ class TestStyxServProto < Test::Unit::TestCase
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:client).returns(nil)
         sessmock.should_receive(:has_fid?).with(43).returns(true)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                :newfid => 43,
@@ -267,7 +276,7 @@ class TestStyxServProto < Test::Unit::TestCase
         sessmock.should_receive(:has_fid?).with(43).returns(false)
         filemock.should_receive(:directory?).returns(false)
         filemock.should_receive(:name).returns("foo")
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                :newfid => 43,
@@ -285,7 +294,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:directory?).returns(true)
         filemock.should_receive(:name).returns("foo")
         sessmock.should_receive(:execute?).returns(false)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                :newfid => 43,
@@ -305,7 +314,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:name).returns("foo")
         filemock.should_receive(:atime=)
         filemock.should_receive(:[]).with("1").returns(nil)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                :newfid => 43,
@@ -327,7 +336,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:[]).with("2").returns(nil)
         filemock.should_receive(:qid).returns(RStyx::Message::Qid.new(0x12345678, 0x87654321, 0xfeedfacec0ffeee))
         filemock.should_receive(:refresh)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                     :newfid => 43,
                                                     :wnames => ["1", "2"]))
@@ -360,8 +369,8 @@ class TestStyxServProto < Test::Unit::TestCase
                ]
         filemock.should_receive(:qid).returns { qids.shift }
         filemock.should_receive(:refresh)
-        sessmock.should_receive(:[]=).with(42, filemock)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        sessmock.should_receive(:[]=).with(43, filemock)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.twalk(RStyx::Message::Twalk.new(:fid => 42,
                                                     :newfid => 43,
                                                     :wnames => ["1", "2"]))
@@ -383,6 +392,7 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_topen
+    selfmock = flexmock(:get_peername => nil)
     FlexMock.use("sessmock") do |sessmock|
       FlexMock.use("filemock") do |filemock|
         sessmock.should_receive(:[]).with(42).returns(filemock)
@@ -392,7 +402,7 @@ class TestStyxServProto < Test::Unit::TestCase
         sessmock.should_receive(:user)
         filemock.should_receive(:qid).returns(RStyx::Message::Qid.new(0x12345678, 0x87654321, 0xfeedfacec0ffeee))
         sessmock.should_receive(:iounit).returns(0xdeadbeef)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.topen(RStyx::Message::Topen.new(:fid => 42,
                                                     :mode => RStyx::OTRUNC))
         assert_equal(RStyx::Message::Qid.new(0x12345678, 0x87654321, 0xfeedfacec0ffeee), resp.qid)
@@ -402,13 +412,14 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_tcreate
+    selfmock = flexmock(:get_peername => nil)
     # First, test the error condition of trying to create a file
     # inside a fid representing a file.
     FlexMock.use("sessmock") do |sessmock|
       FlexMock.use("filemock") do |filemock|
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:directory?).returns(false)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.tcreate(RStyx::Message::Tcreate.new(:fid => 42,
                                                           :mode => RStyx::OTRUNC))
@@ -423,7 +434,7 @@ class TestStyxServProto < Test::Unit::TestCase
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:directory?).returns(true)
         sessmock.should_receive(:writable?).returns(false)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.tcreate(RStyx::Message::Tcreate.new(:fid => 42,
                                                           :mode => RStyx::OTRUNC))
@@ -443,7 +454,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:add_client)
         filemock.should_receive(:qid).returns(RStyx::Message::Qid.new(0x12345678, 0x87654321, 0xfeedfacec0ffeee))
         sessmock.should_receive(:iounit).returns(0xdeadbeef)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.tcreate(RStyx::Message::Tcreate.new(:fid => 42,
                                                         :name => "foo",
                                                         :perm => 0644,
@@ -460,12 +471,13 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_tread
+    selfmock = flexmock(:get_peername => nil)
     # Test error condition -- file not open for reading
     FlexMock.use("sessmock") do |sessmock|
       FlexMock.use("filemock") do |filemock|
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:client).returns(nil)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.tread(RStyx::Message::Tread.new(:fid => 42,
                                                       :offset => 0xfeedfacec0ffeeee,
@@ -481,7 +493,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:client).returns(filemock)
         filemock.should_receive(:readable?).returns(true)
         sessmock.should_receive(:iounit).returns(8216)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.tread(RStyx::Message::Tread.new(:fid => 42,
                                                       :offset => 0xfeedfacec0ffeeee,
@@ -502,7 +514,7 @@ class TestStyxServProto < Test::Unit::TestCase
           assert_equal(1000, a3)
           true
         end
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.tread(RStyx::Message::Tread.new(:fid => 42,
                                                     :offset => 0xfeedfacec0ffeeee,
                                                     :count => 1000))
@@ -513,12 +525,13 @@ class TestStyxServProto < Test::Unit::TestCase
   end
 
   def test_twrite
+    selfmock = flexmock(:get_peername => nil)
     # Test error condition -- file not open for writing
     FlexMock.use("sessmock") do |sessmock|
       FlexMock.use("filemock") do |filemock|
         sessmock.should_receive(:[]).with(42).returns(filemock)
         filemock.should_receive(:client).returns(nil)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.twrite(RStyx::Message::Twrite.new(:fid => 42,
                                                         :offset => 0xfeedfacec0ffeeee,
@@ -534,7 +547,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:client).returns(filemock)
         filemock.should_receive(:writable?).returns(true)
         sessmock.should_receive(:iounit).returns(8216)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         assert_raises(RStyx::StyxException) do
           resp = serv.twrite(RStyx::Message::Twrite.new(:fid => 42,
                                                         :offset => 0xfeedfacec0ffeeee,
@@ -559,7 +572,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:truncate?).returns(false)
         filemock.should_receive(:appendonly?).returns(false)
         filemock.should_receive(:length).returns(42)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.twrite(RStyx::Message::Twrite.new(:fid => 42,
                                                       :offset => 0xfeedfacec0ffeeee,
                                                       :data => "0" * 1000))
@@ -584,7 +597,7 @@ class TestStyxServProto < Test::Unit::TestCase
         filemock.should_receive(:truncate?).returns(false)
         filemock.should_receive(:appendonly?).returns(true)
         filemock.should_receive(:length).returns(42)
-        serv = FakeConnection.new(nil, sessmock, nil)
+        serv = FakeConnection.new(selfmock, sessmock, nil)
         resp = serv.twrite(RStyx::Message::Twrite.new(:fid => 42,
                                                       :offset => 0xfeedfacec0ffeeee,
                                                       :data => "0" * 1000))
@@ -593,4 +606,15 @@ class TestStyxServProto < Test::Unit::TestCase
     end
   end
 
+  def test_tclunk
+    selfmock = flexmock(:get_peername => nil)
+    sessmock = flexmock
+    sessmock.should_receive(:clunk).with(Integer).returns do |f|
+      assert_equal(42, f)
+    end
+    serv = FakeConnection.new(selfmock, sessmock, nil)
+    resp = serv.tclunk(RStyx::Message::Tclunk.new(:fid => 42))
+    assert_equal(RStyx::Message::Rclunk, resp.class)
+  end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rstyx
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2007-08-14 00:00:00 +08:00
+  version: 0.3.2
+date: 2007-09-13 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
@@ -33,9 +33,12 @@ files:
 - ChangeLog
 - Manifest.txt
 - NEWS
-- README
+- README.txt
 - Rakefile
 - examples/readstyxfile.rb
+- examples/fileondisk.rb
+- examples/testserver.rb
+- examples/writestyxfile.rb
 - lib/rstyx/authmodules.rb
 - lib/rstyx/client.rb
 - lib/rstyx/common.rb
@@ -55,6 +58,7 @@ rdoc_options:
 - README.txt
 extra_rdoc_files: 
 - Manifest.txt
+- README.txt
 executables: []
 
 extensions: []