net-ftp-list 3.2.1 → 3.2.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 3
 :minor: 2
-:patch: 1
+:patch: 2
 :build: 

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

@@ -14,7 +14,7 @@ class Net::FTP::List::Unix < Net::FTP::List::Parser
   REGEXP = %r{
     ([pbcdlfmpSs-])
     (((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\+?\s+
-    (\d+)\s+
+    (?:(\d+)\s+)?
     (\S+)\s+
     (?:(\S+(?:\s\S+)*)\s+)?
     (?:\d+,\s+)?
@@ -39,6 +39,9 @@ class Net::FTP::List::Unix < Net::FTP::List::Parser
     end
     return false unless dir or symlink or file or device
 
+    # Don't match on rumpus (which looks very similar to unix)
+    return false if match[17].nil? and ((match[15].nil? and match[16].to_s == 'folder') or match[15].to_s == '0')
+
     # TODO: Permissions, users, groups, date/time.
     filesize = match[18].to_i
     mtime_string = "#{match[19]} #{match[20]}"

data/net-ftp-list.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net-ftp-list}
-  s.version = "3.2.1"
+  s.version = "3.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]

data/test/test_net_ftp_list_rumpus.rb

@@ -13,7 +13,7 @@ class TestNetFTPListRumpus < Test::Unit::TestCase
 
     ## TODO: this rumpus file is getting picked up as unix, which if you check
     ##       how it looks above, it looks like unix to me, i dunno how to fix it.
-    #assert_equal "Rumpus", @file.server_type, 'LIST Rumpus file with spaces'
+    assert_equal "Rumpus", @file.server_type, 'LIST Rumpus file with spaces'
   end
 
   def test_ruby_unix_like_date

data/test/test_net_ftp_list_unix.rb

@@ -3,28 +3,30 @@ require 'net/ftp/list'
 
 class TestNetFTPListUnix < Test::Unit::TestCase
   def setup
-    @dir  = Net::FTP::List.parse       "drwxr-xr-x 4 user     group    4096 Jan  1 00:00 etc" rescue nil
-    @file = Net::FTP::List.parse       "-rw-r--r-- 1 root     other     531 Dec 31 23:59 README" rescue nil
-    @other_dir = Net::FTP::List.parse  "drwxr-xr-x 8 1791     600      4096 Mar 11 07:57 forums" rescue nil
-    @spaces = Net::FTP::List.parse     'drwxrwxr-x 2 danial   danial     72 May 23 12:52 spaces suck' rescue nil
-    @symlink = Net::FTP::List.parse    "lrwxrwxrwx 1 danial   danial      4 Oct 30 15:26 bar -> /etc" rescue nil
-    @older_date = Net::FTP::List.parse "-rwxrwxrwx 1 owner    group  154112 Feb 15  2008 participando.xls" rescue nil
-    @block_dev = Net::FTP::List.parse  'brw-r----- 1 root     disk   1,   0 Apr 13  2006 ram0' rescue nil
-    @char_dev  = Net::FTP::List.parse  'crw-rw-rw- 1 root     root   1,   3 Apr 13  2006 null' rescue nil
-    @socket_dev = Net::FTP::List.parse 'srw-rw-rw- 1 root     root        0 Aug 20 14:15 log' rescue nil
-    @pipe_dev = Net::FTP::List.parse   'prw-r----- 1 root     adm         0 Nov 22 10:30 xconsole' rescue nil
+    @dir  = Net::FTP::List.parse           "drwxr-xr-x 4 user     group    4096 Jan  1 00:00 etc"                 rescue nil
+    @file = Net::FTP::List.parse           "-rw-r--r-- 1 root     other     531 Dec 31 23:59 README"              rescue nil
+    @other_dir = Net::FTP::List.parse      "drwxr-xr-x 8 1791     600      4096 Mar 11 07:57 forums"              rescue nil
+    @spaces = Net::FTP::List.parse         'drwxrwxr-x 2 danial   danial     72 May 23 12:52 spaces suck'         rescue nil
+    @symlink = Net::FTP::List.parse        "lrwxrwxrwx 1 danial   danial      4 Oct 30 15:26 bar -> /etc"         rescue nil
+    @older_date = Net::FTP::List.parse     "-rwxrwxrwx 1 owner    group  154112 Feb 15  2008 participando.xls"    rescue nil
+    @block_dev = Net::FTP::List.parse      'brw-r----- 1 root     disk   1,   0 Apr 13  2006 ram0'                rescue nil
+    @char_dev  = Net::FTP::List.parse      'crw-rw-rw- 1 root     root   1,   3 Apr 13  2006 null'                rescue nil
+    @socket_dev = Net::FTP::List.parse     'srw-rw-rw- 1 root     root        0 Aug 20 14:15 log'                 rescue nil
+    @pipe_dev = Net::FTP::List.parse       'prw-r----- 1 root     adm         0 Nov 22 10:30 xconsole'            rescue nil
+    @file_no_inodes = Net::FTP::List.parse '-rw-r--r-- foo@localhost foo@localhost  6034 May 14 23:13 index.html' rescue nil
   end
 
   def test_parse_new
-    assert_equal "Unix", @dir.server_type, 'LIST unixish directory'
-    assert_equal "Unix", @file.server_type, 'LIST unixish file'
-    assert_equal "Unix", @other_dir.server_type, 'LIST unixish directory'
-    assert_equal "Unix", @spaces.server_type, 'LIST unixish directory with spaces'
-    assert_equal "Unix", @symlink.server_type, 'LIST unixish symlink'
-    assert_equal "Unix", @block_dev.server_type, 'LIST unix block device'
-    assert_equal "Unix", @char_dev.server_type, 'LIST unix char device'
-    assert_equal "Unix", @socket_dev.server_type, 'LIST unix socket device'
-    assert_equal "Unix", @pipe_dev.server_type, 'LIST unix socket device'
+    assert_equal "Unix", @dir.server_type,            'LIST unixish directory'
+    assert_equal "Unix", @file.server_type,           'LIST unixish file'
+    assert_equal "Unix", @other_dir.server_type,      'LIST unixish directory'
+    assert_equal "Unix", @spaces.server_type,         'LIST unixish directory with spaces'
+    assert_equal "Unix", @symlink.server_type,        'LIST unixish symlink'
+    assert_equal "Unix", @block_dev.server_type,      'LIST unix block device'
+    assert_equal "Unix", @char_dev.server_type,       'LIST unix char device'
+    assert_equal "Unix", @socket_dev.server_type,     'LIST unix socket device'
+    assert_equal "Unix", @pipe_dev.server_type,       'LIST unix socket device'
+    assert_equal "Unix", @file_no_inodes.server_type, 'LIST unixish file with no inodes'
   end
 
   class ::Time

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 1
-  version: 3.2.1
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - Stateless Systems