ftputils 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -0,0 +1,12 @@
+= Change Log
+
+== 0.2.1
+
+* Add timeouts to FTPUtils and FTPConnection methods. Defaults to 5 minutes,
+but can be set with FTPUtils.timeout_period=(seconds).
+
+== 0.2.0
+
+* Major internal refactoring, pulling FTPConnection out of FTPURI
+* Add FTPFile, which implements a subset of the File API for FTP URIs
+* Add FTPUtils.ls

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/ftputils.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ftputils}
+  s.version = "0.2.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bruz Marzolf"]
+  s.date = %q{2011-06-20}
+  s.description = %q{Implements a subset of the methods in FileUtils for FTP URIs, falling back on FileUtils when a path doesn't look like FTP}
+  s.email = %q{bmarzolf@systemsbiology.org}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "CHANGELOG.rdoc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ftputils.gemspec",
+    "lib/ftputils.rb",
+    "lib/ftputils/ext/class.rb",
+    "lib/ftputils/ftpconnection.rb",
+    "lib/ftputils/ftpfile.rb",
+    "lib/ftputils/ftpuri.rb",
+    "spec/ftpconnection_spec.rb",
+    "spec/ftpfile_spec.rb",
+    "spec/ftpuri_spec.rb",
+    "spec/ftputils_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/bmarzolf/ftputils}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Like FileUtils for FTP}
+  s.test_files = [
+    "spec/ftpconnection_spec.rb",
+    "spec/ftpfile_spec.rb",
+    "spec/ftpuri_spec.rb",
+    "spec/ftputils_spec.rb",
+    "spec/spec_helper.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
+      s.add_runtime_dependency(%q<ftpfxp>, [">= 0.0.4"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<ftpfxp>, [">= 0.0.4"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<ftpfxp>, [">= 0.0.4"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/lib/ftputils.rb

@@ -7,61 +7,79 @@ end
 
 require 'fileutils'
 require 'open-uri'
+require 'timeout'
 
 class FTPUtils
 
+  @@timeout_period = 300
+
+  def self.timeout_period
+    # default to a 5 minute timeout
+    @@timeout_period || 300
+  end
+
+  def self.timeout_period=(seconds)
+    @@timeout_period = seconds
+  end
+
   def self.cp(src, dest, options = {})
-    # handle all combinations of copying to/from FTP and local files
-    case [ftp_url?(src), ftp_url?(dest)]
-    when [true, true]
-      raise "src should be a filename, not a directory" if FTPFile.directory?(src)
+    timeout(timeout_period) do
+      # handle all combinations of copying to/from FTP and local files
+      case [ftp_url?(src), ftp_url?(dest)]
+      when [true, true]
+        raise "src should be a filename, not a directory" if FTPFile.directory?(src)
 
-      dest_path = FTPFile.dirname(dest) + "/" + ( FTPFile.basename(dest) || FTPFile.basename(src) )
-      FTPConnection.connect(src).fxpto(FTPConnection.connect(dest), dest_path, FTPFile.relative_path(src))
-    when [true, false]
-      raise "src should be a filename, not a directory" if FTPFile.directory?(src)
+        dest_path = FTPFile.dirname(dest) + "/" + ( FTPFile.basename(dest) || FTPFile.basename(src) )
+        FTPConnection.connect(src).fxpto(FTPConnection.connect(dest), dest_path, FTPFile.relative_path(src))
+      when [true, false]
+        raise "src should be a filename, not a directory" if FTPFile.directory?(src)
 
-      filename = FTPFile.basename(src)
+        filename = FTPFile.basename(src)
 
-      if File.directory? dest
-        dest += "/#{filename}"
-      end
+        if File.directory? dest
+          dest += "/#{filename}"
+        end
 
-      connection = FTPConnection.connect(src)
-      connection.chdir FTPFile.dirname(src)
-      connection.getbinaryfile filename, dest, 1024
-    when [false, true]
-      raise "src should be a filename, not a directory" if File.directory? src
+        connection = FTPConnection.connect(src)
+        connection.chdir FTPFile.dirname(src)
+        connection.getbinaryfile filename, dest, 1024
+      when [false, true]
+        raise "src should be a filename, not a directory" if File.directory? src
 
-      dest_path = FTPFile.relative_path(dest)
+        dest_path = FTPFile.relative_path(dest)
 
-      if FTPFile.directory?(dest)
-        dest_path += "/#{File.basename(src)}"
-      end
+        if FTPFile.directory?(dest)
+          dest_path += "/#{File.basename(src)}"
+        end
 
-      connection = FTPConnection.connect(dest)
-      connection.chdir FTPFile.dirname(dest)
+        connection = FTPConnection.connect(dest)
+        connection.chdir FTPFile.dirname(dest)
 
-      begin
         connection.putbinaryfile src, dest_path, 1024
-      rescue Net::FTPPermError
-        raise "Unable to copy #{src} to #{dest_path}, possibly due to FTP server permissions"
+      when [false, false]
+        FileUtils.cp src, dest, options
       end
-    when [false, false]
-      FileUtils.cp src, dest, options
     end
+  rescue Net::FTPPermError
+    raise "Unable to copy #{src} to #{dest}, possibly due to FTP server permissions"
+  rescue Timeout::Error
+    raise "Copying #{src} to #{dest} timed out after #{timeout_period} seconds"
   end
 
   def self.rm(path)
-    if ftp_url?(path)
-      raise "Can't use FTPUtils.rm on directories. Instead use FTPUtils.rm_r" if FTPFile.directory?(path)
-
-      connection = FTPConnection.connect(path)
-      connection.chdir FTPFile.dirname(path)
-      connection.delete FTPFile.basename(path)
-    else
-      FileUtils.rm path
+    timeout(timeout_period) do
+      if ftp_url?(path)
+        raise "Can't use FTPUtils.rm on directories. Instead use FTPUtils.rm_r" if FTPFile.directory?(path)
+
+        connection = FTPConnection.connect(path)
+        connection.chdir FTPFile.dirname(path)
+        connection.delete FTPFile.basename(path)
+      else
+        FileUtils.rm path
+      end
     end
+  rescue Timeout::Error
+    raise "Removing #{path} timed out after #{timeout_period} seconds"
   end
 
   def self.mv(src, dest, options = {})
@@ -70,78 +88,94 @@ class FTPUtils
   end
 
   def self.rm_r(path)
-    if ftp_url?(path)
-      if FTPFile.directory?(path) 
-        connection = FTPConnection.connect(path)
-        connection.chdir FTPFile.relative_path(path)
-
-        files = connection.nlst
-        files.each {|file| rm_r "#{path}/#{file}"}
-
-        connection.rmdir FTPFile.relative_path(path)
+    timeout(timeout_period) do
+      if ftp_url?(path)
+        if FTPFile.directory?(path) 
+          connection = FTPConnection.connect(path)
+          connection.chdir FTPFile.relative_path(path)
+
+          files = connection.nlst
+          files.each {|file| rm_r "#{path}/#{file}"}
+
+          connection.rmdir FTPFile.relative_path(path)
+        else
+          rm(path)
+        end
       else
-        rm(path)
+        FileUtils.rm_r path
       end
-    else
-      FileUtils.rm_r path
     end
+  rescue Timeout::Error
+    raise "Removing #{path} timed out after #{timeout_period} seconds"
   end
 
   def self.mkdir_p(path)
-    if ftp_url?(path)
-      connection = FTPConnection.connect(path)
+    timeout(timeout_period) do
+      if ftp_url?(path)
+        connection = FTPConnection.connect(path)
 
-      subdirs = FTPFile.relative_path(path).split(/\//)
-      subdirs.each do |subdir|
-        next if subdir == ""
+        subdirs = FTPFile.relative_path(path).split(/\//)
+        subdirs.each do |subdir|
+          next if subdir == ""
 
-        connection.mkdir subdir
-        connection.chdir subdir
+          connection.mkdir subdir
+          connection.chdir subdir
+        end
+      else
+        FileUtils.mkdir_p path
       end
-    else
-      FileUtils.mkdir_p path
     end
+  rescue Timeout::Error
+    raise "Creating #{path} timed out after #{timeout_period} seconds"
   end
 
   def self.cp_r(src, dest, options = {})
-    # handle all combinations of copying to/from FTP and local files
-    if ftp_url?(src)
-      if FTPFile.directory?(src) 
-        mkdir_p dest
-
-        connection = FTPConnection.connect(src)
-        files = connection.nlst
-        files.each {|file| cp_r "#{src}/#{file}", "#{dest}/#{file}", options}
-      else
-        cp(src, dest, options)
-      end
-    elsif ftp_url?(dest)
-      if FTPFile.directory?(dest) 
-        mkdir_p dest
-
-        files = Dir.entries(src)
-        files.each {|file| cp_r "#{src}/#{file}", "#{dest}/#{file}", options}
+    timeout(timeout_period) do
+      # handle all combinations of copying to/from FTP and local files
+      if ftp_url?(src)
+        if FTPFile.directory?(src) 
+          mkdir_p dest
+
+          connection = FTPConnection.connect(src)
+          files = connection.nlst
+          files.each {|file| cp_r "#{src}/#{file}", "#{dest}/#{file}", options}
+        else
+          cp(src, dest, options)
+        end
+      elsif ftp_url?(dest)
+        if FTPFile.directory?(dest) 
+          mkdir_p dest
+
+          files = Dir.entries(src)
+          files.each {|file| cp_r "#{src}/#{file}", "#{dest}/#{file}", options}
+        else
+          cp(src, dest, options)
+        end
       else
-        cp(src, dest, options)
+        FileUtils.cp_r src, dest
       end
-    else
-      FileUtils.cp_r src, dest
     end
+  rescue Timeout::Error
+    raise "Copying #{src} to #{dest} timed out after #{timeout_period} seconds"
   end
 
   def self.ls(path)
-    if ftp_url?(path)
-      if FTPFile.directory?(path) 
-        connection = FTPConnection.connect(path)
-        connection.chdir FTPFile.relative_path(path)
-
-        return connection.nlst
+    timeout(timeout_period) do
+      if ftp_url?(path)
+        if FTPFile.directory?(path) 
+          connection = FTPConnection.connect(path)
+          connection.chdir FTPFile.relative_path(path)
+
+          return connection.nlst
+        else
+          nil
+        end
       else
-        nil
+        Dir.entries path
       end
-    else
-      Dir.entries path
     end
+  rescue Timeout::Error
+    raise "Listing #{path} timed out after #{timeout_period} seconds"
   end
 
   private

data/lib/ftputils/ftpconnection.rb

@@ -1,29 +1,35 @@
+require 'timeout'
+
 class FTPUtils
   class FTPConnection
     cattr_accessor :connections
 
     def self.connect(uri)
-      if uri.match(/^ftp:\/\/(.*?):(.*?)@(.*?)(\/.*)*$/)
-        username = $1
-        password = $2
-        host = $3
-
-        connection = self.establish_connection(host, username, password)
-
-        # need to reset to the top directory since connections are cached and
-        # could have been left elsewhere. this also provides a way to see if the 
-        # connection has expired and needs to be reloaded
-        begin
-          connection.chdir "/"
-        rescue Net::FTPTempError
-          connection = self.establish_connection(host, username, password, true)
-          retry
+      timeout(FTPUtils.timeout_period) do
+        if uri.match(/^ftp:\/\/(.*?):(.*?)@(.*?)(\/.*)*$/)
+          username = $1
+          password = $2
+          host = $3
+
+          connection = self.establish_connection(host, username, password)
+
+          # need to reset to the top directory since connections are cached and
+          # could have been left elsewhere. this also provides a way to see if the 
+          # connection has expired and needs to be reloaded
+          begin
+            connection.chdir "/"
+          rescue Net::FTPTempError
+            connection = self.establish_connection(host, username, password, true)
+            retry
+          end
+
+          return connection
+        else
+          raise "Invalid FTP URL provided: #{uri}"
         end
-
-        return connection
-      else
-        raise "Invalid FTP URL provided: #{uri}"
       end
+    rescue Timeout::Error
+      raise "Connecting to #{uri} timed out after #{FTPUtils.timeout_period} seconds"
     end
 
     def self.clear_connection_cache

data/spec/ftpconnection_spec.rb

@@ -52,5 +52,17 @@ describe FTPUtils::FTPConnection do
         FTPUtils::FTPConnection.connect("ftp://admin:test@myhost/path/to/file.txt")
       end.should raise_error(Net::FTPPermError)
     end
+
+    it "should raise an error if connecting takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      Net::FTPFXP.should_receive(:new) do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils::FTPConnection.connect("ftp://admin:test@myhost/path/to/file.txt")
+      end.should raise_error("Connecting to ftp://admin:test@myhost/path/to/file.txt timed out after 0.1 seconds")
+    end
   end
 end

data/spec/ftputils_spec.rb

@@ -76,6 +76,33 @@ describe "FTPUtils" do
           FTPUtils.cp "ftp://admin:test@host1/subdir1", "ftp://admin:test@host2/subdir2"
         end.should raise_error("src should be a filename, not a directory")
       end
+
+      it "should time out a transfer that takes too long" do
+        FTPUtils.timeout_period = 0.1
+
+        FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/file1.txt").
+          and_return(false)
+        FTPUtils::FTPFile.should_receive(:dirname).with("ftp://admin:test@host2/file2.txt").
+          and_return("/")
+        FTPUtils::FTPFile.should_receive(:basename).with("ftp://admin:test@host2/file2.txt").
+          and_return("file2.txt")
+
+        mock_src_connection = mock(FTPUtils::FTPConnection)
+        FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/file1.txt").
+          and_return(mock_src_connection)
+        mock_dest_connection = mock(FTPUtils::FTPConnection)
+        FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host2/file2.txt").
+          and_return(mock_dest_connection)
+        FTPUtils::FTPFile.should_receive(:relative_path).with("ftp://admin:test@host1/file1.txt").
+          and_return("/file1.txt")
+        mock_src_connection.should_receive(:fxpto).with(mock_dest_connection, "//file2.txt", "/file1.txt") do
+          sleep 1
+        end
+
+        lambda do
+          FTPUtils.cp "ftp://admin:test@host1/file1.txt", "ftp://admin:test@host2/file2.txt"
+        end.should raise_error("Copying ftp://admin:test@host1/file1.txt to ftp://admin:test@host2/file2.txt timed out after 0.1 seconds")
+      end
     end
 
     describe "from FTP to the local filesystem" do
@@ -119,6 +146,32 @@ describe "FTPUtils" do
         FTPUtils.cp "ftp://admin:test@host1/subdir1/file1.txt", "/home/me"
       end
 
+      it "should time out a transfer that takes too long" do
+        FTPUtils.timeout_period = 0.1
+
+        FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1/file1.txt").
+          and_return(false)
+
+        FTPUtils::FTPFile.should_receive(:basename).with("ftp://admin:test@host1/subdir1/file1.txt").
+          and_return("file1.txt")
+
+        File.should_receive(:directory?).with("/home/me/file2.txt").and_return(false)
+
+        mock_src_connection = mock(FTPUtils::FTPConnection)
+        FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/subdir1/file1.txt").
+          and_return(mock_src_connection)
+        FTPUtils::FTPFile.should_receive(:dirname).with("ftp://admin:test@host1/subdir1/file1.txt").
+          and_return("/subdir1")
+        mock_src_connection.should_receive(:chdir).with("/subdir1")
+        mock_src_connection.should_receive(:getbinaryfile).with("file1.txt", "/home/me/file2.txt", 1024) do
+          sleep 1
+        end
+
+        lambda do
+          FTPUtils.cp "ftp://admin:test@host1/subdir1/file1.txt", "/home/me/file2.txt"
+        end.should raise_error("Copying ftp://admin:test@host1/subdir1/file1.txt to /home/me/file2.txt timed out after 0.1 seconds")
+      end
+
       it "should raise an error if the source URI is a directory" do
         FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1").
           and_return(true)
@@ -179,7 +232,29 @@ describe "FTPUtils" do
 
         lambda do
           FTPUtils.cp "/home/me/file1.txt", "ftp://admin:test@host2/file2.txt"
-        end.should raise_error("Unable to copy /home/me/file1.txt to /file2.txt, possibly due to FTP server permissions")
+        end.should raise_error("Unable to copy /home/me/file1.txt to ftp://admin:test@host2/file2.txt, possibly due to FTP server permissions")
+      end
+
+      it "should time out a transfer that takes too long" do
+        FTPUtils.timeout_period = 0.1
+
+        File.should_receive(:directory?).with("/home/me/file1.txt").and_return(false)
+        FTPUtils::FTPFile.should_receive(:relative_path).with("ftp://admin:test@host2/file2.txt").
+          and_return("/file2.txt")
+        FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host2/file2.txt").
+          and_return(false)
+        mock_dest_connection = mock(FTPUtils::FTPConnection)
+        FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host2/file2.txt").
+          and_return(mock_dest_connection)
+        FTPUtils::FTPFile.should_receive(:dirname).with("ftp://admin:test@host2/file2.txt").and_return("/")
+        mock_dest_connection.should_receive(:chdir).with("/")
+        mock_dest_connection.should_receive(:putbinaryfile).with("/home/me/file1.txt", "/file2.txt", 1024) do
+          sleep 1
+        end
+
+        lambda do
+          FTPUtils.cp "/home/me/file1.txt", "ftp://admin:test@host2/file2.txt"
+        end.should raise_error("Copying /home/me/file1.txt to ftp://admin:test@host2/file2.txt timed out after 0.1 seconds")
       end
 
       it "should raise an error if the source file is a directory" do
@@ -228,6 +303,25 @@ describe "FTPUtils" do
 
       FTPUtils.rm "file.txt"
     end
+
+    it "should time out a removal that takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1/file.txt").
+        and_return(false)
+      mock_connection = mock(FTPUtils::FTPConnection)
+      FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/subdir1/file.txt").
+        and_return(mock_connection)
+      FTPUtils::FTPFile.should_receive(:dirname).with("ftp://admin:test@host1/subdir1/file.txt").and_return("/subdir1")
+      mock_connection.should_receive(:chdir).with("/subdir1")
+      mock_connection.should_receive(:delete).with("file.txt") do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils.rm "ftp://admin:test@host1/subdir1/file.txt"
+      end.should raise_error("Removing ftp://admin:test@host1/subdir1/file.txt timed out after 0.1 seconds")
+    end
   end
 
   describe "removing recursively" do
@@ -275,6 +369,43 @@ describe "FTPUtils" do
 
       FTPUtils.rm_r "dir"
     end
+
+    it "should time out a removal that takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1").
+        and_return(true)
+      mock_connection = mock(FTPUtils::FTPConnection)
+      FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/subdir1").
+        and_return(mock_connection)
+      mock_connection.should_receive(:chdir).with("/subdir1")
+      mock_connection.should_receive(:nlst).and_return( ["subdir2", "file.txt"] )
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1/subdir2").
+        and_return(true)
+      mock_subdir_connection = mock(FTPUtils::FTPConnection)
+      FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/subdir1/subdir2").
+        and_return(mock_subdir_connection)
+      mock_subdir_connection.should_receive(:chdir).with("/subdir1/subdir2")
+      mock_subdir_connection.should_receive(:nlst).and_return( [] )
+      FTPUtils::FTPFile.should_receive(:relative_path).with("ftp://admin:test@host1/subdir1/subdir2").twice.
+        and_return("/subdir1/subdir2")
+      mock_subdir_connection.should_receive(:rmdir).with("/subdir1/subdir2")
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1/file.txt").
+        and_return(false)
+      FTPUtils.should_receive(:rm).with("ftp://admin:test@host1/subdir1/file.txt")
+
+      FTPUtils::FTPFile.should_receive(:relative_path).with("ftp://admin:test@host1/subdir1").twice.
+        and_return("/subdir1")
+      mock_connection.should_receive(:rmdir).with("/subdir1") do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils.rm_r "ftp://admin:test@host1/subdir1"
+      end.should raise_error("Removing ftp://admin:test@host1/subdir1 timed out after 0.1 seconds")
+    end
   end
 
   describe "create a directory and all its parents" do
@@ -299,6 +430,25 @@ describe "FTPUtils" do
 
       FTPUtils.mkdir_p("subdir1/subdir2")
     end
+
+    it "should time out a creation that takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      mock_connection = mock(FTPUtils::FTPConnection)
+      FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@host1/subdir1/subdir2").
+        and_return(mock_connection)
+
+      FTPUtils::FTPFile.should_receive(:relative_path).with("ftp://admin:test@host1/subdir1/subdir2").
+        and_return("/subdir1/subdir2")
+
+      mock_connection.should_receive(:mkdir).with("subdir1") do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils.mkdir_p "ftp://admin:test@host1/subdir1/subdir2"
+      end.should raise_error("Creating ftp://admin:test@host1/subdir1/subdir2 timed out after 0.1 seconds")
+    end
   end
 
   describe "copying recursively" do
@@ -375,6 +525,18 @@ describe "FTPUtils" do
 
       FTPUtils.cp_r "/home/me/subdir1", "/home/me/subdir2"
     end
+
+    it "should time out a copy that takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1") do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils.cp_r "ftp://admin:test@host1/subdir1", "ftp://admin:test@host2/subdir2"
+      end.should raise_error("Copying ftp://admin:test@host1/subdir1 to ftp://admin:test@host2/subdir2 timed out after 0.1 seconds")
+    end
   end
 
   describe "listing the entries in a directory" do
@@ -402,5 +564,17 @@ describe "FTPUtils" do
 
       FTPUtils.ls("/home/me/subdir1")
     end
+
+    it "should time out a directory listing that takes too long" do
+      FTPUtils.timeout_period = 0.1
+
+      FTPUtils::FTPFile.should_receive(:directory?).with("ftp://admin:test@host1/subdir1") do
+        sleep 1
+      end
+
+      lambda do
+        FTPUtils.ls("ftp://admin:test@host1/subdir1")
+      end.should raise_error("Listing ftp://admin:test@host1/subdir1 timed out after 0.1 seconds")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ftputils'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bruz Marzolf
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2011-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,11 +56,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- ftputils.gemspec
 - lib/ftputils.rb
 - lib/ftputils/ext/class.rb
 - lib/ftputils/ftpconnection.rb
@@ -77,8 +78,8 @@ homepage: http://github.com/bmarzolf/ftputils
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC