photocopier 0.0.3 → 0.0.4

data/README.md

@@ -104,6 +104,10 @@ have it via [`brew`](https://github.com/mxcl/homebrew):
 sudo brew install https://raw.github.com/gist/1513663/3e98bf9e03feb7e31eeddcd08f89ca86163a376d/sshpass.rb
 ```
 
+**Please note that on Ubuntu 11.10 `sshpass` is at version 1.04, which has a
+[bug](https://bugs.launchpad.net/ubuntu/+source/sshpass/+bug/774882) that prevents
+it from working. Install version 1.03 or 1.05.**
+
 ## Contributing
 
 1. Fork it

data/lib/photocopier/adapter.rb

@@ -23,13 +23,17 @@ module Photocopier
 
     def delete(remote_path); end
 
-    def get_directory(remote_path, local_path); end
-    def put_directory(local_path, remote_path); end
+    def get_directory(remote_path, local_path, exclude = []); end
+    def put_directory(local_path, remote_path, exclude = []); end
 
     protected
 
     def run(*args)
-      system Escape.shell_command(args)
+      command = Escape.shell_command(args)
+      if logger.present?
+        logger.info command
+      end
+      system command
     end
   end
 

data/lib/photocopier/ftp.rb

@@ -25,26 +25,26 @@ module Photocopier
       session.delete(remote_path)
     end
 
-    def get_directory(remote_path, local_path)
+    def get_directory(remote_path, local_path, exclude = [])
       FileUtils.mkdir_p(local_path)
-      lftp(local_path, remote_path, false)
+      lftp(local_path, remote_path, false, exclude)
     end
 
-    def put_directory(local_path, remote_path)
-      lftp(local_path, remote_path, true)
+    def put_directory(local_path, remote_path, exclude = [])
+      lftp(local_path, remote_path, true, exclude)
     end
 
     def session
-      opts = options
-      host = opts.delete(:host)
-      user = opts.delete(:user)
-      password = opts.delete(:password)
-      @session ||= Net::FTP.open(host, user, password)
+      if @session.nil?
+        @session = Net::FTP.open(options[:host], options[:user], options[:password])
+        @session.passive = options[:passive] if options.has_key?(:passive)
+      end
+      @session
     end
 
     private
 
-    def lftp(local, remote, reverse)
+    def lftp(local, remote, reverse, exclude)
       run "lftp",
           "-c",
           [
@@ -53,7 +53,7 @@ module Photocopier
             "mkdir -p #{remote}",
             "cd #{remote}",
             "lcd #{local}",
-            lftp_mirror_arguments(reverse)
+            lftp_mirror_arguments(reverse, exclude)
           ].join("; ")
     end
 
@@ -68,9 +68,12 @@ module Photocopier
       url
     end
 
-    def lftp_mirror_arguments(reverse)
+    def lftp_mirror_arguments(reverse, exclude = [])
       mirror = "mirror --delete --use-cache --verbose --allow-chown --allow-suid --no-umask --parallel=2"
       mirror << " --reverse" if reverse
+      exclude.each do |glob|
+        mirror << " --exclude-glob #{glob}"
+      end
       mirror
     end
 

data/lib/photocopier/ssh.rb

@@ -28,13 +28,13 @@ module Photocopier
       session.exec!("rm -rf #{remote_path}")
     end
 
-    def get_directory(remote_path, local_path)
+    def get_directory(remote_path, local_path, exclude = [])
       FileUtils.mkdir_p(local_path)
-      rsync ":#{remote_path}", local_path
+      rsync ":#{remote_path}", local_path, exclude
     end
 
-    def put_directory(local_path, remote_path)
-      rsync local_path, ":#{remote_path}"
+    def put_directory(local_path, remote_path, exclude = [])
+      rsync local_path, ":#{remote_path}", exclude
     end
 
     def session
@@ -52,9 +52,21 @@ module Photocopier
 
     private
 
-    def rsync(source, destination)
-      run "rsync", "--progress", "-e", rsh_arguments, "--archive", "--compress",
-          "--omit-dir-times", "--delete", "#{source}/", destination
+    def rsync(source, destination, exclude)
+      command = [
+        "rsync", "--progress", "-e", rsh_arguments, "--archive", "--compress",
+        "--omit-dir-times", "--delete"
+      ]
+
+      exclude.map do |glob|
+        command << "--exclude"
+        command << glob
+      end
+
+      command << "#{source}/"
+      command << destination
+
+      run *command
     end
 
     def rsh_arguments

data/lib/photocopier/version.rb

@@ -1,3 +1,3 @@
 module Photocopier
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport