net-ftp-list 3.2.3 → 3.2.4

data/VERSION.yml

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

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

@@ -5,11 +5,10 @@ require 'date'
 #
 # == MATCHES
 #
-#   06-25-07  01:08PM       <DIR>          etc
-#   11-27-07  08:45PM                23437 README.TXT
+#   06-25-2007  01:08PM       <DIR>          etc
+#   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+
@@ -22,7 +21,16 @@ class Net::FTP::List::Microsoft < Net::FTP::List::Parser
   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")
+    date_match = %r!(\d\d).(\d\d).(\d\d(?:\d\d)?)!.match(match[1])
+    date_format = date_match[1].to_i > 12 ? '%d-%m-%y' : '%m-%d-%y'
+    date_format.sub!(%r{%y}, '%Y') if date_match[3].length > 2
+
+    if match[1] !~ /\-/
+      date_format.gsub!(/\-/, '/') if match[1] =~ %r{/}
+      date_format.gsub!(/\-/, ':') if match[1] =~ %r{:}
+    end
+
+    mtime = DateTime.strptime("#{match[1]} #{match[2]}", "#{date_format} %H:%M%p")
     is_dir = match[3] == '<DIR>'
     filesize = is_dir ? 0 : match[4].to_i
 

data/net-ftp-list.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{net-ftp-list}
-  s.version = "3.2.3"
+  s.name = "net-ftp-list"
+  s.version = "3.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]
-  s.date = %q{2012-05-16}
-  s.email = %q{enquiries@statelesssystems.com}
+  s.date = "2012-09-14"
+  s.email = "enquiries@statelesssystems.com"
   s.extra_rdoc_files = [
     "README.txt"
   ]
@@ -34,13 +34,12 @@ Gem::Specification.new do |s|
     "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.homepage = "http://github.com/stateless-systems/net-ftp-list"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Parse FTP LIST command output.}
+  s.rubygems_version = "1.8.15"
+  s.summary = "Parse FTP LIST command output."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_net_ftp_list_microsoft.rb

@@ -13,6 +13,54 @@ class TestNetFTPListMicrosoft < Test::Unit::TestCase
     assert_equal "Microsoft", @file.server_type, 'LIST M$ directory'
   end
 
+  def test_parse_dd_mm_yyyy
+    dd_mm_yyyy = nil
+    assert_nothing_raised do
+      dd_mm_yyyy = Net::FTP::List.parse('25-06-2007  01:08PM       <DIR>          etc')
+    end
+    assert_equal dd_mm_yyyy.mtime.strftime('%Y-%m-%d'), '2007-06-25'
+  end
+
+  def test_parse_dd_mm_yy
+    dd_mm_yy = nil
+    assert_nothing_raised do
+      dd_mm_yy = Net::FTP::List.parse('25-06-07  01:08PM       <DIR>          etc')
+    end
+    assert_equal dd_mm_yy.mtime.strftime('%Y-%m-%d'), '2007-06-25'
+  end
+
+  def test_parse_mm_dd_yy
+    mm_dd_yy = nil
+    assert_nothing_raised do
+      mm_dd_yy = Net::FTP::List.parse('06-25-07  01:08PM       <DIR>          etc')
+    end
+    assert_equal mm_dd_yy.mtime.strftime('%Y-%m-%d'), '2007-06-25'
+  end
+
+  def test_default_date_mm_dd_yy
+    mm_dd_yy = nil
+    assert_nothing_raised do
+      mm_dd_yy = Net::FTP::List.parse('01-02-03  01:08PM       <DIR>          etc')
+    end
+    assert_equal mm_dd_yy.mtime.strftime('%Y-%m-%d'), '2003-01-02'
+  end
+
+  def test_parse_slash_delimited_date
+    slash_delimited = nil
+    assert_nothing_raised do
+      slash_delimited = Net::FTP::List.parse('06/25/07  01:08PM       <DIR>          etc')
+    end
+    assert_equal slash_delimited.mtime.strftime('%Y-%m-%d'), '2007-06-25'
+  end
+
+  def test_parse_colon_delimited_date
+    colon_delimited = nil
+    assert_nothing_raised do
+      colon_delimited = Net::FTP::List.parse('06:25:07  01:08PM       <DIR>          etc')
+    end
+    assert_equal colon_delimited.mtime.strftime('%Y-%m-%d'), '2007-06-25'
+  end
+
   def test_rubbish_lines
     assert_instance_of Net::FTP::List::Entry, Net::FTP::List.parse("++ bah! ++")
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 2
-  - 3
-  version: 3.2.3
+  - 4
+  version: 3.2.4
 platform: ruby
 authors: 
 - Stateless Systems
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 +10:00
-default_executable: 
+date: 2012-09-14 00:00:00 Z
 dependencies: []
 
 description: 
@@ -45,7 +45,6 @@ files:
 - 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: []
 
@@ -59,6 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -67,13 +67,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Parse FTP LIST command output.