net-ftp-list 3.2.5 → 3.2.6

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7-p371

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))

data/VERSION.yml

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

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

@@ -8,7 +8,7 @@ class Net::FTP::List::Entry
   # 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.force_encoding('utf-8')
+    @raw = raw_ls_line.respond_to?(:force_encoding) ? raw_ls_line.force_encoding('utf-8') : 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.respond_to?(:force_encoding) ? value.force_encoding('utf-8') : value)

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

@@ -44,19 +44,26 @@ class Net::FTP::List::Unix < Net::FTP::List::Parser
 
     # TODO: Permissions, users, groups, date/time.
     filesize = match[18].to_i
-    mtime_string = "#{match[19]} #{match[20]}"
-    mtime = Time.parse(mtime_string)
+    
+    mtime_month_and_day = match[19]
+    mtime_time_or_year = match[20]
 
     # 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}")
+    # If the parsed date, with today's year, could be in the future, then
+    # the date must be for the previous year
+    mtime_string = if mtime_time_or_year.match(/^[0-9][0-9]:[0-9][0-9]$/)
+      if Time.parse("#{mtime_month_and_day} #{Time.now.year}") > Time.now
+        "#{mtime_month_and_day} #{mtime_time_or_year} #{Time.now.year - 1}"
+      else
+        "#{mtime_month_and_day} #{mtime_time_or_year} #{Time.now.year}"
+      end
+    elsif mtime_time_or_year.match(/^[0-9][0-9][0-9][0-9]$/)
+      "#{mtime_month_and_day} #{mtime_time_or_year}"
     end
 
+    mtime = Time.parse(mtime_string)
+
     basename = match[21].strip
 
     # filenames with spaces will end up in the last match

data/net-ftp-list.gemspec

@@ -4,17 +4,18 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "net-ftp-list"
-  s.version = "3.2.5"
+  s.name = %q{net-ftp-list}
+  s.version = "3.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]
-  s.date = "2012-09-15"
-  s.email = "enquiries@statelesssystems.com"
+  s.date = %q{2013-08-27}
+  s.email = %q{enquiries@statelesssystems.com}
   s.extra_rdoc_files = [
     "README.txt"
   ]
   s.files = [
+    ".ruby-version",
     "README.txt",
     "Rakefile",
     "VERSION.yml",
@@ -34,10 +35,10 @@ Gem::Specification.new do |s|
     "test/test_net_ftp_list_rumpus.rb",
     "test/test_net_ftp_list_unix.rb"
   ]
-  s.homepage = "http://github.com/stateless-systems/net-ftp-list"
+  s.homepage = %q{http://github.com/stateless-systems/net-ftp-list}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Parse FTP LIST command output."
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Parse FTP LIST command output.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_net_ftp_list_unix.rb

@@ -14,6 +14,7 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     @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
     @file_no_inodes = Net::FTP::List.parse '-rw-r--r-- foo@localhost foo@localhost  6034 May 14 23:13 index.html' rescue nil
+    @file_today = Net::FTP::List.parse     'crw-rw-rw- 1 root     root   1,   3 Aug 16 14:28 today.txt'           rescue nil
   end
 
   def test_parse_new
@@ -50,32 +51,40 @@ class TestNetFTPListUnix < Test::Unit::TestCase
 
   # 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
+
+    Time.time_travel(Time.local(2009, 1, 1)) do
+      assert_equal Time.local(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
+    Time.time_travel(Time.local(2008, 4, 1)) do
+      assert_equal Time.local(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
+    Time.time_travel(Time.local(2008, 2, 4)) do
+      assert_equal Time.local(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
+    Time.time_travel(Time.local(2006, 3, 1)) do
+      assert_equal Time.local(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
+    Time.time_travel(Time.local(2012, 1, 2)) do
+      assert_equal Time.local(2011, 10, 30, 15, 26), Net::FTP::List.parse(@symlink.raw).mtime
+    end
+  end
+
+  # mtimes today, same year.
+  def test_ruby_unix_like_date_today_same_year
+    Time.time_travel(Time.local(2013, 8, 16)) do
+      assert_equal Time.local(2013, 8, 16, 14, 28), Net::FTP::List.parse(@file_today.raw).mtime
     end
   end
 

metadata

@@ -1,23 +1,34 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: net-ftp-list
-version: !ruby/object:Gem::Version
-  version: 3.2.5
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 3
+  - 2
+  - 6
+  version: 3.2.6
 platform: ruby
-authors:
+authors: 
 - Stateless Systems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+
+date: 2013-08-27 00:00:00 +10:00
+default_executable: 
 dependencies: []
+
 description: 
 email: enquiries@statelesssystems.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.txt
-files:
+files: 
+- .ruby-version
 - README.txt
 - Rakefile
 - VERSION.yml
@@ -36,28 +47,39 @@ 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: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Parse FTP LIST command output.
 test_files: []
+