net-ftp-list 3.2.0 → 3.2.1

data/VERSION.yml

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

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

@@ -1,5 +1,6 @@
 # Represents an entry of the FTP list. Gets returned when you parse a list.
 class Net::FTP::List::Entry
+  include Comparable
 
   ALLOWED_ATTRIBUTES = [:raw, :basename, :dir, :file, :symlink, :mtime, :filesize, :device, :server_type] #:nodoc:
 
@@ -14,6 +15,35 @@ class Net::FTP::List::Entry
     end
   end
 
+  # Tests for objects equality (value and type).
+  #
+  # @param entry [Net::FTP::List::Entry] an entry of the FTP list.
+  #
+  # @return [true, false] true if the objects are equal and have the same type; false otherwise.
+  #
+  def eql?(other)
+    return false if !other.instance_of? self.class
+    return true if self.object_id == other.object_id
+
+    self.raw == other.raw # if it's exactly the same line then the objects are the same
+  end
+
+
+  # Compares the receiver against another object.
+  #
+  # @param (see #eql?)
+  #
+  # @return [Fixnum]  -1, 0, or +1 depending on whether the receiver is less than, equal to, or greater than the other object.
+  #
+  def <=>(other)
+    if other.instance_of? self.class
+      return self.filesize <=> other.filesize
+    elsif other.instance_of? Fixnum or other.instance_of? Integer or other.instance_of? Float
+      return self.filesize <=> other
+    end
+    raise ArgumentError.new('comparison of %s with %s failed!' % [self.class, other.class])
+  end
+
   # The raw list entry string.
   def raw
     @raw ||= ''

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

@@ -41,8 +41,18 @@ class Net::FTP::List::Unix < Net::FTP::List::Parser
 
     # 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
+    mtime_string = "#{match[19]} #{match[20]}"
+    mtime = Time.parse(mtime_string)
+
+    # Unix mtimes specify a 4 digit year unless the data is within the past 180
+    # days or so. Future dates always specify a 4 digit year. 
+    #
+    # Since the above #parse call fills in today's date for missing date
+    # components, it can sometimes get the year wrong. To fix this, we make
+    # sure all mtimes without a 4 digit year are in the past.
+    if match[20] !~ /\d{4}/ && mtime > Time.now
+      mtime = Time.parse("#{mtime_string} #{mtime.year - 1}")
+    end
 
     basename = match[21].strip
 

data/net-ftp-list.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net-ftp-list}
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]
-  s.date = %q{2011-01-09}
+  s.date = %q{2012-08-01}
   s.email = %q{enquiries@statelesssystems.com}
   s.extra_rdoc_files = [
     "README.txt"

data/test/test_net_ftp_list_entry.rb

@@ -3,6 +3,54 @@ require 'net/ftp/list'
 
 class TestNetFTPEntry < Test::Unit::TestCase
 
+  def test_equality
+    a = Net::FTP::List::Entry.new('foo1', {:basename => 'foo1'})
+    b = Net::FTP::List::Entry.new('foo2', {:basename => 'foo2'})
+    c = Net::FTP::List::Entry.new('foo1', {:basename => 'foo1'})
+
+    assert a.eql? c
+    assert a.eql? a
+    assert !a.eql?(b)
+    assert !a.eql?(1)
+    assert !a.eql?(1.0)
+  end
+
+  def test_comparison
+    raw1 = '-rw-r--r-- 1 root     other     1 Dec 31 23:59 file1'
+    raw2 = '-rw-r--r-- 1 root     other     2 Dec 31 23:59 file2'
+    raw3 = '-rw-r--r-- 1 root     other     3 Dec 31 23:59 file3'
+
+    file1 = Net::FTP::List.parse(raw1)
+    file2 = Net::FTP::List.parse(raw2)
+    file3 = Net::FTP::List.parse(raw3)
+
+    assert file2 > file1
+    assert file2 >= file1
+    assert file2 == file2
+    assert file2 <= file3
+    assert file2 < file3
+    assert !(file2 < file1)
+    assert !(file2 <= file1)
+    assert !(file2 == file1)
+    assert !(file2 == file3)
+    assert !(file2 > file3)
+    assert !(file2 >= file3)
+
+    assert !(file2 < 2)
+    assert !(file2 < 2.0)
+    assert file2 <= 2
+    assert file2 <= 2.0
+    assert file2 == 2
+    assert file2 == 2.0
+    assert !(file2 > 2)
+    assert !(file2 > 2.0)
+    assert file2 >= 2
+    assert file2 >= 2.0
+
+    assert_raise(ArgumentError) { assert file2 > nil }
+    assert_raise(ArgumentError) { assert file2 > true } # wrong class
+  end
+
   def test_raise_on_unknown_options
     assert_raise(ArgumentError) { Net::FTP::List::Entry.new("foo", {:bar => "baz"}) }
   end

data/test/test_net_ftp_list_unix.rb

@@ -2,22 +2,13 @@ require 'test/unit'
 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 #{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
+    @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 #{SYMBOLIC_LINK_TIME} bar -> /etc" rescue nil
-    @older_date = Net::FTP::List.parse "-rwxrwxrwx 1 owner    group  154112 #{ABSOLUTE_DATE} participando.xls" 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
@@ -36,15 +27,53 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert_equal "Unix", @pipe_dev.server_type, 'LIST unix socket device'
   end
 
-  def test_ruby_unix_like_date
-    {
-        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)
+  class ::Time
+    class << self
+      def time_travel(time)
+        @traveled_to_time = time
+
+        begin
+          yield
+        ensure
+          @traveled_to_time = nil
+        end
+      end
+
+      alias_method :original_now, :now
+      def now
+        @traveled_to_time || original_now
+      end
+    end
+  end
+
+  # mtimes in the past, same year.
+  def test_ruby_unix_like_date_past_same_year
+    Time.time_travel(Time.new(2009, 1, 1)) do
+      assert_equal Time.new(2009, 1, 1), Net::FTP::List.parse(@dir.raw).mtime
+    end
+    Time.time_travel(Time.new(2008, 4, 1)) do
+      assert_equal Time.new(2008, 3, 11, 7, 57), Net::FTP::List.parse(@other_dir.raw).mtime
+    end
+  end
+
+  # mtimes in the past, previous year
+  def test_ruby_unix_like_date_past_previous_year
+    Time.time_travel(Time.new(2008, 2, 4)) do
+      assert_equal Time.new(2007, 10, 30, 15, 26), Net::FTP::List.parse(@symlink.raw).mtime
+    end
+  end
+
+  # mtime in the future.
+  def test_ruby_unix_like_date_future
+    Time.time_travel(Time.new(2006, 3, 1)) do
+      assert_equal Time.new(2006, 4, 13), Net::FTP::List.parse(@char_dev.raw).mtime
+    end
+  end
+
+  # Parsed during a leap year.
+  def test_ruby_unix_like_date_leap_year
+    Time.time_travel(Time.new(2012, 1, 2)) do
+      assert_equal Time.new(2011, 10, 30, 15, 26), Net::FTP::List.parse(@symlink.raw).mtime
     end
   end
 
@@ -105,12 +134,4 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Stateless Systems
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +11:00
+date: 2012-08-01 00:00:00 +10:00
 default_executable: 
 dependencies: []