ftputils 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,6 +1,6 @@
-= ftputils
+= FTPUtils
 
-Description goes here.
+FTPUtils attempts to reproduce a subset of the methods provided by FileUtils and File for FTP URIs, using Net::FTP. While it has decent coverage by Rspec specs, it has only been tested under conditions specific to what it was developed for and will very likely need more work to be generally useful.
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/ftputils/ftpfile.rb

@@ -44,9 +44,14 @@ class FTPUtils
       if ftp_uri = FTPUtils::FTPURI.parse(path)
         connection = FTPUtils::FTPConnection.connect(path)
         connection.chdir ftp_uri.dirname
-        if connection.size(ftp_uri.filename) > 0
-          return true
-        else
+
+        begin
+          if connection.size(ftp_uri.filename) > 0
+            return true
+          else
+            return false
+          end
+        rescue
           return false
         end
       else

data/lib/ftputils.rb

@@ -9,6 +9,7 @@ require 'fileutils'
 require 'open-uri'
 
 class FTPUtils
+
   def self.cp(src, dest, options = {})
     # handle all combinations of copying to/from FTP and local files
     case [ftp_url?(src), ftp_url?(dest)]
@@ -40,7 +41,12 @@ class FTPUtils
 
       connection = FTPConnection.connect(dest)
       connection.chdir FTPFile.dirname(dest)
-      connection.putbinaryfile src, dest_path, 1024
+
+      begin
+        connection.putbinaryfile src, dest_path, 1024
+      rescue Net::FTPPermError
+        raise "Unable to copy #{src} to #{dest_path}, possibly due to FTP server permissions"
+      end
     when [false, false]
       FileUtils.cp src, dest, options
     end

data/spec/ftpfile_spec.rb

@@ -69,6 +69,17 @@ describe FTPUtils::FTPURI do
       FTPUtils::FTPFile.exists?("ftp://admin:test@myhost/path/to/file.txt").should be_false
     end
 
+    it "should be false when Net::FTPPermError is raised" do
+      mock_uri = mock(FTPUtils::FTPURI, :path => "/path/to/file.txt", :dirname => "/path/to", :filename => "file.txt")
+      FTPUtils::FTPURI.should_receive(:parse).with("ftp://admin:test@myhost/path/to/file.txt").and_return(mock_uri)
+      mock_connection = mock(FTPUtils::FTPConnection)
+      FTPUtils::FTPConnection.should_receive(:connect).with("ftp://admin:test@myhost/path/to/file.txt").and_return(mock_connection)
+      mock_connection.should_receive(:chdir).with("/path/to")
+      mock_connection.should_receive(:size).with("file.txt").and_raise(Net::FTPPermError)
+
+      FTPUtils::FTPFile.exists?("ftp://admin:test@myhost/path/to/file.txt").should be_false
+    end
+
     it "should pass the path to File.exists? if it's not an FTP URI" do
       FTPUtils::FTPURI.should_receive(:parse).with("/path/to/file.txt").and_return(nil)
       File.should_receive(:exists?)

data/spec/ftputils_spec.rb

@@ -163,6 +163,25 @@ describe "FTPUtils" do
         FTPUtils.cp "/home/me/file1.txt", "ftp://admin:test@host2"
       end
 
+      it "should provide an informative error message if the file can't be uploaded" do
+        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).
+          and_raise(Net::FTPPermError)
+
+        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
+
       it "should raise an error if the source file is a directory" do
         File.should_receive(:directory?).with("/home/me").and_return(true)
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bruz Marzolf
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency