kitchen-sync 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c2ae313576e55b5831f0c4ad6505cf81ff55fa
-  data.tar.gz: 58c3069dcd286b3e27eea9c3024dc667601b3cae
+  metadata.gz: ba5198731d1dd70eb8db2ceef6d7840c142d32e1
+  data.tar.gz: c97d2770874f52912239bc74bc2aca14d04af937
 SHA512:
-  metadata.gz: e749d9e72891b7896521d97217ad218debfb93519db0d60943c90ec1b138419cc5c761982980cf7b570787484d3c6ab49f20c9598be4d43dbbcada752ec7ff78
-  data.tar.gz: 85b280af4158662970bf16a4fc9752b2853d8695270fdfebae55b0898bc6dc8b0953052e6c532bc30dab33c503d0c02f74ede3270eacbe26396fb20dd2f8dd42
+  metadata.gz: 3cb717358878edbf818963330b8a920ca3f98fcaed7575c0d2c185cb174433c6502554c9d353f04f6b6f2d5d5ed61a29a90fb6603fc62a655b0c9360c099546d
+  data.tar.gz: 5c8c7c0d131d8906d4269a149c38a7081fea54b586b6d8b6ff49ade103155b44c26b6053dcb990d14a6728cc577685081458555dd183b7a3c98279c88c12dbf7

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
+pkg/
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Kitchen-Sync Changelog
 
+## v2.2.0
+
+Add configurable `ruby_path` for `sftp` transport.
+
 ## v2.1.2
 
 Catch errors from closed sockets during instance shutdown. Fixes compat with

data/README.md

@@ -25,6 +25,15 @@ 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.
 
+By default this will use the Chef omnibus Ruby, you can customize the path to
+Ruby via `ruby_path`:
+
+```
+transport:
+  name: sftp
+  ruby_path: /usr/bin/ruby
+```
+
 ### `rsync`
 
 The Rsync mode is based on the work done by [Mikhail Bautin](https://github.com/test-kitchen/test-kitchen/pull/359).

data/lib/kitchen-sync/version.rb

@@ -16,5 +16,5 @@
 
 
 class KitchenSync
-  VERSION = '2.1.2'
+  VERSION = '2.2.0'
 end

data/lib/kitchen/transport/sftp.rb

@@ -32,6 +32,8 @@ module Kitchen
       CHECKSUMS_REMOTE_PATH = "/tmp/checksums-#{CHECKSUMS_HASH}.rb" # This won't work on Windows targets
       MAX_TRANSFERS = 64
 
+      default_config :ruby_path, '/opt/chef/embedded/bin/ruby'
+
       # Copy-pasta from Ssh#create_new_connection because I need the SFTP
       # connection class.
       # Tracked in https://github.com/test-kitchen/test-kitchen/pull/726
@@ -42,10 +44,15 @@ module Kitchen
         end
 
         @connection_options = options
-        @connection = self.class::Connection.new(options, &block)
+        @connection = self.class::Connection.new(config, options, &block)
       end
 
       class Connection < Ssh::Connection
+        def initialize(config, options, &block)
+          @config = config
+          super(options, &block)
+        end
+
         # Wrap Ssh::Connection#close to also shut down the SFTP connection.
         def close
           if @sftp_session
@@ -100,7 +107,7 @@ module Kitchen
           # Get checksums for existing files on the remote side.
           logger.debug("[SFTP] Slow path upload from #{local} to #{remote}")
           copy_checksums_script!
-          checksum_cmd = "/opt/chef/embedded/bin/ruby #{CHECKSUMS_REMOTE_PATH} #{remote}"
+          checksum_cmd = "#{@config[:ruby_path]} #{CHECKSUMS_REMOTE_PATH} #{remote}"
           logger.debug("[SFTP] Running #{checksum_cmd}")
           checksums = JSON.parse(session.exec!(checksum_cmd))
           # Sync files that have changed.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-sync
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-05-10 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.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Improved file transfers for for test-kitchen