net-ftp-list 2.0.0 → 2.1.1

data/.gitignore

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

data/README.txt

@@ -30,13 +30,15 @@ See the RFC for more guff on LIST and NLST: http://www.ietf.org/rfc/rfc0959.txt
   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
+    # Format the entry showing its file size and modification time
+    puts "#{entry.basename}, #{entry.filesize}, #{entry.mtime}"
+
   end
 
 == CREDITS

data/VERSION.yml

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

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

@@ -1,4 +1,5 @@
 require 'net/ftp/list/parser'
+require 'date'
 
 module Net
   class FTP
@@ -33,9 +34,12 @@ module Net
           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
 

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

@@ -1,4 +1,5 @@
 require 'net/ftp/list/parser'
+require 'time'
 
 module Net
   class FTP
@@ -33,6 +34,9 @@ module Net
           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

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

@@ -43,17 +43,25 @@ module Net
 
         # Looks like a directory, try CWD.
         def dir?
-          !!@dir ||= false
+          !!(@dir ||= false)
         end
 
         # Looks like a file, try RETR.
         def file?
-          !!@file ||= false
+          !!(@file ||= false)
         end
 
         # Looks like a symbolic link.
         def symlink?
-          !!@symlink ||= false
+          !!(@symlink ||= false)
+        end
+
+        def mtime
+          @mtime
+        end
+
+        def filesize
+          @filesize
         end
 
         class << self

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

@@ -1,3 +1,4 @@
+require 'time'
 require 'net/ftp/list/parser'
 
 module Net
@@ -7,7 +8,7 @@ module Net
       # 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
       #
@@ -46,6 +47,8 @@ module Net
           end
 
           # TODO: Permissions, users, groups, date/time.
+          @filesize = match[18].to_i
+          @mtime = Time.parse("#{match[19]} #{match[20]}")
 
           @basename = match[21].strip
 

data/net-ftp-list.gemspec

@@ -0,0 +1,53 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{net-ftp-list}
+  s.version = "2.1.1"
+
+  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.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"
+  ]
+  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.summary = %q{Parse FTP LIST command output.}
+  s.test_files = [
+    "test/test_net_ftp_list_microsoft.rb",
+     "test/test_net_ftp_list_unix.rb",
+     "test/test_net_ftp_list_netware.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
+    else
+    end
+  else
+  end
+end
+

data/test/test_net_ftp_list_microsoft.rb

@@ -18,6 +18,11 @@ class TestNetFTPListMicrosoft < Test::Unit::TestCase
     assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
   end
 
+  def test_ruby_microsoft_mtime
+    assert_equal DateTime.strptime('06-25-07  01:08PM', "%m-%d-%y  %I:%M%p"), @dir.mtime
+    assert_equal DateTime.strptime('11-27-07  08:45PM', "%m-%d-%y  %I:%M%p"), @file.mtime
+  end
+
   def test_ruby_microsoft_like_dir
     assert_equal 'etc', @dir.basename
     assert @dir.dir?
@@ -30,4 +35,8 @@ class TestNetFTPListMicrosoft < Test::Unit::TestCase
     assert !@file.dir?
   end
 
+  def test_filesize
+    assert @dir.filesize.nil?
+    assert_equal 23437, @file.filesize
+  end
 end

data/test/test_net_ftp_list_netware.rb

@@ -17,6 +17,11 @@ class TestNetFTPListNetware < Test::Unit::TestCase
     assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
   end
 
+  def test_ruby_netware_mtime
+    assert_equal @dir.mtime, Time.parse('Jun 27 23:46')
+    assert_equal @file.mtime, Time.parse('Jun 22 06:22')
+  end
+
   def test_ruby_netware_like_dir
     assert_equal 'public.www', @dir.basename
     assert @dir.dir?
@@ -29,4 +34,9 @@ class TestNetFTPListNetware < Test::Unit::TestCase
     assert !@file.dir?
   end
 
+  def test_filesize
+    assert_equal 512, @dir.filesize
+    assert_equal 2767, @file.filesize
+  end
+
 end

data/test/test_net_ftp_list_unix.rb

@@ -4,11 +4,12 @@ require 'net/ftp/list'
 class TestNetFTPListUnix < Test::Unit::TestCase
 
   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'
+    @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'
   end
 
   def test_parse_new
@@ -23,6 +24,12 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
   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
+  end
+
   def test_ruby_unix_like_dir
     assert_equal 'etc', @dir.basename
     assert @dir.dir?
@@ -52,4 +59,12 @@ class TestNetFTPListUnix < Test::Unit::TestCase
     assert !@file.dir?
   end
 
+  def test_filesize
+    assert_equal 4096, @dir.filesize
+    assert_equal 531, @file.filesize
+    assert_equal 4096, @other_dir.filesize
+    assert_equal 72, @spaces.filesize
+    assert_equal 4, @symlink.filesize
+    assert_equal 154112, @older_date.filesize
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Stateless Systems
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 +10:00
+date: 2010-07-30 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
+- .gitignore
 - README.txt
 - Rakefile
 - VERSION.yml
@@ -30,6 +31,7 @@ files:
 - 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
@@ -59,9 +61,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Parse FTP LIST command output.
 test_files: 
+- 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_microsoft.rb