net-ftp-list 2.1.1 → 3.2.0

data/README.txt

@@ -17,7 +17,6 @@ See the RFC for more guff on LIST and NLST: http://www.ietf.org/rfc/rfc0959.txt
 
 == TODO & PROBLEMS
 
-* I'm new to Ruby, I'm sure some exist :)
 * The factory and abstract base class for parsers are one and the same. OO geeks will cry.
 * More OS's and server types. Only servers that return Unix like LIST responses will work at the moment.
 * Calling <tt>if entry.file? or entry.dir?</tt> is hard work when you really mean <tt>unless entry.unknown?</tt>
@@ -34,7 +33,7 @@ See the RFC for more guff on LIST and NLST: http://www.ietf.org/rfc/rfc0959.txt
     # Ignore everything that's not a file (so symlinks, directories and devices etc.)
     next unless entry.file?
 
-    # If entry isn't a kind_of Net::FTP::List::Unknown then there is a bug in Net::FTP::List if this isn't the
+    # If entry isn't entry.unknown? then there is a bug in Net::FTP::List if this isn't the
     # same name as ftp.nlist('/some/path') would have returned.
     # Format the entry showing its file size and modification time
     puts "#{entry.basename}, #{entry.filesize}, #{entry.mtime}"

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'yaml'
 
 begin
   require 'jeweler'
@@ -17,7 +18,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
@@ -25,7 +26,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
+    test.pattern = 'test/**/test_*.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION.yml

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

data/lib/net/ftp/list.rb

@@ -1,43 +1,35 @@
 require 'net/ftp'
-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'
-require 'net/ftp/list/netware'
+module Net::FTP::List
+  require 'net/ftp/list/parser'
+  require 'net/ftp/list/entry'
 
-module Net #:nodoc:
-  class FTP #:nodoc:
+  # Parser classes should be listed top to bottom, the most specific
+  # (and rare!) server variations coming last
+  require 'net/ftp/list/unix'
+  require 'net/ftp/list/microsoft'
+  require 'net/ftp/list/netware'
+  require 'net/ftp/list/rumpus'
+  require 'net/ftp/list/unknown'
 
-    # Parse FTP LIST responses.
-    #
-    # == Creation
-    #
-    #   require 'net/ftp' # Not really required but I like to list dependencies sometimes.
-    #   require 'net/ftp/list'
-    #
-    #   ftp = Net::FTP.open('somehost.com', 'user', 'pass')
-    #   ftp.list('/some/path') do |e|
-    #     entry = Net::FTP::List.parse(e)
-    #
-    #     # Ignore everything that's not a file (so symlinks, directories and devices etc.)
-    #     next unless entry.file?
-    #
-    #     # If entry isn't a kind_of Net::FTP::List::Unknown then there is a bug in Net::FTP::List if this isn't the
-    #     # same name as ftp.nlist('/some/path') would have returned.
-    #     puts entry.basename
-    #   end
-    #
-    # == Exceptions
-    #
-    # None at this time. At worst you'll end up with an Net::FTP::List::Unknown instance which won't have any extra
-    # useful information. Methods like <tt>dir?</tt>, <tt>file?</tt> and <tt>symlink?</tt> will all return +false+.
-    module List
-      def self.parse(*args)
-        Parser.parse(*args)
-      end
+  def self.raise_on_failed_server_detection=(new_flag)
+    Thread.current[:net_ftp_list_raise_on_failed_server_detection] = !!new_flag
+  end
+
+  def self.raise_on_failed_server_detection
+    Thread.current[:net_ftp_list_raise_on_failed_server_detection]
+  end
+
+  # Parse a line from FTP LIST responsesa and return a Net::FTP::List::Entry
+  def self.parse(*args)
+    Parser.with_each_parser do | p |
+      entry = p.parse(*args)
+      return entry if entry
     end
   end
+
+  # Gets raised with raise_on_failed_server_detection set
+  class ParseError < RuntimeError
+  end
 end
 

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

@@ -0,0 +1,69 @@
+# Represents an entry of the FTP list. Gets returned when you parse a list.
+class Net::FTP::List::Entry
+
+  ALLOWED_ATTRIBUTES = [:raw, :basename, :dir, :file, :symlink, :mtime, :filesize, :device, :server_type] #:nodoc:
+
+  # Create a new entry object. The additional argument is the list of metadata keys
+  # that can be used on the object. By default just takes and set the raw list entry.
+  #   Net::FTP::List.parse(raw_list_string) # => Net::FTP::List::Parser instance.
+  def initialize(raw_ls_line, optional_attributes = {}) #:nodoc:
+    @raw = raw_ls_line
+    optional_attributes.each_pair do |key, value|
+      raise ArgumentError, "#{key} is not supported" unless ALLOWED_ATTRIBUTES.include?(key)
+      instance_variable_set("@#{key}", value)
+    end
+  end
+
+  # The raw list entry string.
+  def raw
+    @raw ||= ''
+  end
+  alias_method :to_s, :raw
+
+  # The items basename (filename).
+  def basename
+    @basename ||= ''
+  end
+  alias name basename
+
+  # Looks like a directory, try CWD.
+  def dir?
+    !!(@dir ||= false)
+  end
+  alias directory? dir?
+
+  # Looks like a file, try RETR.
+  def file?
+    !!(@file ||= false)
+  end
+
+  # Looks like a symbolic link.
+  def symlink?
+    !!(@symlink ||= false)
+  end
+
+  # Looks like a device.
+  def device?
+    !!(@device ||= false)
+  end
+
+  # Returns the modification time of the file/directory or the current time if unknown
+  def mtime
+    @mtime || Time.now
+  end
+
+  # Returns the filesize of the entry or 0 for directorties
+  def filesize
+    @filesize || 0
+  end
+  alias size filesize
+
+  # Returns the detected server type if this entry
+  def server_type
+    @server_type || "Unknown"
+  end
+
+  def unknown?
+    @dir.nil? && @file.nil? && @symlink.nil? && @device.nil?
+  end
+end

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

@@ -1,54 +1,38 @@
 require 'net/ftp/list/parser'
 require 'date'
 
-module Net
-  class FTP
-    module List
-
-      # Parse Microsoft(NT) 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*
-          ([0-9\-:\/]{5,})\s+([0-9\-:]{3,}(?:[aApP][mM])?)\s+
-          (?:(<DIR>)|([0-9]+))\s+
-          (\S.*)
-          \s*$
-        !x
-
-        # Parse a Microsoft(NT) like FTP LIST entries.
-        def initialize(raw)
-          super(raw)
-          match = REGEXP.match(raw.strip) or raise ParserError
-
-          @mtime = DateTime.strptime("#{match[1]} #{match[2]}", "%m-%d-%y  %I:%M%p")
-
-          if match[3] == '<DIR>'
-            @dir = true
-          else
-            @filesize = match[4].to_i
-            @file = true
-          end
-
-          # TODO: Permissions, users, groups, date/time.
-
-          @basename = match[5]
-        end
-      end
-
-    end
+# Parse Microsoft(NT) like FTP LIST entries.
+#
+# == MATCHES
+#
+#   06-25-07  01:08PM       <DIR>          etc
+#   11-27-07  08:45PM                23437 README.TXT
+class Net::FTP::List::Microsoft < Net::FTP::List::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*
+    ([0-9\-:\/]{5,})\s+([0-9\-:]{3,}(?:[aApP][mM])?)\s+
+    (?:(<DIR>)|([0-9]+))\s+
+    (\S.*)
+    \s*$
+  !x
+
+  # Parse a Microsoft(NT) like FTP LIST entries.
+  def self.parse(raw)
+    match = REGEXP.match(raw.strip) or return false
+
+    mtime = DateTime.strptime("#{match[1]} #{match[2]}", "%m-%d-%y  %H:%M%p")
+    is_dir = match[3] == '<DIR>'
+    filesize = is_dir ? 0 : match[4].to_i
+
+    emit_entry(
+      raw,
+      :dir => is_dir,
+      :file => !is_dir,
+      :filesize => filesize,
+      :basename => match[5],
+      :mtime => mtime
+    )
   end
 end

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

@@ -1,54 +1,35 @@
 require 'net/ftp/list/parser'
 require 'time'
 
-module Net
-  class FTP
-    module List
-
-      # Parse Netware like FTP LIST entries.
-      #
-      # == MATCHES
-      #
-      #   d [RWCEAFMS] dpearce                          512 Jun 27 23:46 public.www
-      #
-      # == SYNOPSIS
-      #
-      #   entry = Net::FTP::List::Netware.new('d [RWCEAFMS] dpearce             512 Jun 27 23:46 public.www')
-      #   entry.dir?     # => true
-      #   entry.basename # => 'public.www'
-      class Netware < 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!^
-          (d|-){1}\s+
-          \[(.*?)\]\s+
-          (\S+)\s+(\d+)\s+
-          (\S+\s+\S+\s+((\d+:\d+)|(\d{4})))
-          \s+(.*)
-        $!x
-
-        # Parse a Netware like FTP LIST entries.
-        def initialize(raw)
-          super(raw)
-          match = REGEXP.match(raw.strip) or raise ParserError
-
-          @mtime = Time.parse(match[5])
-          @filesize = match[4].to_i
-
-          if match[1] == 'd'
-            @dir = true
-          else
-            @file = true
-          end
-
-          # TODO: Permissions, users, groups, date/time.
-
-          @basename = match[9]
-        end
-      end
-
-    end
+# Parse Netware like FTP LIST entries.
+#
+# == MATCHES
+#
+#   d [RWCEAFMS] dpearce                          512 Jun 27 23:46 public.www
+class Net::FTP::List::Netware < Net::FTP::List::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!^
+    (d|-){1}\s+
+    \[(.*?)\]\s+
+    (\S+)\s+(\d+)\s+
+    (\S+\s+\S+\s+((\d+:\d+)|(\d{4})))
+    \s+(.*)
+  $!x
+
+  # Parse a Netware like FTP LIST entries.
+  def self.parse(raw)
+    match = REGEXP.match(raw.strip) or return false
+
+    is_dir = match[1] == 'd'
+
+    emit_entry(
+      raw,
+      :mtime => Time.parse(match[5]),
+      :filesize => match[4].to_i,
+      :dir => is_dir, 
+      :file => !is_dir,
+      :basename => match[9]
+    )
   end
 end

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

@@ -1,101 +1,28 @@
-module Net
-  class FTP
-    module List
+# Abstract FTP LIST parser. It really just defines and documents the interface.
+class Net::FTP::List::Parser
 
-      # ParserError
-      #
-      # Raw entry couldn't be parsed for some reason.
-      #
-      # == TODO
-      #
-      # Get more specific with error messages.
-      class ParserError < RuntimeError; end
+  @@parsers = []
 
-      # Abstract FTP LIST parser.
-      #
-      # It really just defines and documents the interface.
-      #
-      # == Exceptions
-      #
-      # +ParserError+ -- Raw entry could not be parsed.
-      class Parser
-        @@parsers = []
-
-        # Parse a raw FTP LIST line.
-        #
-        # By default just takes and set the raw list entry.
-        #
-        #   Net::FTP::List.parse(raw_list_string) # => Net::FTP::List::Parser instance.
-        def initialize(raw)
-          @raw = raw
-        end
-
-        # The raw list entry string.
-        def raw
-          @raw ||= ''
-        end
-        alias_method :to_s, :raw
-
-        # The items basename (filename).
-        def basename
-          @basename ||= ''
-        end
-
-        # Looks like a directory, try CWD.
-        def dir?
-          !!(@dir ||= false)
-        end
-
-        # Looks like a file, try RETR.
-        def file?
-          !!(@file ||= false)
-        end
-
-        # Looks like a symbolic link.
-        def symlink?
-          !!(@symlink ||= false)
-        end
-
-        def mtime
-          @mtime
-        end
-
-        def filesize
-          @filesize
-        end
+  # Run a passed block with each parser in succession, from the most specific to the least
+  # specific. Will return the result of the block.
+  def self.with_each_parser(&blk) #:yields: parser
+    @@parsers.each(&blk)
+  end
 
-        class << self
-          # Acts as a factory.
-          #
-          # TODO: Having a class be both factory and abstract implementation seems a little nutty to me. If it ends up
-          # too confusing or gives anyone the shits I'll move it.
-          def inherited(klass) #:nodoc:
-            @@parsers << klass
-          end
+  # Automatically add an inheriting parser to the list of known parsers.
+  def self.inherited(klass) #:nodoc:
+    @@parsers.push(klass)
+  end
 
-          # Factory method.
-          #
-          # Attempt to find a parser and parse a list item. At worst the item will return an Net::FTP::List::Unknown
-          # instance. This may change in the future so that only parsable entries are kept.
-          def parse(raw)
-            @@parsers.reverse.each do |parser|
-              begin
-                return parser.new(raw)
-              rescue ParserError
-                next
-              end
-            end
-          end
-        end
+  # The main parse method. Return false from it if parsing fails (this is cheaper than raising an exception)
+  def self.parse(raw)
+    return false
+  end
 
-      end
+  private
 
-      # Unknown parser.
-      #
-      # If all other attempts to parse the entry fail this class will be returned. Only the +raw+ and +to_s+
-      # methods will return anything useful.
-      class Unknown < Parser
-      end
-    end
+  # Automatically adds the name of the parser class to the server_type field
+  def self.emit_entry(raw, extra_attributes)
+    Net::FTP::List::Entry.new raw, extra_attributes.merge(:server_type => to_s.split('::').pop)
   end
 end

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

@@ -0,0 +1,33 @@
+require 'net/ftp/list/parser'
+
+# Parse Rumpus FTP LIST entries.
+#
+# == MATCHES
+# drwxr-xr-x               folder        0 Nov 30 10:03 houdini
+# -rw-r--r--        0      101426   101426 Jun  7  2008 imap with spaces.rb
+class Net::FTP::List::Rumpus < Net::FTP::List::Parser
+
+  REGEXP = %r!^
+    ([drwxr-]{10})\s+
+    (folder|0\s+\d+)\s+
+    (\d+)\s+
+    (\w+)\s+
+    (\d{1,2})\s+
+    (\d{2}:\d{2}|\d{4})\s+
+    (.+)
+  $!x
+
+  # Parse a Rumpus FTP LIST entry.
+  def self.parse(raw)
+    match = REGEXP.match(raw.strip) or return false
+
+    emit_entry(
+      raw,
+      :basename => match[7],
+      :mtime => Time.parse([match[4], match[5], match[6]].join(" ")),
+      :file => !(match[2] == "folder"),
+      :dir => (match[2] == "folder"),
+      :filesize => match[3].to_i
+    )
+  end
+end

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

@@ -1,65 +1,66 @@
 require 'time'
 require 'net/ftp/list/parser'
 
-module Net
-  class FTP
-    module List
+# Parse Unix like FTP LIST entries.
+#
+# == MATCHES
+#
+#   drwxr-xr-x   4 steve    group       4096 Dec 10 20:23 etc
+#   -rw-r--r--   1 root     other        531 Jan 29 03:26 README.txt
+class Net::FTP::List::Unix < Net::FTP::List::Parser
 
-      # Parse Unix like FTP LIST entries.
-      #
-      # == MATCHES
-      #
-      #   drwxr-xr-x   4 steve    group       4096 Dec 10 20:23 etc
-      #   -rw-r--r--   1 root     other        531 Jan 29 03:26 README.txt
-      #
-      # == SYNOPSIS
-      #
-      #   entry = Net::FTP::List::Unix.new('drwxr-xr-x   4 steve    group       4096 Dec 10 20:23 etc')
-      #   entry.dir?     # => true
-      #   entry.basename # => 'etc'
-      class Unix < 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{
+    ([pbcdlfmpSs-])
+    (((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\+?\s+
+    (\d+)\s+
+    (\S+)\s+
+    (?:(\S+(?:\s\S+)*)\s+)?
+    (?:\d+,\s+)?
+    (\d+)\s+
+    ((?:\d+[-/]\d+[-/]\d+)|(?:\S+\s+\S+))\s+
+    (\d+(?::\d+)?)\s+
+    (\S*)(\s*.*)
+  }x
 
-        # 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{
-          ([bcdlfmpSs-])
-          (((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\+?\s+
-          (\d+)\s+
-          (\S+)\s+
-          (?:(\S+(?:\s\S+)*)\s+)?
-          (\d+)\s+
-          ((?:\d+[-/]\d+[-/]\d+)|(?:\S+\s+\S+))\s+
-          (\d+(?::\d+)?)\s+
-          (\S*)(\s*.*)
-        }x
+  ONE_YEAR = (60 * 60 * 24 * 365)
 
-        # Parse a Unix like FTP LIST entries.
-        def initialize(raw)
-          super(raw)
-          match = REGEXP.match(raw.strip) or raise ParserError
+  # Parse a Unix like FTP LIST entries.
+  def self.parse(raw)
+    match = REGEXP.match(raw.strip) or return false
 
-          case match[1]
-            when /d/    then @dir = true
-            when /l/    then @symlink = true
-            when /[f-]/ then @file = true
-            when /[bc]/ then # Do nothing with devices for now.
-            else ParserError 'Unknown LIST entry type.'
-          end
+    dir, symlink, file, device = false, false, false, false
+    case match[1]
+      when /d/      then dir = true
+      when /l/      then symlink = true
+      when /[f-]/   then file = true
+      when /[psbc]/ then device = true
+    end
+    return false unless dir or symlink or file or device
 
-          # TODO: Permissions, users, groups, date/time.
-          @filesize = match[18].to_i
-          @mtime = Time.parse("#{match[19]} #{match[20]}")
+    # TODO: Permissions, users, groups, date/time.
+    filesize = match[18].to_i
+    mtime = Time.parse("#{match[19]} #{match[20]}")
+    mtime -= ONE_YEAR if mtime > Time.now
 
-          @basename = match[21].strip
+    basename = match[21].strip
 
-          # filenames with spaces will end up in the last match
-          @basename += match[22] unless match[22].nil?
+    # 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
+    # strip the symlink stuff we don't care about
+    basename.sub!(/\s+\->.+$/, '') if symlink
 
-    end
+    emit_entry(
+      raw,
+      :dir => dir,
+      :file => file,
+      :device => device,
+      :symlink => symlink,
+      :filesize => filesize,
+      :basename => basename,
+      :mtime => mtime
+    )
   end
 end

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

@@ -0,0 +1,14 @@
+require 'net/ftp/list/parser'
+
+# If all other attempts to parse the entry fail this is the parser that is going to be used.
+# It might be a good idea to fail loudly.
+class Net::FTP::List::Unknown < Net::FTP::List::Parser
+  def self.parse(raw)
+    if Net::FTP::List.raise_on_failed_server_detection
+      raise Net::FTP::List::ParseError, "Could not parse #{raw} since none of the parsers was up to the task"
+    end
+
+    emit_entry(raw, {})
+  end
+end
+

data/net-ftp-list.gemspec

@@ -1,50 +1,57 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{net-ftp-list}
-  s.version = "2.1.1"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2011-01-09}
   s.email = %q{enquiries@statelesssystems.com}
   s.extra_rdoc_files = [
     "README.txt"
   ]
   s.files = [
-    ".gitignore",
-     "README.txt",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/net/ftp/list.rb",
-     "lib/net/ftp/list/microsoft.rb",
-     "lib/net/ftp/list/netware.rb",
-     "lib/net/ftp/list/parser.rb",
-     "lib/net/ftp/list/unix.rb",
-     "net-ftp-list.gemspec",
-     "test/test_net_ftp_list_microsoft.rb",
-     "test/test_net_ftp_list_netware.rb",
-     "test/test_net_ftp_list_unix.rb"
+    "README.txt",
+    "Rakefile",
+    "VERSION.yml",
+    "lib/net/ftp/list.rb",
+    "lib/net/ftp/list/entry.rb",
+    "lib/net/ftp/list/microsoft.rb",
+    "lib/net/ftp/list/netware.rb",
+    "lib/net/ftp/list/parser.rb",
+    "lib/net/ftp/list/rumpus.rb",
+    "lib/net/ftp/list/unix.rb",
+    "lib/net/ftp/list/unknown.rb",
+    "net-ftp-list.gemspec",
+    "test/test_net_ftp_list.rb",
+    "test/test_net_ftp_list_entry.rb",
+    "test/test_net_ftp_list_microsoft.rb",
+    "test/test_net_ftp_list_netware.rb",
+    "test/test_net_ftp_list_rumpus.rb",
+    "test/test_net_ftp_list_unix.rb"
   ]
   s.homepage = %q{http://github.com/stateless-systems/net-ftp-list}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Parse FTP LIST command output.}
   s.test_files = [
+    "test/test_net_ftp_list.rb",
+    "test/test_net_ftp_list_entry.rb",
     "test/test_net_ftp_list_microsoft.rb",
-     "test/test_net_ftp_list_unix.rb",
-     "test/test_net_ftp_list_netware.rb"
+    "test/test_net_ftp_list_netware.rb",
+    "test/test_net_ftp_list_rumpus.rb",
+    "test/test_net_ftp_list_unix.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/test_net_ftp_list.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'net/ftp/list'
+
+class TestNetFTPList < Test::Unit::TestCase
+
+  def test_all
+    one = Net::FTP::List.parse('drwxr-xr-x 4 user     group    4096 Dec 10 20:23 etc')
+    assert_kind_of Net::FTP::List::Entry, one
+    assert one.dir?
+    assert !one.file?
+
+    two = Net::FTP::List.parse("++ unknown garbage +++")
+    assert_kind_of Net::FTP::List::Entry, two
+    assert two.unknown?
+    assert_equal '', two.basename
+  end
+
+  def test_raise_when_flag_set
+    Net::FTP::List.raise_on_failed_server_detection = true
+    assert_raise(Net::FTP::List::ParseError) do
+      Net::FTP::List.parse("++ unknown garbage +++")
+    end
+  ensure
+    Net::FTP::List.raise_on_failed_server_detection = false
+  end
+end

data/test/test_net_ftp_list_entry.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+require 'net/ftp/list'
+
+class TestNetFTPEntry < Test::Unit::TestCase
+
+  def test_raise_on_unknown_options
+    assert_raise(ArgumentError) { Net::FTP::List::Entry.new("foo", {:bar => "baz"}) }
+  end
+
+  def test_default_values
+    e = Net::FTP::List::Entry.new('')
+    assert_equal 0, e.filesize
+    assert_equal 0, e.size
+    assert_equal '', e.basename
+    assert_equal '', e.name
+    assert e.unknown?
+    assert !e.dir?
+    assert !e.directory?
+    assert !e.file?
+    assert !e.symlink?
+    assert_kind_of Time, e.mtime
+    assert_equal "Unknown", e.server_type
+  end
+
+end

data/test/test_net_ftp_list_microsoft.rb

@@ -4,18 +4,17 @@ 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'
+    assert_equal "Microsoft", @dir.server_type, 'LIST M$ directory'
+    assert_equal "Microsoft", @file.server_type, 'LIST M$ directory'
   end
 
   def test_rubbish_lines
-    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
+    assert_instance_of Net::FTP::List::Entry, Net::FTP::List.parse("++ bah! ++")
   end
 
   def test_ruby_microsoft_mtime
@@ -36,7 +35,12 @@ class TestNetFTPListMicrosoft < Test::Unit::TestCase
   end
 
   def test_filesize
-    assert @dir.filesize.nil?
+    assert_equal 0, @dir.filesize
     assert_equal 23437, @file.filesize
   end
+
+  def test_zero_hour
+    file = Net::FTP::List.parse('10-15-09  00:34AM       <DIR>          aspnet_client')
+    assert_equal 1255566840.to_s, file.mtime.strftime('%s')
+  end
 end

data/test/test_net_ftp_list_netware.rb

@@ -9,12 +9,8 @@ class TestNetFTPListNetware < Test::Unit::TestCase
   end
 
   def test_parse_new
-    assert_instance_of Net::FTP::List::Netware, @dir, 'LIST Netware directory'
-    assert_instance_of Net::FTP::List::Netware, @file, 'LIST Netware file'
-  end
-
-  def test_rubbish_lines
-    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
+    assert_equal "Netware", @dir.server_type, 'LIST Netware directory'
+    assert_equal "Netware", @file.server_type, 'LIST Netware file'
   end
 
   def test_ruby_netware_mtime

data/test/test_net_ftp_list_rumpus.rb

@@ -0,0 +1,40 @@
+require 'test/unit'
+require 'net/ftp/list'
+
+class TestNetFTPListRumpus < Test::Unit::TestCase
+
+  def setup
+    @dir = Net::FTP::List.parse 'drwxrwxrwx               folder        0 Nov 16 22:12 Alias'
+    @file = Net::FTP::List.parse '-rw-r--r--        0      101426   101426 Jun  7  2008 imap with spaces.rb'
+  end
+
+  def test_parsed
+    assert_equal "Rumpus", @dir.server_type, 'LIST Rumpus directory'
+
+    ## 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'
+  end
+
+  def test_ruby_unix_like_date
+    assert_equal Time.parse("Nov 16 22:12"), @dir.mtime
+    assert_equal Time.parse("Jun 7 2008"), @file.mtime
+  end
+
+  def test_dir
+    assert_equal 'Alias', @dir.basename
+    assert !@dir.file?
+    assert @dir.dir?
+  end
+
+  def test_file
+    assert_equal 'imap with spaces.rb', @file.basename
+    assert @file.file?
+    assert !@file.dir?
+  end
+
+  def test_filesize
+    assert_equal 0, @dir.filesize
+    assert_equal 101426, @file.filesize
+  end
+end

data/test/test_net_ftp_list_unix.rb

@@ -3,31 +3,49 @@ require 'net/ftp/list'
 
 class TestNetFTPListUnix < Test::Unit::TestCase
 
+  ONE_YEAR = (60 * 60 * 24 * 365)
+
+  FIRST_MINUTE_OF_YEAR = "Jan  1 00:00"
+  LAST_MINUTE_OF_YEAR  = "Dec 31 23:59"
+  OTHER_RELATIVE_TIME  = "Mar 11 07:57"
+  SYMBOLIC_LINK_TIME   = "Oct 30 15:26"
+  ABSOLUTE_DATE        = "Feb 15  2008"
+
   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'
-    @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'
-    @older_date = Net::FTP::List.parse '-rwxrwxrwx   1 owner    group          154112 Feb 15  2008 participando.xls'
+    @dir  = Net::FTP::List.parse       "drwxr-xr-x 4 user     group    4096 #{FIRST_MINUTE_OF_YEAR} etc" rescue nil
+    @file = Net::FTP::List.parse       "-rw-r--r-- 1 root     other     531 #{LAST_MINUTE_OF_YEAR} README" rescue nil
+    @other_dir = Net::FTP::List.parse  "drwxr-xr-x 8 1791     600      4096 #{OTHER_RELATIVE_TIME} 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 #{SYMBOLIC_LINK_TIME} bar -> /etc" rescue nil
+    @older_date = Net::FTP::List.parse "-rwxrwxrwx 1 owner    group  154112 #{ABSOLUTE_DATE} 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
   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
-    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
+    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'
   end
 
   def test_ruby_unix_like_date
-    assert_equal Time.parse("Mar 11 07:57"), @other_dir.mtime
-    assert_equal Time.parse("Apr 30 15:26"), @symlink.mtime
-    assert_equal Time.parse("Feb 15  2008"), @older_date.mtime
+    {
+        FIRST_MINUTE_OF_YEAR => @dir,
+        LAST_MINUTE_OF_YEAR => @file,
+        OTHER_RELATIVE_TIME => @other_dir,
+        SYMBOLIC_LINK_TIME => @symlink,
+        ABSOLUTE_DATE => @older_date
+    }.each do |date_and_time, parsed_entry|
+      assert_equal parse_adjust_date_and_time(date_and_time), parsed_entry.send(:mtime)
+    end
   end
 
   def test_ruby_unix_like_dir
@@ -67,4 +85,32 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert_equal 4, @symlink.filesize
     assert_equal 154112, @older_date.filesize
   end
+
+  def test_unix_block_device
+    assert_equal 'ram0', @block_dev.basename
+    assert @block_dev.device?
+  end
+
+  def test_unix_char_device
+    assert_equal 'null', @char_dev.basename
+    assert @char_dev.device?
+  end
+
+  def test_unix_socket_device
+    assert_equal 'log', @socket_dev.basename
+    assert @socket_dev.device?
+  end
+
+  def test_unix_pipe_device
+    assert_equal 'xconsole', @pipe_dev.basename
+    assert @pipe_dev.device?
+  end
+
+
+  private
+  def parse_adjust_date_and_time(date_and_time)
+    parsed_time = Time.parse(date_and_time)
+    parsed_time -= ONE_YEAR if parsed_time > Time.now
+    parsed_time
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  prerelease: false
+  segments: 
+  - 3
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Stateless Systems
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +10:00
+date: 2011-01-09 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -22,48 +27,60 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- .gitignore
 - README.txt
 - Rakefile
 - VERSION.yml
 - lib/net/ftp/list.rb
+- lib/net/ftp/list/entry.rb
 - lib/net/ftp/list/microsoft.rb
 - lib/net/ftp/list/netware.rb
 - lib/net/ftp/list/parser.rb
+- lib/net/ftp/list/rumpus.rb
 - lib/net/ftp/list/unix.rb
+- lib/net/ftp/list/unknown.rb
 - net-ftp-list.gemspec
+- test/test_net_ftp_list.rb
+- test/test_net_ftp_list_entry.rb
 - test/test_net_ftp_list_microsoft.rb
 - test/test_net_ftp_list_netware.rb
+- test/test_net_ftp_list_rumpus.rb
 - test/test_net_ftp_list_unix.rb
 has_rdoc: true
 homepage: http://github.com/stateless-systems/net-ftp-list
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Parse FTP LIST command output.
 test_files: 
+- test/test_net_ftp_list.rb
+- test/test_net_ftp_list_entry.rb
 - test/test_net_ftp_list_microsoft.rb
-- test/test_net_ftp_list_unix.rb
 - test/test_net_ftp_list_netware.rb
+- test/test_net_ftp_list_rumpus.rb
+- test/test_net_ftp_list_unix.rb

data/.gitignore

@@ -1,7 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-.idea/*
-.idea/**/*