net-ftp-list 0.5 → 0.7

data/Rakefile

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

data/lib/net/ftp/list.rb

@@ -4,6 +4,7 @@ require 'net/ftp/list/parser'
 # The order here is important for the time being. Corse grained parsers should appear before specializations because
 # the whole thing is searched in reverse order.
 require 'net/ftp/list/unix'
+require 'net/ftp/list/microsoft'
 
 module Net #:nodoc:
   class FTP #:nodoc:

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

@@ -0,0 +1,50 @@
+require 'net/ftp/list/parser'
+
+module Net
+  class FTP
+    module List
+
+      # Parse M$ like FTP LIST entries.
+      #
+      # == MATCHES
+      #
+      #   06-25-07  01:08PM       <DIR>          etc
+      #   11-27-07  08:45PM                23437 README.TXT
+      #
+      # == SYNOPSIS
+      #
+      #   entry = Net::FTP::List::Microsoft.new('06-25-07  01:08PM       <DIR>          etc')
+      #   entry.dir?     # => true
+      #   entry.basename # => 'etc'
+      class Microsoft < Parser
+
+        # 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{
+          ^\s*
+          (\S+)\s+(\S+)\s+
+          (?:(<DIR>)|([0-9]+))\s+
+          (\S.*)
+          \s*$
+        }x
+
+        # Parse a M$ like FTP LIST entries.
+        def initialize(raw)
+          super(raw)
+          match = REGEXP.match(raw.strip) or raise ParserError
+
+          if match[3] == '<DIR>'
+            @dir = true
+          else
+            @file = true
+          end
+
+          # TODO: Permissions, users, groups, date/time.
+
+          @basename = match[5]
+        end
+      end
+
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ require 'net/ftp/list/parser'
 module Net
   class FTP
     module List
-      
+
       # Parse Unix like FTP LIST entries.
       #
       # == MATCHES
@@ -53,4 +53,4 @@ module Net
 
     end
   end
-end
+end

data/test/test_net_ftp_list_microsoft.rb

@@ -0,0 +1,33 @@
+require 'test/unit'
+require 'net/ftp/list'
+
+class TestNetFTPListMicrosoft < Test::Unit::TestCase
+
+  def setup
+    #                             DATE      TIME          DIR      SIZE  NAME
+    @dir  = Net::FTP::List.parse('06-25-07  01:08PM       <DIR>          etc')
+    @file = Net::FTP::List.parse('11-27-07  08:45PM                23437 README.TXT')
+  end
+
+  def test_parse_new
+    assert_instance_of Net::FTP::List::Microsoft, @dir, 'LIST M$ directory'
+    assert_instance_of Net::FTP::List::Microsoft, @file, 'LIST M$ file'
+  end
+
+  def test_rubbish_lines
+    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
+  end
+
+  def test_ruby_microsoft_like_dir
+    assert_equal 'etc', @dir.basename
+    assert @dir.dir?
+    assert !@dir.file?
+  end
+
+  def test_ruby_microsoft_like_file
+    assert_equal 'README.TXT', @file.basename
+    assert @file.file?
+    assert !@file.dir?
+  end
+
+end

data/test/{test_net_ftp_list.rb → test_net_ftp_list_unix.rb}

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'net/ftp/list'
 
-class TestNetFTPList < Test::Unit::TestCase
+class TestNetFTPListUnix < Test::Unit::TestCase
 
   def setup
     @dir  = Net::FTP::List.parse('drwxr-xr-x   4 user     group       4096 Dec 10 20:23 etc')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2008-01-17 00:00:00 +11:00
+  version: "0.7"
+date: 2008-04-15 00:00:00 +10:00
 summary: Parse FTP LIST command output.
 require_paths: 
 - lib
@@ -30,10 +30,12 @@ authors:
 - Shane Hanna
 files: 
 - Rakefile
+- lib/net/ftp/list/microsoft.rb
 - lib/net/ftp/list/parser.rb
 - lib/net/ftp/list/unix.rb
 - lib/net/ftp/list.rb
-- test/test_net_ftp_list.rb
+- test/test_net_ftp_list_microsoft.rb
+- test/test_net_ftp_list_unix.rb
 - README.txt
 test_files: []