kitchen-sync 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0376fdf7d97ee105cfbfb248cd7a42ffd0e6132c
-  data.tar.gz: 6fa0f7cb5fd4dd9eba236520f17de3591a507f48
+  metadata.gz: 7c22375c770510ba072de49ad78a4840c70bbcc8
+  data.tar.gz: e127ccc22c91a8265d35640121e1e74377ba176f
 SHA512:
-  metadata.gz: 2f587f0f0b9885937e4e5852e98bb308ae6105ea2a0c3b9d9ed76cbf24a37e181a1651c72055c39ff564f7aa6b00893bb36796eb5127a9d4e1fef747e20d0234
-  data.tar.gz: e82b6548d9f31de4acb86f4ee12ace4a9b1644078f116e12735291f1b6d99f0033dd8c0de70173b2eda1acd48db14330443a13064ed0b382296d8f4be21d5ef6
+  metadata.gz: 49e7cc419bddef287adbadd38d37c53c943592be3805e51255fe9fb29d3a5e5afe594327a9ad5617481626158f388a5a10900ff932234d7ecf3b001cfa0665f9
+  data.tar.gz: 311b93a549dd26bb3f2ec6008831dfd01cd61389f6bc25c4cb8a907d7500f35330feecb0ccc4c7e8316df9044fcb51c0aabdd20173a07ccdfd881a9a881787a3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Kitchen-Sync Changelog
 
+## v2.1.1
+
+Allow mixing kitchen-sync transports with other transports.
+
+## v2.1.0
+
+Compatibility with new Test Kitchen features.
+
 ## v2.0.0
 
 Fully revamped at last for Test Kitchen's new modular transports.

data/lib/kitchen-sync/core_ext.rb

@@ -19,9 +19,18 @@ module Kitchen
   # Monkey patch to prevent the deletion of everything
   module Provisioner
     class ChefBase < Base
-      def init_command
-        "mkdir -p #{config[:root_path]}"
+
+      old_init_command = instance_method(:init_command)
+
+      define_method(:init_command) do
+        if (defined?(Kitchen::Transport::Sftp) && instance.transport.is_a?(Kitchen::Transport::Sftp)) || \
+           (defined?(Kitchen::Transport::Rsync) && instance.transport.is_a?(Kitchen::Transport::Rsync))
+           "mkdir -p #{config[:root_path]}"
+        else
+          old_init_command.bind(self).()
+        end
       end
+
     end
   end
 end

data/lib/kitchen-sync/version.rb

@@ -16,5 +16,5 @@
 
 
 class KitchenSync
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/lib/kitchen/transport/rsync.rb

@@ -45,11 +45,12 @@ module Kitchen
           end
 
           locals = Array(locals)
-          # We only try to sync folders for now.
-          rsync_candidates = locals.select {|path| File.directory?(path) }
+          # We only try to sync folders for now and ignore the cache folder
+          # because we don't want to --delete that.
+          rsync_candidates = locals.select {|path| File.directory?(path) && File.basename(path) != 'cache' }
           ssh_command = "ssh #{ssh_args.join(' ')}"
           copy_identity
-          rsync_cmd = "/usr/bin/rsync -e '#{ssh_command}' -az#{logger.level == :debug ? 'vv' : ''} #{rsync_candidates.join(' ')} #{@session.options[:user]}@#{@session.host}:#{remote}"
+          rsync_cmd = "/usr/bin/rsync -e '#{ssh_command}' -az#{logger.level == :debug ? 'vv' : ''} --delete #{rsync_candidates.join(' ')} #{@session.options[:user]}@#{@session.host}:#{remote}"
           logger.debug("[rsync] Running rsync command: #{rsync_cmd}")
           ret = []
           time = Benchmark.realtime do

data/lib/kitchen/transport/sftp.rb

@@ -72,9 +72,13 @@ module Kitchen
         def upload(locals, remote)
           Array(locals).each do |local|
             full_remote = File.join(remote, File.basename(local))
+            options = {
+              recursive: File.directory?(local),
+              purge: File.basename(local) != 'cache',
+            }
             recursive = File.directory?(local)
             time = Benchmark.realtime do
-              sftp_upload!(local, full_remote, recursive)
+              sftp_upload!(local, full_remote, options)
             end
             logger.info("[SFTP] Time taken to upload #{local} to #{self}:#{full_remote}: %.2f sec" % time)
           end
@@ -82,7 +86,7 @@ module Kitchen
 
         private
 
-        def sftp_upload!(local, remote, recursive)
+        def sftp_upload!(local, remote, recursive: true, purge: true)
           # Fast path check, if the remote path doesn't exist at all we just run a direct transfer
           unless safe_stat(remote)
             logger.debug("[SFTP] Fast path upload from #{local} to #{remote}")
@@ -100,7 +104,7 @@ module Kitchen
           files_to_upload(checksums, local, recursive).each do |rel_path|
             upload_file(checksums, local, remote, rel_path)
           end
-          purge_files(checksums, remote)
+          purge_files(checksums, remote) if purge
           # Wait until all xfers are complete.
           sftp_loop(0)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-sync
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Improved file transfers for for test-kitchen