tenderloin 0.4.1 → 0.4.2

data/lib/tenderloin/actions/vm/provision.rb

@@ -9,8 +9,8 @@ module Tenderloin
         end
 
         def run_rsync
-          logger.info "Running rsync..."
           Tenderloin.config.provisioning.rsync.each do |rsync|
+            logger.info "Running rsync for #{rsync.join(' -> ')}..."
             src, dst = *rsync
             SSH.execute(@runner.fusion_vm.ip) do |ssh|
               ssh.exec!("mkdir -p #{dst}")

data/lib/tenderloin/actions/vm/shared_folders.rb

@@ -31,13 +31,16 @@ module Tenderloin
             logger.info "Creating shared folders metadata..."
 
             shared_folders.each do |name, hostpath, guestpath|
-              begin
-                status = Timeout::timeout(10) {
-                  @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
-                  @runner.fusion_vm.enable_shared_folders
-                }
-              rescue Timeout::Error
-                logger.warn "Sharing folder #{name} timed out"
+              for i in 0..3
+                begin
+                  status = Timeout::timeout(10) {
+                    @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
+                    @runner.fusion_vm.enable_shared_folders
+                    break
+                  }
+                rescue Timeout::Error
+                  logger.warn "Sharing folder #{name} timed out"
+                end
               end
             end
 

data/lib/tenderloin/ssh.rb

@@ -7,7 +7,7 @@ module Tenderloin
         if options.key
           Kernel.exec "#{cmd_ssh_opts} #{options.username}@#{ip}"
         else
-          Kernel.exec cmd_ssh_opts.strip
+          Kernel.exec cmd_ssh_opts(ip).strip
         end
       end
 
@@ -49,11 +49,11 @@ module Tenderloin
         Tenderloin.config.ssh
       end
 
-      def cmd_ssh_opts
+      def cmd_ssh_opts(ip=nil)
         if options.key
           "ssh -i #{options.key} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{options.port}"
         else
-          "#{SCRIPT} #{options.username} #{options.password} #{options.host} #{options.port}".strip
+          "#{SCRIPT} #{options.username} #{options.password} #{options.host || ip} #{options.port}".strip
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenderloin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors: