syncftp 0.0.2 → 0.0.3

data/README.rdoc

@@ -4,13 +4,25 @@ Sync via FTP, only modified files
 
 == ChangeLog
 
+=== 0.0.3 : 
+
+* Major bug correction in Net::FTP#remote_dir_exist?
+* Remove deleted files and directories
+* Additional option (passive => boolean) to determine the kind of FTP connection (passive/active)
+
+=== 0.0.2 : 
+
+* Major bug correction in Net::FTP#remote_dir_exist? 
+* If file type is unknow, we assume the file is binary...
+
 === 0.0.1 :
+
 * First Release
 
 == TODO
 
 * Allow to choose if we want to save the catalog locally or remotely
-* Remove deleted files
+* Allow to synchronize from local to server, from server to local or both
 
 == Example
 
@@ -33,6 +45,11 @@ Sync via FTP, only modified files
 
 This lib was truly inspired by the awsome glynn (http://github.com/dmathieu/glynn)
 
+== Authors
+
+* Grégoire Lejeune <https://github.com/glejeune>
+* danc <https://github.com/danc>
+
 == Copyright
 
 Copyright (c) 2010 Gregoire Lejeune. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/syncftp.rb

@@ -52,7 +52,11 @@ module Net
       
       return true if dir == "."
       
-      nlst( path ).include?( find ) or nlst( path ).include?( dir ) or nlst( path ).include?( altdir )
+      begin
+        nlst( path ).include?( find ) or nlst( path ).include?( dir ) or nlst( path ).include?( altdir )
+      rescue Net::FTPTempError
+        return false
+      end
     end
     
     #
@@ -134,11 +138,12 @@ class SyncFTP
   # * +:remote+ : the remote directory (default = ".")
   #
   def sync( options = {} )
-    options = { :local => ".", :remote => "." }.merge( options )
-    local, remote = options[:local], options[:remote]
+    options = { :local => ".", :remote => "." , :passive => false}.merge( options )
+    local, remote , passive = options[:local], options[:remote], options[:passive]
     
     tmpname = tmpfilename
     connect do |ftp|
+      ftp.passive = passive
       # Read remote .syncftp
       begin
         ftp.gettextfile( remote+"/"+".syncftp", tmpname )
@@ -154,6 +159,26 @@ class SyncFTP
       File.open( tmpname, 'w' ) do |out|
         YAML.dump( @local_md5s, out )
       end
+      
+      # Delete files
+      @delete_dirs = []
+      @delete_files = []
+      @remote_md5s.keys.clone.delete_if{ |f| @local_md5s.keys.include?(f) }.each do |f|
+        if @remote_md5s[f] == "*"
+          @delete_dirs << f
+        else
+          @delete_files << f
+        end
+      end
+      @delete_files.each do |f|
+        @log.info "Delete ftp://#{@host}:#{@port}/#{f}"
+        ftp.delete( f )
+      end      
+      @delete_dirs.each do |f|
+        @log.info "Delete ftp://#{@host}:#{@port}/#{f}"
+        ftp.delete( f )
+      end      
+      
       ftp.puttextfile( tmpname, remote+"/"+".syncftp" )
     end
     File.delete( tmpname )
@@ -198,29 +223,34 @@ class SyncFTP
   end
   
   def send_dir(ftp, local, remote) #:nodoc:
-    ftp.mkdir_p(remote) unless ftp.remote_dir_exist?(remote)
+    unless ftp.remote_dir_exist?(remote)
+      @log.info "Create directory ftp://#{@host}:#{@port}/#{remote}"
+      ftp.mkdir_p(remote) 
+    end
     
     Dir.foreach(local) do |file|
       next if file == "." or file == ".."
       
       local_file = File.join( local, file )
       remote_file = remote + "/" + file
-      
+
       if File.stat(local_file).directory?
         # It is a directory, we recursively send it
+        @local_md5s[remote_file] = "*"
         send_dir(ftp, local_file, remote_file)
       else
         @local_md5s[remote_file] = Digest::MD5.hexdigest( File.open(local_file).read )
-
+        
+        # Local file still exist... Copy...
         if( @local_md5s[remote_file] != @remote_md5s[remote_file] )
           # It's a file, we just send it
           if File.binary?(local_file)
             @log.info "Copy [Binary] #{local_file} to ftp://#{@host}:#{@port}/#{remote_file}"
-            
+          
             ftp.putbinaryfile(local_file, remote_file)
           else
             @log.info "Copy [Text] #{local_file} to ftp://#{@host}:#{@port}/#{remote_file}"
-            
+          
             ftp.puttextfile(local_file, remote_file)
           end
         else

data/syncftp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{syncftp}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregoire Lejeune"]
-  s.date = %q{2010-04-15}
+  s.date = %q{2010-11-05}
   s.description = %q{Sync via FTP, only modified files}
   s.email = %q{gregoire.lejeune@free.fr}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/glejeune/syncftp}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sync via FTP, only modified files}
   s.test_files = [
     "test/helper.rb",
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<fakefs>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: syncftp
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: fakefs
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -73,6 +80,7 @@ files:
 - syncftp.gemspec
 - test/helper.rb
 - test/test_syncftp.rb
+- examples/sample01.rb
 has_rdoc: true
 homepage: http://github.com/glejeune/syncftp
 licenses: []
@@ -83,23 +91,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sync via FTP, only modified files