kitchen-sync 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2b1b3b4c221ab2f468651f000053dd60b61610
-  data.tar.gz: 9bfcb40e1719e254e2c34219bda3c8f98cc26b23
+  metadata.gz: de3176802b5d0d2d9e1f1596f6dea7c3b779a5e8
+  data.tar.gz: fb8c7e2f628f05a4b02f4412b3a17fc815d6f88c
 SHA512:
-  metadata.gz: 640a071aa0972fb700e665f2c53d5ab88aeeac87b91d3da416a6bf5ec62ab52bd202248fb0636f6eea3331c3a6652ee7f91368c078f19ed8a4671793f0350625
-  data.tar.gz: 54bf3f84fc40c258d9023b5494f73eeb60f017f041ec54f0b828bf03ea4b409469797669e8234362370c814443202dd228c76d175792bb5e3f663d394c5e9fd2
+  metadata.gz: 4227cbf1e1a90875146c48ad09a508a550ef19adba081cde50b14449ff9a55b0b22791da4a4c85a5fc94c3f52a6def3874a2d2dc31093a5f75bcaf64774ca032
+  data.tar.gz: e75859c18388457ae8df42177cfa22a8fdfe6982dcedcca4afaf933133173cbf8a30fd6d87d7e3ca0f6b3330f2d77bc8946a22daa4a9fd7e25e6ea108edabb20

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Kitchen-Sync Changelog
+
+## v2.0.0
+
+Fully revamped at last for Test Kitchen's new modular transports.
+
+## v1.1.1
+
+Bugfix for the new SFTP transport.
+
+## v1.1.0
+
+First stab at a Test Kitchen 1.4 transport plugin.
+
+## v1.0.1
+
+Bugfix for the SFTP transport provider.
+
+## v1.0.0
+
+Initial release!

data/README.md

@@ -9,43 +9,49 @@ most of which are faster than the default, thus speeding up your test runs.
 Quick Start
 -----------
 
-Add `gem 'kitchen-sync'` to your Gemfile and then at the top of your
-`.kitchen.yml`:
+Run `chef gem install kitchen-sync` and then set your transport to `sftp`:
 
 ```
-#<% require 'kitchen-sync' %>
+transport:
+  name: sftp
 ```
 
 Available Transfer Methods
 --------------------------
 
-You can select the transfer mode using the `KITCHEN_SYNC_MODE` environment
-variable. If not present, it defaults to `sftp`.
-
-### SFTP
+### `sftp`
 
 The default mode uses SFTP for file transfers, as well as a helper script to
 avoid recopying files that are already present on the test host. If SFTP is
 disabled, this will automatically fall back to the SCP mode.
 
-### SCP
-
-The SCP mode is just a copy of the implementation from test-kitchen. It is
-present as a fallback and for benchmark comparisons, and generally won't be
-used directly.
+### `rsync`
 
