net-ftp-list 1.0 → 2.0.0

data/Rakefile

@@ -1,51 +1,52 @@
-# -*- ruby -*-
+require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/testtask'
-
-NAME = 'net-ftp-list'
-VERS = '1.0'
-
-CLEAN.include ['**/*.log', '*.gem']
-CLOBBER.include ['**/*.log']
 
-spec = Gem::Specification.new do |s|
-  s.name             = NAME
-  s.version          = VERS
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = ["README.txt"]
-  s.summary          = 'Parse FTP LIST command output.'
-  s.description      = s.summary
-  s.author           = 'Shane Hanna'
-  s.email            = 'shane@statelesssystems.com'
-  s.homepage         = 'http://statelesssystems.com'
-
-  s.files            = FileList['Rakefile', '**/*.{rb,txt}'].to_a
-  s.test_files       = FileList['tests/*.rb'].to_a
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "net-ftp-list"
+    gem.summary = %Q{Parse FTP LIST command output.}
+    gem.email = "enquiries@statelesssystems.com"
+    gem.homepage = "http://github.com/stateless-systems/net-ftp-list"
+    gem.authors = ["Stateless Systems"]
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Default: Run unit tests.'
-task :default => :test
-
-Rake::GemPackageTask.new(spec) do |p|
-    p.need_tar = true
-    p.gem_spec = spec
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
 
-desc 'Run the unit tests.'
-Rake::TestTask.new do |t|
-  t.verbose = true
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
-desc 'Package and install as gem.'
-task :install do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
-end
+task :default => :test
 
-desc 'Uninstall the gem.'
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "net-ftp-list #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION.yml

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

data/lib/net/ftp/list.rb

@@ -5,6 +5,7 @@ require 'net/ftp/list/parser'
 # 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 #:nodoc:
   class FTP #:nodoc:

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

@@ -0,0 +1,50 @@
+require 'net/ftp/list/parser'
+
+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
+
+          if match[1] == 'd'
+            @dir = true
+          else
+            @file = true
+          end
+
+          # TODO: Permissions, users, groups, date/time.
+
+          @basename = match[9]
+        end
+      end
+
+    end
+  end
+end

data/test/test_net_ftp_list_netware.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'net/ftp/list'
+
+class TestNetFTPListNetware < Test::Unit::TestCase
+
+  def setup
+    @dir  = Net::FTP::List.parse('d [RWCEAFMS] dpearce                          512 Jun 27 23:46 public.www')
+    @file = Net::FTP::List.parse('- [RWCEAFMS] dpearce                         2767 Jun 22 06:22 about.html')
+  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! ++")
+  end
+
+  def test_ruby_netware_like_dir
+    assert_equal 'public.www', @dir.basename
+    assert @dir.dir?
+    assert !@dir.file?
+  end
+
+  def test_ruby_netware_like_file
+    assert_equal 'about.html', @file.basename
+    assert @file.file?
+    assert !@file.dir?
+  end
+
+end

metadata

@@ -1,53 +1,67 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2008-05-23 00:00:00 +10:00
-summary: Parse FTP LIST command output.
-require_paths: 
-- lib
-email: shane@statelesssystems.com
-homepage: http://statelesssystems.com
-rubyforge_project: 
-description: Parse FTP LIST command output.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 2.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Shane Hanna
+- Stateless Systems
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-05-05 00:00:00 +10:00
+default_executable: 
+dependencies: []
+
+description: 
+email: enquiries@statelesssystems.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.txt
 files: 
+- 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
-- lib/net/ftp/list.rb
 - test/test_net_ftp_list_microsoft.rb
+- test/test_net_ftp_list_netware.rb
 - test/test_net_ftp_list_unix.rb
-- README.txt
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: 
-- README.txt
-executables: []
-
-extensions: []
+has_rdoc: true
+homepage: http://github.com/stateless-systems/net-ftp-list
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 2
+summary: Parse FTP LIST command output.
+test_files: 
+- test/test_net_ftp_list_unix.rb
+- test/test_net_ftp_list_netware.rb
+- test/test_net_ftp_list_microsoft.rb