net-ftp-list 0.9 → 1.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 NAME = 'net-ftp-list'
-VERS = '0.9'
+VERS = '1.0'
 
 CLEAN.include ['**/*.log', '*.gem']
 CLOBBER.include ['**/*.log']

data/lib/net/ftp/list/unix.rb

@@ -47,7 +47,13 @@ module Net
 
           # TODO: Permissions, users, groups, date/time.
 
-          @basename = match[21].match(/^(.+)(?:\s+\->.+)?$/)[0].strip
+          @basename = match[21].strip
+
+          # filenames with spaces will end up in the last match
+          @basename += match[22] unless match[22].nil?
+
+          # strip the symlink stuff we don't care about
+          @basename.sub!(/\s+\->.+$/, '') if @symlink
         end
       end
 

data/test/test_net_ftp_list_unix.rb

@@ -4,15 +4,19 @@ require 'net/ftp/list'
 class TestNetFTPListUnix < Test::Unit::TestCase
 
   def setup
-    @dir  = Net::FTP::List.parse('drwxr-xr-x   4 user     group       4096 Dec 10 20:23 etc')
-    @file = Net::FTP::List.parse('-rw-r--r--   1 root     other        531 Jan 29 03:26 README')
-    @other_dir = Net::FTP::List.parse('drwxr-xr-x    8 1791     600          4096 Mar 11 07:57 forums')
+    @dir  = Net::FTP::List.parse      'drwxr-xr-x 4 user     group    4096 Dec 10 20:23 etc'
+    @file = Net::FTP::List.parse      '-rw-r--r-- 1 root     other     531 Jan 29 03:26 README'
+    @other_dir = Net::FTP::List.parse 'drwxr-xr-x 8 1791     600      4096 Mar 11 07:57 forums'
+    @spaces = Net::FTP::List.parse    'drwxrwxr-x 2 danial   danial     72 May 23 12:52 spaces suck'
+    @symlink = Net::FTP::List.parse   'lrwxrwxrwx 1 danial   danial      4 Apr 30 15:26 bar -> /etc'
   end
 
   def test_parse_new
     assert_instance_of Net::FTP::List::Unix, @dir, 'LIST unixish directory'
     assert_instance_of Net::FTP::List::Unix, @file, 'LIST unixish file'
     assert_instance_of Net::FTP::List::Unix, @other_dir, 'LIST unixish directory'
+    assert_instance_of Net::FTP::List::Unix, @spaces, 'LIST unixish directory with spaces'
+    assert_instance_of Net::FTP::List::Unix, @symlink, 'LIST unixish symlink'
   end
 
   def test_rubbish_lines
@@ -29,6 +33,19 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert !@other_dir.file?
   end
 
+  def test_ruby_unix_like_symlink
+    assert_equal 'bar', @symlink.basename
+    assert @symlink.symlink?
+    assert !@symlink.dir?
+    assert !@symlink.file?
+  end
+
+  def test_spaces_in_unix_dir
+    assert_equal 'spaces suck', @spaces.basename
+    assert @spaces.dir?
+    assert !@spaces.file?
+  end
+
   def test_ruby_unix_like_file
     assert_equal 'README', @file.basename
     assert @file.file?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: "0.9"
-date: 2008-04-18 00:00:00 +10:00
+  version: "1.0"
+date: 2008-05-23 00:00:00 +10:00
 summary: Parse FTP LIST command output.
 require_paths: 
 - lib