-### Rsync
-
-The rsync mode is based on the work done by [Mikhail Bautin](https://github.com/test-kitchen/test-kitchen/pull/359).
+The Rsync mode is based on the work done by [Mikhail Bautin](https://github.com/test-kitchen/test-kitchen/pull/359).
 This is the fastest mode, but it does have a few downsides. The biggest is that
 you must be using `ssh-agent` and have an identity loaded for it to use. It also
 requires that rsync be available on the remote side. Consider this implementation
-more experimental than the others at this time.
+more experimental than `sftp` at this time.
+
+Windows Guests
+--------------
+
+Windows is not specifically supported at this time, though if you have an SSH
+server it will probably work. There is no support for WinRM.
+
+Upgrading from 1.x
+------------------
+
+As of version 2.0, kitchen-sync uses Test Kitchen's modular transport system
+rather than monkey patch overrides. To upgrade, remove the `<% require 'kitchen-sync' %>`
+from your `.kitchen.yml` and add the transport configuration mentioned above.
+The `$KITCHEN_SYNC_MODE` environment variable is no longer needed as configuration
+can happen in the normal Yaml file.
 
 License
 -------
 
-Copyright 2014, Noah Kantrowitz
+Copyright 2014-2016, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/kitchen-sync.rb

@@ -1,7 +1,5 @@
 #
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,65 +14,7 @@
 # limitations under the License.
 #
 
-require 'benchmark'
-require 'digest/sha1'
-require 'json'
-
-require 'kitchen/ssh'
-require 'kitchen/provisioner/chef_base'
-require 'net/sftp'
-
-require 'kitchen-sync/core_ext'
-require 'kitchen-sync/rsync'
-require 'kitchen-sync/scp'
-require 'kitchen-sync/sftp'
-require 'kitchen-sync/version'
-
 
 class KitchenSync
-  IMPLEMENTATIONS = {
-    'rsync' => Rsync,
-    'scp' => SCP,
-    'sftp' => SFTP,
-  }
-
-  def initialize(logger, session, options)
-    @logger = logger
-    @session = session
-    @options = options
-    @impl = load_implementation
-  end
-
-  def load_implementation(default_mode='sftp')
-    mode = (ENV['KITCHEN_SYNC_MODE'] || default_mode).downcase
-    @logger.debug("[sync] Using transfer mode #{mode}")
-    impl_class = IMPLEMENTATIONS[mode]
-    raise "Sync implementation for #{mode} not found" unless impl_class
-    # Create the instance, any error during init means we use SCP instead
-    begin
-      impl_class.new(@logger, @session, @options)
-    rescue Exception
-      if impl_class != SCP
-        @logger.debug("[sync] Falling back to SCP")
-        impl_class = SCP
-        retry
-      else
-        raise
-      end
-    end
-  end
-
-  def upload(local, remote, options)
-    # This is set even for single files, so make it something that matters again
-    options[:recursive] = File.directory?(local)
-    time = Benchmark.realtime do
-      @impl.upload(local, remote, options[:recursive])
-    end
-    @logger.info("[sync] Time taken to upload #{local} to #{@session}:#{remote}: " +
-             "%.2f sec" % time)
-  end
-
-  def shutdown
-    @impl.shutdown
-  end
+  autoload :VERSION, 'kitchen-sync/version'
 end

data/lib/kitchen-sync/core_ext.rb

@@ -1,7 +1,5 @@
 #
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,55 +16,6 @@
 
 # ┻━┻ ︵ヽ(`Д´)ﾉ︵ ┻━┻
 module Kitchen
-  class SSH
-
-    #old_upload = instance_method(:upload!)
-    define_method(:upload!) do |local, remote, options = {}, &progress|
-      @kitchen_sync ||= KitchenSync.new(logger, session, @options)
-      @kitchen_sync.upload(local, remote, options)
-    end
-
-    # Monkey patch the shutdown to tear down the SFTP connection too.
-    old_shutdown = instance_method(:shutdown)
-    define_method(:shutdown) do
-      begin
-        @kitchen_sync.shutdown if @kitchen_sync
-      ensure
-        old_shutdown.bind(self).call
-      end
-    end
-
-    private
-
-    # Bug fix for session.loop never terminating if there is an SFTP conn active
-    # since as far as it is concerned there is still active stuff.
-    # This function is Copyright Fletcher Nichol
-    def exec_with_exit(cmd)
-      exit_code = nil
-      session.open_channel do |channel|
-
-        channel.request_pty
-
-        channel.exec(cmd) do |ch, success|
-
-          channel.on_data do |ch, data|
-            logger << data
-          end
-
-          channel.on_extended_data do |ch, type, data|
-            logger << data
-          end
-
-          channel.on_request("exit-status") do |ch, data|
-            exit_code = data.read_long
-          end
-        end
-      end
-      session.loop { !exit_code } # THERE IS A CHANGE ON THIS LINE, PAY ATTENTION!!!!!!
-      exit_code
-    end
-  end
-
   # Monkey patch to prevent the deletion of everything
   module Provisioner
     class ChefBase < Base

data/lib/kitchen-sync/version.rb

@@ -1,7 +1,5 @@
 #
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,5 +16,5 @@
 
 
 class KitchenSync
-  VERSION = '1.1.1'
+  VERSION = '2.0.0'
 end

data/lib/kitchen/transport/rsync.rb

@@ -0,0 +1,106 @@
+#
+# Copyright 2014-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'base64'
+
+require 'kitchen/transport/ssh'
+require 'net/ssh'
+
+require 'kitchen-sync/core_ext'
+
+module Kitchen
+  module Transport
+    class Rsync < Ssh
+      # Copy-pasta from Ssh#create_new_connection because I need the Rsync
+      # connection class.
+      # Tracked in https://github.com/test-kitchen/test-kitchen/pull/726
+      def create_new_connection(options, &block)
+        if @connection
+          logger.debug("[SSH] shutting previous connection #{@connection}")
+          @connection.close
+        end
+
+        @connection_options = options
+        @connection = self.class::Connection.new(options, &block)
+      end
+
+      class Connection < Ssh::Connection
+        def upload(locals, remote)
+          if @rsync_failed || !File.exists?('/usr/bin/rsync')
+            logger.debug('[rsync] Rsync already failed or not installed, not trying it')
+            return super
+          end
+
+          locals = Array(locals)
+          # We only try to sync folders for now.
+          rsync_candidates = locals.select {|path| File.directory?(path) }
+          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}"
+          logger.debug("[rsync] Running rsync command: #{rsync_cmd}")
+          ret = []
+          time = Benchmark.realtime do
+            ret << system(rsync_cmd)
+          end
+          logger.info("[rsync] Time taken to upload #{rsync_candidates.join(';')} to #{self}:#{remote}: %.2f sec" % time)
+          unless ret.first
+            logger.warn("[rsync] rsync exited with status #{$?.exitstatus}, using SCP instead")
+            @rsync_failed = true
+          end
+
+          # Fall back to SCP
+          remaining = if @rsync_failed
+            locals
+          else
+            locals - rsync_candidates
+          end
+          logger.debug("[rsync] Using fallback to upload #{remaining.join(';')}")
+          super(remaining, remote) unless remaining.empty?
+        end
+
+        # Copy your SSH identity, creating a new one if needed
+        def copy_identity
+          return if @copied_identity
+          identities = Net::SSH::Authentication::Agent.connect.identities
+          raise 'No SSH identities found. Please run ssh-add.' if identities.empty?
+          key = identities.first
+          enc_key = Base64.encode64(key.to_blob).gsub("\n", '')
+          identitiy = "ssh-rsa #{enc_key} #{key.comment}"
+          @session.exec! <<-EOT
+            test -e ~/.ssh || mkdir ~/.ssh
+            test -e ~/.ssh/authorized_keys || touch ~/.ssh/authorized_keys
+            if ! grep -q "#{identitiy}" ~/.ssh/authorized_keys ; then
+              chmod go-w ~ ~/.ssh ~/.ssh/authorized_keys ; \
+              echo "#{identitiy}" >> ~/.ssh/authorized_keys
+            fi
+          EOT
+          @copied_identity = true
+        end
+
+        def ssh_args
+          args = %W{ -o UserKnownHostsFile=/dev/null }
+          args += %W{ -o StrictHostKeyChecking=no }
+          args += %W{ -o IdentitiesOnly=yes } if @options[:keys]
+          args += %W{ -o LogLevel=#{@logger.debug? ? "VERBOSE" : "ERROR"} }
+          args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} } if @options.key? :forward_agent
+          Array(@options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key}} }
+          args += %W{ -p #{@session.options[:port]}}
+        end
+      end
+
+    end
+  end
+end

data/lib/kitchen/transport/sftp.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2015, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,9 +14,15 @@
 # limitations under the License.
 #
 
+require 'benchmark'
+require 'digest/sha1'
+require 'json'
+
 require 'kitchen/transport/ssh'
 require 'net/sftp'
 
+require 'kitchen-sync/core_ext'
+
 
 module Kitchen
   module Transport
@@ -184,9 +190,6 @@ module Kitchen
 
         def purge_files(checksums, remote)
           checksums.each do |key, value|
-            # Special case for /tmp/kitchen/cache upload not clearing cookbooks.
-            # Tracked in https://github.com/test-kitchen/test-kitchen/issues/725
-            next if remote == '/tmp/kitchen/cache' && key.start_with?('/cookbooks')
             # Check if the file was uploaded in #upload_file.
             if value != true
               logger.debug("[SFTP] Removing #{remote}#{key}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-sync
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -74,19 +74,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - kitchen-sync.gemspec
 - lib/kitchen-sync.rb
-- lib/kitchen-sync/base.rb
 - lib/kitchen-sync/checksums.rb
 - lib/kitchen-sync/core_ext.rb
-- lib/kitchen-sync/rsync.rb
-- lib/kitchen-sync/scp.rb
-- lib/kitchen-sync/sftp.rb
 - lib/kitchen-sync/version.rb
+- lib/kitchen/transport/rsync.rb
 - lib/kitchen/transport/sftp.rb
 homepage: https://github.com/coderanger/kitchen-sync
 licenses:
@@ -108,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Improved file transfers for for test-kitchen

data/lib/kitchen-sync/base.rb

@@ -1,35 +0,0 @@
-#
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2014, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class KitchenSync
-  class Base
-    def initialize(logger, session, options)
-      @logger = logger
-      @session = session
-      @options = options
-    end
-
-    def upload(local, remote, recursive=true)
-      raise NotImplementedError
-    end
-
-    def shutdown
-      # This space left intentionally blank
-    end
-  end
-end

data/lib/kitchen-sync/rsync.rb

@@ -1,70 +0,0 @@
-#
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2013-2014, Fletcher Nichol
-# Copyright 2014, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'kitchen-sync/scp'
-
-class KitchenSync
-  class Rsync < SCP
-    def upload(local, remote, recursive=true)
-      upload_done = false
-      if !@rsync_failed && recursive && File.exists?('/usr/bin/rsync')
-        ssh_command = "ssh #{ssh_args.join(' ')}"
-        copy_identity
-        rsync_cmd = "/usr/bin/rsync -e '#{ssh_command}' -az #{local} #{@session.options[:user]}@#{@session.host}:#{remote}"
-        @logger.info("[sync:rsync] Running rsync command: #{rsync_cmd}")
-        if system(rsync_cmd)
-          upload_done = true
-        else
-          @logger.warn("[sync:rsync] rsync exited with status #{$?.exitstatus}, using Net::SCP instead")
-          @rsync_failed = true
-        end
-      end
-
-      # Fall back to SCP
-      super unless upload_done
-    end
-
-    # Copy your SSH identity, creating a new one if needed
-    def copy_identity
-      return if @copied_identity
-      key = Net::SSH::Authentication::Agent.connect.identities.first
-      enc_key = Base64.encode64(key.to_blob).gsub("\n", '')
-      identitiy = "ssh-rsa #{enc_key} #{key.comment}"
-      @session.exec! <<-EOT
-        test -e ~/.ssh || mkdir ~/.ssh
-        test -e ~/.ssh/authorized_keys || touch ~/.ssh/authorized_keys
-        if ! grep -q "#{identitiy}" ~/.ssh/authorized_keys ; then
-          chmod go-w ~ ~/.ssh ~/.ssh/authorized_keys ; \
-          echo "#{identitiy}" >> ~/.ssh/authorized_keys
-        fi
-      EOT
-      @copied_identity = true
-    end
-
-    def ssh_args
-      args = %W{ -o UserKnownHostsFile=/dev/null }
-      args += %W{ -o StrictHostKeyChecking=no }
-      args += %W{ -o IdentitiesOnly=yes } if @options[:keys]
-      args += %W{ -o LogLevel=#{@logger.debug? ? "VERBOSE" : "ERROR"} }
-      args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} } if @options.key? :forward_agent
-      Array(@options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key}} }
-      args += %W{ -p #{@session.options[:port]}}
-    end
-  end
-end

data/lib/kitchen-sync/scp.rb

@@ -1,36 +0,0 @@
-#
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2013-2014, Fletcher Nichol
-# Copyright 2014, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'kitchen-sync/base'
-
-require 'net/scp'
-
-class KitchenSync
-  class SCP < Base
-    def upload(local, remote, recursive=true)
-      true_remote = File.join(remote, File.basename(local))
-      @session.exec!("rm -rf #{true_remote}")
-      @session.scp.upload!(local, remote, recursive: recursive) do |ch, name, sent, total|
-        if sent == total
-          @logger.debug("Uploaded #{name} (#{total} bytes)")
-        end
-      end
-    end
-  end
-end

data/lib/kitchen-sync/sftp.rb

@@ -1,138 +0,0 @@
-#
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2014, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'kitchen-sync/base'
-
-require 'net/sftp'
-
-class KitchenSync
-  class SFTP < Base
-    CHECKSUMS_PATH = File.expand_path('../checksums.rb', __FILE__)
-    CHECKSUMS_HASH = Digest::SHA1.file(CHECKSUMS_PATH)
-    CHECKSUMS_REMOTE_PATH = "/tmp/checksums-#{CHECKSUMS_HASH}.rb" # This won't work on Windows targets
-    MAX_TRANSFERS = 64
-
-    def initialize(*args)
-      super
-      @sftp = @session.sftp
-      @xfers = []
-    end
-
-    def upload(local, remote, recursive=true)
-      remote = File.join(remote, File.basename(local))
-      # Fast path check, if the remote path doesn't exist at all we just run a direct transfer
-      unless safe_stat(remote)
-        @logger.debug("[sync:sftp] Fast path upload from #{local} to #{remote}")
-        @sftp.mkdir!(remote) if recursive
-        @sftp.upload!(local, remote, requests: MAX_TRANSFERS)
-        return
-      end
-      copy_checksums_script
-      # Get our checksums
-      checksum_cmd = "/opt/chef/embedded/bin/ruby #{CHECKSUMS_REMOTE_PATH} #{remote}"
-      @logger.info("[sync:sftp] Running #{checksum_cmd}")
-      checksums = JSON.parse(@session.exec!(checksum_cmd))
-      files_to_upload(checksums, local, recursive).each do |rel_path|
-        upload_file(checksums, local, remote, rel_path)
-      end
-      purge_files(checksums, remote)
-      sftp_loop(0) # Wait until all xfers are complete
-    end
-
-    def shutdown
-      @logger.debug("[sync:sftp] closing connection to #{@session}")
-      @sftp.close_channel
-      @sftp = nil
-    end
-
-    private
-
-    # Return if the path exists (because net::sftp uses exceptions for that and
-    # it makes code gross) and also raise an exception if the path is a symlink.
-    def safe_stat(path)
-      stat = @sftp.lstat!(path)
-      raise "#{path} is a symlink, possible security threat, bailing out" if stat.symlink?
-      true
-    rescue Net::SFTP::StatusException
-      false
-    end
-
-    def copy_checksums_script
-      return if @checksums_copied
-      # Only try to transfer the script if it isn't present. a stat takes about
-      # 1/3rd the time of the transfer, so worst case here is still okay.
-      @sftp.upload!(CHECKSUMS_PATH, CHECKSUMS_REMOTE_PATH) unless safe_stat(CHECKSUMS_REMOTE_PATH)
-      @checksums_copied = true
-    end
-
-    def files_to_upload(checksums, local, recursive)
-      glob_path = if recursive
-        File.join(local, '**', '*')
-      else
-        local
-      end
-      pending = []
-      Dir.glob(glob_path, File::FNM_PATHNAME | File::FNM_DOTMATCH).each do |path|
-        next unless File.file?(path)
-        rel_path = path[local.length..-1]
-        remote_hash = checksums.delete(rel_path)
-        pending << rel_path unless remote_hash && remote_hash == Digest::SHA1.file(path).hexdigest
-      end
-      pending
-    end
-
-    def upload_file(checksums, local, remote, rel_path)
-      parts = rel_path.split('/')
-      parts.pop # Drop the filename since we are only checking dirs
-      parts_to_check = []
-      until parts.empty?
-        parts_to_check << parts.shift
-        path_to_check = parts_to_check.join('/')
-        unless checksums[path_to_check]
-          @logger.debug("[sync:sftp] Creating directory #{remote}#{path_to_check}")
-          add_xfer(@sftp.mkdir("#{remote}#{path_to_check}"))
-          checksums[path_to_check] = true
-        end
-      end
-      @logger.debug("[sync:sftp] Uploading #{local}#{rel_path} to #{remote}#{rel_path}")
-      add_xfer(@sftp.upload("#{local}#{rel_path}", "#{remote}#{rel_path}"))
-    end
-
-    def purge_files(checksums, remote)
-      checksums.each do |key, value|
-        if value != true
-          @logger.debug("[sync:sftp] Removing #{remote}#{key}")
-          add_xfer(@sftp.remove("#{remote}#{key}"))
-        end
-      end
-    end
-
-    def add_xfer(xfer)
-      @xfers << xfer
-      sftp_loop
-    end
-
-    def sftp_loop(n_xfers=MAX_TRANSFERS)
-      @sftp.loop do
-        @xfers.delete_if {|x| !(x.is_a?(Net::SFTP::Request) ? x.pending? : x.active?) } # Purge any completed operations, which has two different APIs for some reason
-        @xfers.length > n_xfers # Run until we have fewer than max
-      end
-    end
-
-  end
-end