ftp_sync 0.4.1 → 0.4.2

data/README.rdoc

@@ -21,4 +21,6 @@ make some changes on server
  ftp.pull_dir '/tmp/syncdir', 'path/on/server', :since => true, :delete => true
 
  :since => true - means only files which are newer than the local copy will be downloaded
+ :since => Time.now - means only files which are newer than the supplied date will be downloaded
  :delete => true - means if the file is removed from the server, then the local copy is removed
+ :skip_errors => true - means if file cant be read (ie permissions) it will be skipped

data/lib/ftp_sync.rb

@@ -66,8 +66,13 @@ class FtpSync
     tocopy.each do |paths|
       localfile, remotefile = paths
       unless should_ignore?(localfile)
-        @connection.get(remotefile, localfile)
-        log "Pulled file #{remotefile}"
+        begin
+          @connection.get(remotefile, localfile)
+          log "Pulled file #{remotefile}"
+        rescue Net::FTPPermError
+          log "ERROR READING #{remotefile}"
+          raise Net::FTPPermError unless options[:skip_errors]
+        end        
       end
     end
     

data/test/ftp_sync_test.rb

@@ -125,6 +125,26 @@ class FtpSyncTest < Test::Unit::TestCase
     FileUtils.rm_r File.join(Net::FTP.ftp_src, 'README')
     @ftp.pull_dir(@local, '/')
     assert File.exist?(File.join(@local, 'README'))
+  end  
+  
+  def test_pulling_with_permissions_error_fails
+    FileUtils.chmod 0200, File.join(Net::FTP.ftp_src, 'fileA')
+    assert_raises Net::FTPPermError do
+      @ftp.pull_dir(@local, '/')
+    end
+    assert File.exist?(File.join(@local, 'README'))
+    assert !File.exist?(File.join(@local, 'fileA'))
+    assert !File.exist?(File.join(@local, 'fileB'))
+  end
+  
+  def test_pulling_with_permissions_error_continues
+    FileUtils.chmod 0200, File.join(Net::FTP.ftp_src, 'fileA')
+    assert_nothing_raised do
+      @ftp.pull_dir(@local, '/', :skip_errors => true)
+    end
+    assert File.exist?(File.join(@local, 'README'))
+    assert !File.exist?(File.join(@local, 'fileA'))
+    assert File.exist?(File.join(@local, 'fileB'))
   end
   
   def test_quick_pull_of_file_older_than_change_date

data/test/net/ftp.rb

@@ -61,7 +61,10 @@ module Net
     
     def get(src, dst)
       raise Net::FTPPermError unless File.exist?(src_path(src))
+      File.read(src_path(src))
       FileUtils.cp src_path(src), dst
+    rescue Errno::EACCES
+      raise Net::FTPPermError
     end
     
     def put(src, dst)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ftp_sync
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - jebw
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2010-11-30 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency