net-sftp 1.0.0 → 1.0.1

data/doc/faq/faq.html

@@ -60,56 +60,56 @@
   <h1>Net::SFTP FAQ</h1>
   <div class="faq-list">
 <ul>
-<li><a href='#2203312'>What is Net::SFTP?</a></li>
+<li><a href='#2224878'>What is Net::SFTP?</a></li>
 <li>How do I&#8230;
 <ul>
 <li>...connect to an <span class="caps">SFTP</span> server?
 <ul>
-<li><a href='#2203252'>I&#8217;d like to connect without first getting a Net::SSH connection&#8230;</a></li>
-<li><a href='#2203212'>I already have an open Net::SSH connection&#8230;</a></li>
+<li><a href='#2224778'>I&#8217;d like to connect without first getting a Net::SSH connection&#8230;</a></li>
+<li><a href='#2224728'>I already have an open Net::SSH connection&#8230;</a></li>
 </ul>
 </li>
 <li>...upload data?
 <ul>
-<li><a href='#2203132'>I want to upload an entire file on disk&#8230;</a></li>
-<li><a href='#2203092'>I want to upload bytes from a string or other object&#8230;</a></li>
+<li><a href='#2224628'>I want to upload an entire file on disk&#8230;</a></li>
+<li><a href='#2224588'>I want to upload bytes from a string or other object&#8230;</a></li>
 </ul>
 </li>
 <li>...download data?
 <ul>
-<li><a href='#2203012'>I want to download directly to a local file&#8230;</a></li>
-<li><a href='#2202972'>I want to download to a string in memory&#8230;</a></li>
-<li><a href='#2202932'>I want to be notified of the progress of the download&#8230;</a></li>
+<li><a href='#2224508'>I want to download directly to a local file&#8230;</a></li>
+<li><a href='#2224458'>I want to download to a string in memory&#8230;</a></li>
+<li><a href='#292410'>I want to be notified of the progress of the download&#8230;</a></li>
 </ul>
 </li>
 <li>...manage file permissions?
 <ul>
-<li><a href='#2202862'>I want to query a file&#8217;s permissions&#8230;</a></li>
-<li><a href='#2202822'>I want to change a file&#8217;s permissions&#8230;</a></li>
-<li><a href='#2202782'>I already have an open handle for the remove file&#8230;</a></li>
+<li><a href='#292290'>I want to query a file&#8217;s permissions&#8230;</a></li>
+<li><a href='#292210'>I want to change a file&#8217;s permissions&#8230;</a></li>
+<li><a href='#292130'>I already have an open handle for the remote file&#8230;</a></li>
 </ul>
 </li>
 <li>...manage directories?
 <ul>
-<li><a href='#2202692'>I want to query the contents of a directory&#8230;</a></li>
-<li><a href='#2202652'>I want to create a directory&#8230;</a></li>
-<li><a href='#2202612'>I want to remove a directory&#8230;</a></li>
+<li><a href='#291970'>I want to query the contents of a directory&#8230;</a></li>
+<li><a href='#291870'>I want to create a directory&#8230;</a></li>
+<li><a href='#291750'>I want to remove a directory&#8230;</a></li>
 </ul>
 </li>
-<li><a href='#2202542'>...delete a file?</a></li>
-<li><a href='#2202502'>...rename a file?</a></li>
+<li><a href='#291670'>...delete a file?</a></li>
+<li><a href='#291630'>...rename a file?</a></li>
 </ul>
 </li>
 </ul>
 </div>
-<a name='2203312'></a>
+<a name='2224878'></a>
 <div class='faq-title'>What is Net::SFTP?</div>
 <div class='faq-answer'><p>Net::SFTP is a pure-Ruby implementation of the <span class="caps">SFTP</span> protocol. That&#8217;s
 &#8220;SFTP&#8221; as in &#8220;Secure File Transfer Protocol&#8221;, as defined as an adjuct to the
 <span class="caps">SSH</span> specification. <em>Not</em> &#8220;SFTP&#8221; as in &#8220;Secure <span class="caps">FTP</span>&#8221; (a <em>completely</em> different
 beast). Nor is it an implementation of the &#8220;Simple File Transfer Protocol&#8221; 
 (which is in no way secure).</p></div>
-<a name='2203252'></a>
+<a name='2224778'></a>
 <div class='faq-title'>How do I&#8230; ...connect to an <span class="caps">SFTP</span> server? I&#8217;d like to connect without first getting a Net::SSH connection&#8230;</div>
 <div class='faq-answer'><p>Something like this:</p>
 
@@ -124,7 +124,7 @@ beast). Nor is it an implementation of the &#8220;Simple File Transfer Protocol&
 
 	<p><code>Net::SFTP.start</code> accepts the same parameters as <code>Net::SSH.start</code>,
 so I&#8217;ll direct you to that documentation for all the particulars.</p></div>
-<a name='2203212'></a>
+<a name='2224728'></a>
 <div class='faq-title'>How do I&#8230; ...connect to an <span class="caps">SFTP</span> server? I already have an open Net::SSH connection&#8230;</div>
 <div class='faq-answer'><p>You can piggy-back an <span class="caps">SFTP</span> connection on an existing Net::SSH
 connection, which can be useful if you&#8217;ve already got an <span class="caps">SSH</span>
@@ -143,7 +143,7 @@ connection that you&#8217;re using for port forwarding or whatever.</p>
     ...
   end
 </pre></code></div>
-<a name='2203132'></a>
+<a name='2224628'></a>
 <div class='faq-title'>How do I&#8230; ...upload data? I want to upload an entire file on disk&#8230;</div>
 <div class='faq-answer'><p>Assuming you already have an <span class="caps">SFTP</span> connection:</p>
 
@@ -151,7 +151,7 @@ connection that you&#8217;re using for port forwarding or whatever.</p>
 <code><pre>
   sftp.put_file "/path/to/local.file", "/path/to/remote.file" 
 </pre></code></div>
-<a name='2203092'></a>
+<a name='2224588'></a>
 <div class='faq-title'>How do I&#8230; ...upload data? I want to upload bytes from a string or other object&#8230;</div>
 <div class='faq-answer'><p>Assuming you already have an <span class="caps">SFTP</span> connection, and your data is stored
 in a string named <code>data</code>:</p>
@@ -174,7 +174,7 @@ without, but be sure to call <code>close_handle</code> when you&#8217;re done:</
   puts result.code # the result of the operation
   sftp.close_handle(handle)
 </pre></code></div>
-<a name='2203012'></a>
+<a name='2224508'></a>
 <div class='faq-title'>How do I&#8230; ...download data? I want to download directly to a local file&#8230;</div>
 <div class='faq-answer'><p>Assuming you already have an <span class="caps">SFTP</span> connection:</p>
 
@@ -182,7 +182,7 @@ without, but be sure to call <code>close_handle</code> when you&#8217;re done:</
 <code><pre>
   sftp.get_file "/path/to/remote.file", "/path/to/local.file" 
 </pre></code></div>
-<a name='2202972'></a>
+<a name='2224458'></a>
 <div class='faq-title'>How do I&#8230; ...download data? I want to download to a string in memory&#8230;</div>
 <div class='faq-answer'><p>Assuming you already have an <span class="caps">SFTP</span> connection:</p>
 
@@ -193,7 +193,7 @@ without, but be sure to call <code>close_handle</code> when you&#8217;re done:</
     data = sftp.read(handle)
   end
 </pre></code></div>
-<a name='2202932'></a>
+<a name='292410'></a>
 <div class='faq-title'>How do I&#8230; ...download data? I want to be notified of the progress of the download&#8230;</div>
 <div class='faq-answer'><p>You can specify both a &#8220;chunk size&#8221; and a &#8220;progress callback&#8221;. The
 callback will be invoked for every &#8220;chunk size&#8221; bytes that are
@@ -212,7 +212,7 @@ received:</p>
     end
   end
 </pre></code></div>
-<a name='2202862'></a>
+<a name='292290'></a>
 <div class='faq-title'>How do I&#8230; ...manage file permissions? I want to query a file&#8217;s permissions&#8230;</div>
 <div class='faq-answer'><p>File permissions are one of the <code>stat</code> attributes of files and
 directories:</p>
@@ -221,7 +221,7 @@ directories:</p>
 <code><pre>
   p sftp.stat("/path/to/remote.file").permissions
 </pre></code></div>
-<a name='2202822'></a>
+<a name='292210'></a>
 <div class='faq-title'>How do I&#8230; ...manage file permissions? I want to change a file&#8217;s permissions&#8230;</div>
 <div class='faq-answer'><p>Just use <code>setstat</code> to change the permissions of an existing file:</p>
 
@@ -229,8 +229,8 @@ directories:</p>
 <code><pre>
   sftp.setstat("/path/to/remote.file", :permissions =&gt; 0644)
 </pre></code></div>
-<a name='2202782'></a>
-<div class='faq-title'>How do I&#8230; ...manage file permissions? I already have an open handle for the remove file&#8230;</div>
+<a name='292130'></a>
+<div class='faq-title'>How do I&#8230; ...manage file permissions? I already have an open handle for the remote file&#8230;</div>
 <div class='faq-answer'><p>If you have a handle for the remote file, you can use <code>fstat</code> and
 <code>fsetstat</code> to query and set the permissions:</p>
 
@@ -241,7 +241,7 @@ directories:</p>
     sftp.fsetstat(handle, :permissions =&gt; permissions | 0444)
   end
 </pre></code></div>
-<a name='2202692'></a>
+<a name='291970'></a>
 <div class='faq-title'>How do I&#8230; ...manage directories? I want to query the contents of a directory&#8230;</div>
 <div class='faq-answer'><p>You query the contents of a directory by calling <code>opendir</code> to obtain
 a handle to the directory, and then using <code>readdir</code> on the handle to
@@ -259,7 +259,7 @@ you&#8217;re done:</p>
   end
   sftp.close_handle(handle)
 </pre></code></div>
-<a name='2202652'></a>
+<a name='291870'></a>
 <div class='faq-title'>How do I&#8230; ...manage directories? I want to create a directory&#8230;</div>
 <div class='faq-answer'><p>Use <code>mkdir</code>:</p>
 
@@ -267,7 +267,7 @@ you&#8217;re done:</p>
 <code><pre>
   sftp.mkdir("/path/to/remote/dir", :permissions =&gt; 0500)
 </pre></code></div>
-<a name='2202612'></a>
+<a name='291750'></a>
 <div class='faq-title'>How do I&#8230; ...manage directories? I want to remove a directory&#8230;</div>
 <div class='faq-answer'><p>Use <code>rmdir</code>:</p>
 
@@ -275,7 +275,7 @@ you&#8217;re done:</p>
 <code><pre>
   sftp.rmdir("/path/to/remote/dir")
 </pre></code></div>
-<a name='2202542'></a>
+<a name='291670'></a>
 <div class='faq-title'>How do I&#8230; ...delete a file?</div>
 <div class='faq-answer'><p>Use <code>remove</code>:</p>
 
@@ -283,7 +283,7 @@ you&#8217;re done:</p>
 <code><pre>
   sftp.remove("/path/to/remote.file")
 </pre></code></div>
-<a name='2202502'></a>
+<a name='291630'></a>
 <div class='faq-title'>How do I&#8230; ...rename a file?</div>
 <div class='faq-answer'><p>Use <code>rename</code>:</p>
 

data/doc/faq/faq.yml

@@ -121,7 +121,7 @@
             sftp.setstat("/path/to/remote.file", :permissions => 0644)
           </pre></code>
 
-      - "I already have an open handle for the remove file...": |
+      - "I already have an open handle for the remote file...": |
           If you have a handle for the remote file, you can use @fstat@ and
           @fsetstat@ to query and set the permissions:
 

data/lib/net/sftp/operations/write.rb

@@ -23,7 +23,7 @@ module Net ; module SFTP ; module Operations
   class Write < Abstract
 
     # The maximum size of data that will be written at one time.
-    CHUNK_SIZE = 64 * 1024
+    CHUNK_SIZE = 32 * 1024
 
     # Perform the operation. Only CHUNK_SIZE portions of the +data+ parameter
     # will be written at a time, with subsequent chunks being writteni

data/lib/net/sftp/protocol/04/impl.rb

@@ -21,70 +21,7 @@ module Net ; module SFTP ; module Protocol ; module V_04
   # The implementation of the operations available to version 4 of the SFTP
   # protocol.
   class Impl < V_03::Impl
-
-    F_CREATE_NEW         = 0x00000000
-    F_CREATE_TRUNCATE    = 0x00000001
-    F_OPEN_EXISTING      = 0x00000002
-    F_OPEN_OR_CREATE     = 0x00000003
-    F_TRUNCATE_EXISTING  = 0x00000004
-
-    F_APPEND_DATA        = 0x00000008
-    F_APPEND_DATA_ATOMIC = 0x00000010
-    F_TEXT_MODE          = 0x00000020
-    F_READ_LOCK          = 0x00000040
-    F_WRITE_LOCK         = 0x00000080
-    F_DELETE_LOCK        = 0x00000100
-
-    module ACE
-      F_READ_DATA         = 0x00000001
-      F_LIST_DIRECTORY    = 0x00000001
-      F_WRITE_DATA        = 0x00000002
-      F_ADD_FILE          = 0x00000002
-      F_APPEND_DATA       = 0x00000004
-      F_ADD_SUBDIRECTORY  = 0x00000004
-      F_READ_NAMED_ATTRS  = 0x00000008
-      F_WRITE_NAMED_ATTRS = 0x00000010
-      F_EXECUTE           = 0x00000020
-      F_DELETE_CHILD      = 0x00000040
-      F_READ_ATTRIBUTES   = 0x00000080
-      F_WRITE_ATTRIBUTES  = 0x00000100
-      F_DELETE            = 0x00010000
-      F_READ_ACL          = 0x00020000
-      F_WRITE_ACL         = 0x00040000
-      F_WRITE_OWNER       = 0x00080000
-      F_SYNCHRONIZE       = 0x00100000
-    end
-
-    # The open operation changed in version 4. This method keeps the same
-    # interface as previous versions, but changes how the parameters are
-    # interpreted and converted into a packet.
-    def open( id, path, flags, mode=0660 )
-      sftp_flags, desired_access = case
-        when flags & IO::WRONLY != 0 then
-          [ F_CREATE_TRUNCATE,
-            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES ]
-        when flags & IO::RDWR   != 0 then
-          [ F_OPEN_OR_CREATE,
-            ACE::F_READ_DATA | ACE::F_READ_ATTRIBUTES |
-            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES ]
-        when flags & IO::APPEND != 0 then
-          [ F_OPEN_OR_CREATE | F_APPEND_DATA,
-            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES |
-            ACE::F_APPEND_DATA ]
-        else
-          [ F_OPEN_EXISTING,
-            ACE::F_READ_DATA | ACE::F_READ_ATTRIBUTES ]
-      end
-
-      sftp_flags |= F_OPEN_OR_CREATE if flags & IO::CREAT != 0
-      sftp_flags |= F_TRUNCATE_EXISTING if flags & IO::TRUNC != 0
-
-      attributes = @attr_factory.empty
-      attributes.permissions = mode
-
-      open_raw id, path, desired_access, sftp_flags, attributes
-    end
-
+ 
     # In version 4, stat accepts a flags parameter. If flags is +nil+, it
     # will default to returning all attributes. Otherwise, the flags parameter
     # should be a bitwise combination of the F_xxx constants of
@@ -129,6 +66,21 @@ module Net ; module SFTP ; module Protocol ; module V_04
     end
     private :convert_flags
 
+    # Used internally to handle +name+ packets. The +on_name+ callback is
+    # invoked, if registered, with the driver, id, and array of items. The v4
+    # version of this method sets the 'longname' member of the Name object to
+    # +nil+ (it is not used in this version).
+    def do_name( channel, content )
+      return unless has_on_name?
+      id = content.read_long
+      items = []
+      content.read_long.times do
+        items.push( Name.new( content.read_string, nil,
+          @attr_factory.from_buffer( content ) ) )
+      end
+      call_on_name( driver, id, items )
+    end
+
   end
 
 end ; end ; end ; end

data/lib/net/sftp/protocol/04/packet-assistant.rb

@@ -21,18 +21,12 @@ module Net ; module SFTP ; module Protocol ; module V_04
   # Version 4 of the SFTP protocol changed the number of parameters to several
   # different packet types:
   #
-  # * open( id, path, access, flags, attrs )
   # * rename( id, old, new, flags )
   # * stat( id, path, flags )
   # * lstat( id, path, flags )
   # * fstat( id, handle, flags )
   class PacketAssistant < V_03::PacketAssistant
 
-    packet :open,     :string, # path
-                      :long,   # access
-                      :long,   # flags
-                      :attrs   # file attributes
-
     packet :rename,   :string, # old name
                       :string, # new name
                       :long    # flags

data/lib/net/sftp/protocol/05/impl.rb

@@ -0,0 +1,90 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Net::SFTP Secure FTP Client
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Net::SFTP
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# net-sftp website: http://net-ssh.rubyforge.org/sftp
+# project website : http://rubyforge.org/projects/net-ssh
+# =============================================================================
+#++
+
+require 'net/sftp/protocol/04/impl'
+
+module Net ; module SFTP ; module Protocol ; module V_05
+
+  # The implementation of the operations available to version 5 of the SFTP
+  # protocol.
+  class Impl < V_04::Impl
+
+    F_CREATE_NEW         = 0x00000000
+    F_CREATE_TRUNCATE    = 0x00000001
+    F_OPEN_EXISTING      = 0x00000002
+    F_OPEN_OR_CREATE     = 0x00000003
+    F_TRUNCATE_EXISTING  = 0x00000004
+
+    F_APPEND_DATA        = 0x00000008
+    F_APPEND_DATA_ATOMIC = 0x00000010
+    F_TEXT_MODE          = 0x00000020
+    F_READ_LOCK          = 0x00000040
+    F_WRITE_LOCK         = 0x00000080
+    F_DELETE_LOCK        = 0x00000100
+
+    module ACE
+      F_READ_DATA         = 0x00000001
+      F_LIST_DIRECTORY    = 0x00000001
+      F_WRITE_DATA        = 0x00000002
+      F_ADD_FILE          = 0x00000002
+      F_APPEND_DATA       = 0x00000004
+      F_ADD_SUBDIRECTORY  = 0x00000004
+      F_READ_NAMED_ATTRS  = 0x00000008
+      F_WRITE_NAMED_ATTRS = 0x00000010
+      F_EXECUTE           = 0x00000020
+      F_DELETE_CHILD      = 0x00000040
+      F_READ_ATTRIBUTES   = 0x00000080
+      F_WRITE_ATTRIBUTES  = 0x00000100
+      F_DELETE            = 0x00010000
+      F_READ_ACL          = 0x00020000
+      F_WRITE_ACL         = 0x00040000
+      F_WRITE_OWNER       = 0x00080000
+      F_SYNCHRONIZE       = 0x00100000
+    end
+
+    # The open operation changed in version 4. This method keeps the same
+    # interface as previous versions, but changes how the parameters are
+    # interpreted and converted into a packet.
+    def open( id, path, flags, mode=0660 )
+      sftp_flags, desired_access = case
+        when flags & IO::WRONLY != 0 then
+          [ F_CREATE_TRUNCATE,
+            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES ]
+        when flags & IO::RDWR   != 0 then
+          [ F_OPEN_OR_CREATE,
+            ACE::F_READ_DATA | ACE::F_READ_ATTRIBUTES |
+            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES ]
+        when flags & IO::APPEND != 0 then
+          [ F_OPEN_OR_CREATE | F_APPEND_DATA,
+            ACE::F_WRITE_DATA | ACE::F_WRITE_ATTRIBUTES |
+            ACE::F_APPEND_DATA ]
+        else
+          [ F_OPEN_EXISTING,
+            ACE::F_READ_DATA | ACE::F_READ_ATTRIBUTES ]
+      end
+
+      sftp_flags |= F_OPEN_OR_CREATE if flags & IO::CREAT != 0
+      sftp_flags |= F_TRUNCATE_EXISTING if flags & IO::TRUNC != 0
+
+      attributes = @attr_factory.empty
+      attributes.permissions = mode
+
+      open_raw id, path, desired_access, sftp_flags, attributes
+    end
+
+  end
+
+end ; end ; end ; end

data/lib/net/sftp/protocol/05/packet-assistant.rb

@@ -0,0 +1,34 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Net::SFTP Secure FTP Client
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Net::SFTP
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# net-sftp website: http://net-ssh.rubyforge.org/sftp
+# project website : http://rubyforge.org/projects/net-ssh
+# =============================================================================
+#++
+
+require 'net/sftp/protocol/04/packet-assistant'
+
+module Net ; module SFTP ; module Protocol ; module V_05
+
+  # Version 5 of the SFTP protocol changed the number of parameters to several
+  # different packet types:
+  #
+  # * open( id, path, access, flags, attrs )
+  class PacketAssistant < V_04::PacketAssistant
+
+    packet :open,     :string, # path
+                      :long,   # access
+                      :long,   # flags
+                      :attrs   # file attributes
+
+  end
+
+end ; end ; end ; end

data/lib/net/sftp/protocol/05/services.rb

@@ -20,8 +20,8 @@ module Net ; module SFTP ; module Protocol ; module V_05
     container.namespace_define :v_05 do |ns|
 
       ns.packet_assistant do |c,|
-        require 'net/sftp/protocol/04/packet-assistant'
-        V_04::PacketAssistant.new( c[:transport][:buffers],
+        require 'net/sftp/protocol/05/packet-assistant'
+        PacketAssistant.new( c[:transport][:buffers],
                              c[:driver] )
       end
 
@@ -31,8 +31,8 @@ module Net ; module SFTP ; module Protocol ; module V_05
       end
 
       ns.impl do |c,|
-        require 'net/sftp/protocol/04/impl'
-        V_04::Impl.new( c[:transport][:buffers],
+        require 'net/sftp/protocol/05/impl'
+        Impl.new( c[:transport][:buffers],
                   c[:driver], c[:packet_assistant],
                   c[:attr_factory] )
       end

data/lib/net/sftp/version.rb

@@ -18,7 +18,7 @@ module Net ; module SFTP ; module Version
 
   MAJOR = 1
   MINOR = 0
-  TINY  = 0
+  TINY  = 1
 
   STRING = [MAJOR,MINOR,TINY].join('.')
 

data/test/protocol/04/tc_impl.rb

@@ -26,38 +26,6 @@ class TC_04_Impl < TC_03_Impl
     Net::SFTP::Protocol::V_04::Impl
   end
 
-  unless defined?( IO_FLAGS_V4 )
-    IO_FLAGS_V4 = [ IO::RDONLY, IO::WRONLY, IO::RDWR, IO::APPEND ]
-    OTHER_FLAGS_V4 = [ 0, IO::CREAT, IO::TRUNC, IO::EXCL ]
-    FLAG_MAP_V4 = { IO::RDONLY => 2, IO::WRONLY => 1, IO::RDWR => 3,
-      IO::APPEND => 11, IO::CREAT => 3, IO::TRUNC => 4 }
-    ACCESS_MAP_V4 = { IO::RDONLY => 0x81, IO::WRONLY => 0x102,
-      IO::RDWR => 0x183, IO::APPEND => 0x106 }
-
-    IO_FLAGS_V4.each do |flag|
-      OTHER_FLAGS_V4.each do |oflag|
-        [ nil, 0400 ].each do |mode|
-          define_method( "test_open_#{flag}_#{oflag}_#{mode||"nil"}" ) do
-            return if oflag == IO::EXCL
-            @assistant.mock_handle( :open ) { |*a| [ a[0], a[1..-1] ] }
-            args = [ 14, "a path", flag | oflag ]
-            args << mode if mode
-            assert_equal 14, @impl.open( *args )
-            assert_equal 1, @assistant.mock_count( :open )
-            assert_equal( ( mode || 0660 ), @permissions )
-            sftp_flag = FLAG_MAP_V4[flag] |
-              ( oflag == 0 ? 0 : FLAG_MAP_V4[oflag] )
-            access_flag = ACCESS_MAP_V4[flag]
-            assert_equal Net::SFTP::Protocol::Constants::FXP_OPEN,
-              @sent_data.first[0]
-            assert_equal [ "a path", access_flag, sftp_flag ],
-              @sent_data.first[1][0,3]
-          end
-        end
-      end
-    end
-  end
-
   def test_stat_flags
     @assistant.mock_handle( :stat ) { |*a| [ a[0], a[1..-1] ] }
     id = @impl.stat( 14, :a, :b )
@@ -99,4 +67,25 @@ class TC_04_Impl < TC_03_Impl
       @sent_data
   end
 
+  # overrides the v1 implementation of the test
+  def test_do_name_with_callback
+    buffer = Net::SSH::Util::ReaderBuffer.new( "\0\0\0\1\0\0\0\2" +
+      "\0\0\0\1a\0\0\0\0" +
+      "\0\0\0\1c\0\0\0\0" )
+    called = false
+    @impl.on_name do |d,i,names|
+      called = true
+      assert_equal 1, i
+      assert_equal 2, names.length
+      assert_equal "a", names.first.filename
+      assert_nil names.first.longname
+      assert_equal 0, names.first.attributes
+      assert_equal "c", names.last.filename
+      assert_nil names.last.longname
+      assert_equal 0, names.last.attributes
+    end
+    @impl.do_name nil, buffer
+    assert called
+  end
+
 end

data/test/protocol/04/tc_packet_assistant.rb

@@ -26,9 +26,6 @@ class TC_04_PacketAssistant < TC_03_PacketAssistant
     Net::SFTP::Protocol::V_04::PacketAssistant
   end
 
-  packet :open, [ "a path", 1, 2, "attrs" ],
-    "\0\0\0\6a path\0\0\0\1\0\0\0\2attrs"
-
   packet :rename, [ "old name", "new name", 1 ],
     "\0\0\0\10old name\0\0\0\10new name\0\0\0\1"
 

data/test/protocol/05/tc_impl.rb

@@ -0,0 +1,61 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Net::SFTP Secure FTP Client
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Net::SFTP
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# net-sftp website: http://net-ssh.rubyforge.org/sftp
+# project website : http://rubyforge.org/projects/net-ssh
+# =============================================================================
+#++
+
+$:.unshift "../../../lib"
+$:.unshift File.join( File.dirname( __FILE__ ), ".." )
+
+require 'net/sftp/protocol/05/impl'
+require '04/tc_impl'
+
+class TC_05_Impl < TC_04_Impl
+
+  def impl_class
+    Net::SFTP::Protocol::V_05::Impl
+  end
+
+  unless defined?( IO_FLAGS_V4 )
+    IO_FLAGS_V4 = [ IO::RDONLY, IO::WRONLY, IO::RDWR, IO::APPEND ]
+    OTHER_FLAGS_V4 = [ 0, IO::CREAT, IO::TRUNC, IO::EXCL ]
+    FLAG_MAP_V4 = { IO::RDONLY => 2, IO::WRONLY => 1, IO::RDWR => 3,
+      IO::APPEND => 11, IO::CREAT => 3, IO::TRUNC => 4 }
+    ACCESS_MAP_V4 = { IO::RDONLY => 0x81, IO::WRONLY => 0x102,
+      IO::RDWR => 0x183, IO::APPEND => 0x106 }
+
+    IO_FLAGS_V4.each do |flag|
+      OTHER_FLAGS_V4.each do |oflag|
+        [ nil, 0400 ].each do |mode|
+          define_method( "test_open_#{flag}_#{oflag}_#{mode||"nil"}" ) do
+            return if oflag == IO::EXCL
+            @assistant.mock_handle( :open ) { |*a| [ a[0], a[1..-1] ] }
+            args = [ 14, "a path", flag | oflag ]
+            args << mode if mode
+            assert_equal 14, @impl.open( *args )
+            assert_equal 1, @assistant.mock_count( :open )
+            assert_equal( ( mode || 0660 ), @permissions )
+            sftp_flag = FLAG_MAP_V4[flag] |
+              ( oflag == 0 ? 0 : FLAG_MAP_V4[oflag] )
+            access_flag = ACCESS_MAP_V4[flag]
+            assert_equal Net::SFTP::Protocol::Constants::FXP_OPEN,
+              @sent_data.first[0]
+            assert_equal [ "a path", access_flag, sftp_flag ],
+              @sent_data.first[1][0,3]
+          end
+        end
+      end
+    end
+  end
+
+end

data/test/protocol/05/tc_packet_assistant.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Net::SFTP Secure FTP Client
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Net::SFTP
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# net-sftp website: http://net-ssh.rubyforge.org/sftp
+# project website : http://rubyforge.org/projects/net-ssh
+# =============================================================================
+#++
+
+$:.unshift "../../../lib"
+$:.unshift File.join( File.dirname( __FILE__ ), ".." )
+
+require '04/tc_packet_assistant'
+require 'net/sftp/protocol/05/packet-assistant'
+
+class TC_05_PacketAssistant < TC_04_PacketAssistant
+
+  def packet_assistant_class
+    Net::SFTP::Protocol::V_05::PacketAssistant
+  end
+
+  packet :open, [ "a path", 1, 2, "attrs" ],
+    "\0\0\0\6a path\0\0\0\1\0\0\0\2attrs"
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: net-sftp
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-06-17
+  version: 1.0.1
+date: 2005-12-06 00:00:00 -07:00
 summary: Net::SFTP is a pure-Ruby implementation of the SFTP client protocol.
 require_paths: 
   - lib
@@ -24,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Jamis Buck
 files: 
@@ -85,6 +87,8 @@ files:
   - lib/net/sftp/protocol/04/impl.rb
   - lib/net/sftp/protocol/04/packet-assistant.rb
   - lib/net/sftp/protocol/04/services.rb
+  - lib/net/sftp/protocol/05/impl.rb
+  - lib/net/sftp/protocol/05/packet-assistant.rb
   - lib/net/sftp/protocol/05/services.rb
   - lib/uri/open-sftp.rb
   - lib/uri/sftp.rb
@@ -116,6 +120,7 @@ files:
   - test/protocol/02
   - test/protocol/03
   - test/protocol/04
+  - test/protocol/05
   - test/protocol/tc_driver.rb
   - test/protocol/01/tc_attributes.rb
   - test/protocol/01/tc_impl.rb
@@ -127,6 +132,8 @@ files:
   - test/protocol/04/tc_attributes.rb
   - test/protocol/04/tc_impl.rb
   - test/protocol/04/tc_packet_assistant.rb
+  - test/protocol/05/tc_impl.rb
+  - test/protocol/05/tc_packet_assistant.rb
 test_files: 
   - test/ALL-TESTS.rb
 rdoc_options: []
@@ -143,5 +150,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.6.0
+            version: 1.0.0
       version: