photocopier 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a9c7c59b8c7e92b5d4d4990ceed2338e940e43
-  data.tar.gz: 131f054c780f62fbc7d10fb826f819c50c7163fa
+  metadata.gz: fa357cb2a64be14d6d7a5249d5af142357ec88e8
+  data.tar.gz: 8fe84e099a21f74776a74979205ca1ca06cb68f6
 SHA512:
-  metadata.gz: 69c79a14deee1c2b237609b2aaac47f1fdab1bfc18aa36c418a7ebfb6481eb8837255b69aada5e56bd87b4ab8b7a8735e7360e178be7549af0858812de617157
-  data.tar.gz: d90b64b2c6032ad21b627bb005ca721e05bdeccda5d18a7a691bfbc56f62326b85cae6e387b499abe19ca0adacd82738cb0e6d1d50a7ed45f32efab6e108d3fc
+  metadata.gz: 35b64e0dea575c624ed752ad6d118eada403565696dfb14f70538d6c8482c5e848e6285806f07f1214803db313a5a2f2ea9c250ecbda8174c4fb363163e90814
+  data.tar.gz: 8f5e6b6f69b551c328fd08adc54caac8a211446ab98662533aba513057463fd2145b484ec6e43d3e474e8ded6d5b420f481fbd3c33840c293fd7f5543546362c

data/.gitignore

@@ -12,6 +12,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/examples.txt
 test/tmp
 test/version_tmp
 tmp

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/photocopier/adapter.rb

@@ -1,5 +1,4 @@
 module Photocopier
-
   class Adapter
     attr_accessor :logger
 

data/lib/photocopier/ftp.rb

@@ -41,12 +41,15 @@ module Photocopier
     end
 
     def lftp(local, remote, reverse, exclude)
+      remote = Shellwords.escape(remote)
+      local = Shellwords.escape(local)
       command = [
           "set ftp:list-options -a",
+          "set cmd:fail-exit true",
           "open #{remote_ftp_url}",
-          "mkdir -p #{Shellwords.escape(remote)}",
-          "cd #{Shellwords.escape(remote)}",
-          "lcd #{Shellwords.escape(local)}",
+          "find -d 1 #{remote} || mkdir -p #{remote}",
+          "lcd #{local}",
+          "cd #{remote}",
           lftp_mirror_arguments(reverse, exclude)
       ].join("; ")
 
@@ -66,10 +69,10 @@ module Photocopier
     end
 
     def lftp_mirror_arguments(reverse, exclude = [])
-      mirror = "mirror --delete --use-cache --verbose --allow-chown --allow-suid --no-umask --parallel=2"
+      mirror = "mirror --delete --use-cache --verbose --allow-chown --allow-suid --no-umask --parallel=5"
       mirror << " --reverse" if reverse
       exclude.each do |glob|
-        mirror << " --exclude-glob #{glob}"
+        mirror << " --exclude-glob #{glob}" # NOTE do not use Shellwords.escape here
       end
       mirror
     end

data/lib/photocopier/ssh.rb

@@ -91,7 +91,7 @@ module Photocopier
 
       exclude.each do |glob|
         command << "--exclude"
-        command << glob
+        command << Shellwords.escape(glob)
       end
 
       command << Shellwords.escape(source)

data/lib/photocopier/version.rb

@@ -1,3 +1,3 @@
 module Photocopier
-  VERSION = "1.0.0.pre2"
+  VERSION = "1.0.0.pre3"
 end

data/lib/photocopier.rb

@@ -7,7 +7,8 @@ require 'net/ssh/gateway'
 require 'net/scp'
 require 'fileutils'
 require 'shellwords'
-require 'active_support/all'
+require "active_support"
+require "active_support/core_ext"
 
 require 'photocopier/adapter'
 require "photocopier/ssh"

data/photocopier.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", ">= 1.6.2"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "simplecov", "~> 0.9"
+  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "simplecov", "~> 0.10"
   spec.add_development_dependency "pry-byebug", "~> 3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - Stefano Verna
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,28 +102,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Photocopier provides FTP/SSH adapters to abstract away file and directory