net-ftp-list 0.7 → 0.9

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 NAME = 'net-ftp-list'
-VERS = '0.7'
+VERS = '0.9'
 
 CLEAN.include ['**/*.log', '*.gem']
 CLOBBER.include ['**/*.log']
@@ -42,7 +42,7 @@ end
 desc 'Package and install as gem.'
 task :install do
   sh %{rake package}
-  sh %{sudo gem install pkg/net-ftp-list-#{VERS}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
 end
 
 desc 'Uninstall the gem.'

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

@@ -4,7 +4,7 @@ module Net
   class FTP
     module List
 
-      # Parse M$ like FTP LIST entries.
+      # Parse Microsoft(NT) like FTP LIST entries.
       #
       # == MATCHES
       #
@@ -20,15 +20,15 @@ module Net
 
         # Stolen straight from the ASF's commons Java FTP LIST parser library.
         # http://svn.apache.org/repos/asf/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/
-        REGEXP = %r{
+        REGEXP = %r!
           ^\s*
-          (\S+)\s+(\S+)\s+
+          ([0-9\-:\/]{5,})\s+([0-9\-:]{3,}(?:[aApP][mM])?)\s+
           (?:(<DIR>)|([0-9]+))\s+
           (\S.*)
           \s*$
-        }x
+        !x
 
-        # Parse a M$ like FTP LIST entries.
+        # Parse a Microsoft(NT) like FTP LIST entries.
         def initialize(raw)
           super(raw)
           match = REGEXP.match(raw.strip) or raise ParserError

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

@@ -32,28 +32,28 @@ module Net
 
         # The raw list entry string.
         def raw
-          @raw
+          @raw ||= ''
         end
         alias_method :to_s, :raw
 
         # The items basename (filename).
         def basename
-          @basename
+          @basename ||= ''
         end
 
         # Looks like a directory, try CWD.
         def dir?
-          !!@dir
+          !!@dir ||= false
         end
 
         # Looks like a file, try RETR.
         def file?
-          !!@file
+          !!@file ||= false
         end
 
         # Looks like a symbolic link.
         def symlink?
-          !!@symlink
+          !!@symlink ||= false
         end
 
         class << self

data/test/test_net_ftp_list_unix.rb

@@ -6,11 +6,13 @@ 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')
   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'
   end
 
   def test_rubbish_lines
@@ -21,6 +23,10 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert_equal 'etc', @dir.basename
     assert @dir.dir?
     assert !@dir.file?
+
+    assert_equal 'forums', @other_dir.basename
+    assert @other_dir.dir?
+    assert !@other_dir.file?
   end
 
   def test_ruby_unix_like_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.7"
-date: 2008-04-15 00:00:00 +10:00
+  version: "0.9"
+date: 2008-04-18 00:00:00 +10:00
 summary: Parse FTP LIST command output.
 require_paths: 
 - lib