vagrant-zscp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56109898d2ab23df142c3b7417abcd03f064e245
-  data.tar.gz: b8adaf8d1ec62008c9244b1a1b197a5da6b487d2
+  metadata.gz: ee8d2e66e30169da939693caa5428aaeafa891ad
+  data.tar.gz: e4052fffc46eb13cdc53103a7cee168bcc473100
 SHA512:
-  metadata.gz: fca2133e2204b6645affb0705984ee073ceb399ef02dca03ac01785a4445c6a5223cf291a2ae5025c4d47055108b556f6082696ad43ae6b619c071d5e0c4a223
-  data.tar.gz: 8105d267f95063a01bc72a0a749ee87320d3eb6ee56d7028afcd0124d5aaf9f9b797772f6e905774f07f96148fe2b2cfa8f946ffa93f24ed135ecdda5959ad1d
+  metadata.gz: d774f621e4f1510ac6aa47b21a21f645725a2a280b2ef8be830886deb657c115d822c0899cfe9e24bf78d0c50634d5e53f68d175004ba450de52e54c684da380
+  data.tar.gz: 999f6640564ffaf8e5898a8fa1bbd00098a32b6f722567344a510b1e666eed0aceec140663dc40730e1c468be2e18897ce650a401a765854d3c6549eb80a0182

data/lib/vagrant/zscp/command/zscp.rb

@@ -43,22 +43,32 @@ module Vagrant
             # Get the SSH info for this machine so we can access it
             ssh_info = machine.ssh_info
 
-            # Sync them!
-            sync_threads = []
-            folders.each do |id, folder_opts|
-              sync_threads << Thread.new(id, folder_opts) do |id, folder_opts|
-                ZscpHelper.scp(machine, ssh_info, folder_opts)
-              end
+            # Clean up every synced folder first
+            foreach_folder(folders) do |folder_opts|
+              ZscpHelper.cleanup(machine, ssh_info, folder_opts)
             end
 
-            sync_threads.each do |t|
-              t.join
+            # Clean up every synced folder first
+            foreach_folder(folders) do |folder_opts|
+              ZscpHelper.scp(machine, ssh_info, folder_opts)
             end
           end
 
           return error ? 1 : 0
         end
+
+        def foreach_folder(folders, &block)
+          sync_threads = []
+          folders.each do |id, folder_opts|
+            sync_threads << Thread.new(folder_opts) do |folder_opts|
+              block.call(folder_opts)
+            end
+          end
+          sync_threads.each do |t|
+            t.join
+          end
+        end
       end
     end
   end
-end
+end

data/lib/vagrant/zscp/helper.rb

@@ -3,11 +3,18 @@ module Vagrant
     # This is a helper that abstracts out the functionality of scping
     # folders so that it can be called from anywhere.
     class ZscpHelper
+      def self.cleanup(machine, ssh_info, opts)
+        guestpath = opts[:guestpath]
+        machine.ui.info("Removing remote #{guestpath}")
+        remotely_execute(ssh_info, "sudo rm -rf #{guestpath};")
+      end
+
       def self.scp(machine, ssh_info, opts)
         guestpath = opts[:guestpath]
-        hostpath  = opts[:hostpath]
-        hostpath  = File.expand_path(hostpath, machine.env.root_path)
+        hostpath  = File.expand_path(opts[:hostpath], machine.env.root_path)
         hostpath  = Vagrant::Util::Platform.fs_real_path(hostpath).to_s
+        hostpath += "/" if !hostpath.end_with?("/")
+
         if (opts[:zscp_include])
           included_files = opts[:zscp_include].join(' ')
         else
@@ -17,33 +24,27 @@ module Vagrant
         username = ssh_info[:username]
         host     = ssh_info[:host]
 
-        if !hostpath.end_with?("/")
-          hostpath += "/"
-        end
-
         machine.ui.info("Sending #{hostpath} to #{guestpath}")
-          machine.ui.info("Removing remote #{guestpath}")
-          remotely_execute(ssh_info, "sudo rm -rf #{guestpath}; sudo mkdir -p #{guestpath}; sudo chown #{username}:$(id -gn) #{guestpath}")
+        remotely_execute(ssh_info, "sudo mkdir -p #{guestpath}; sudo chown #{username}:$(id -gn #{username}) #{guestpath}")
 
-          temp_file = `mktemp -t 'temp.XXXX.tar.gz'`.strip
+        temp_file = `mktemp -t 'temp.XXXX.tar.gz'`.strip
+        machine.ui.info("Compressing #{hostpath} into #{temp_file}")
+        system("tar -czhf #{temp_file} -C #{hostpath} #{included_files}")
 
-          machine.ui.info("Compressing #{hostpath} into #{temp_file}")
-          system("tar -czhf #{temp_file} -C #{hostpath} #{included_files}")
-
-          machine.ui.info("Copying #{temp_file} to #{guestpath}")
-          command = [
-            "scp",
-            '-o StrictHostKeyChecking=no',
-            '-o UserKnownHostsFile=/dev/null',
-            "-o port=#{ssh_info[:port]}",
-            "-i '#{ssh_info[:private_key_path][0]}'",
-            "#{temp_file}",
-            "#{username}@#{host}:#{guestpath}"
-          ].join(' ')
-          system(command)
+        machine.ui.info("Copying #{temp_file} to #{guestpath}")
+        command = [
+          "scp",
+          '-o StrictHostKeyChecking=no',
+          '-o UserKnownHostsFile=/dev/null',
+          "-o port=#{ssh_info[:port]}",
+          "-i '#{ssh_info[:private_key_path][0]}'",
+          "#{temp_file}",
+          "#{username}@#{host}:#{guestpath}"
+        ].join(' ')
+        system(command)
 
-          machine.ui.info("Extracting remotely #{guestpath}/temp.*.tar.gz")
-          remotely_execute(ssh_info, "tar -xzf #{guestpath}/temp.*.tar.gz -C #{guestpath}; rm #{guestpath}/temp.*.tar.gz")
+        machine.ui.info("Extracting remotely #{guestpath}/temp.*.tar.gz")
+        remotely_execute(ssh_info, "tar -xzf #{guestpath}/temp.*.tar.gz -C #{guestpath}; rm #{guestpath}/temp.*.tar.gz")
         machine.ui.info("#{guestpath} synchronised")
       end
 

data/lib/vagrant/zscp/synced_folder.rb

@@ -21,18 +21,27 @@ module Vagrant
       def enable(machine, folders, opts)
         ssh_info = machine.ssh_info
 
-        folders.each do |id, folder_opts|
-          sync_threads = []
-          folders.each do |id, folder_opts|
-            sync_threads << Thread.new(id, folder_opts) do |id, folder_opts|
-              ZscpHelper.scp(machine, ssh_info, folder_opts)
-            end
-          end
+        # Clean up every synced folder first
+        foreach_folder(folders) do |folder_opts|
+          ZscpHelper.cleanup(machine, ssh_info, folder_opts)
+        end
+
+        # Clean up every synced folder first
+        foreach_folder(folders) do |folder_opts|
+          ZscpHelper.scp(machine, ssh_info, folder_opts)
+        end
+      end
 
-          sync_threads.each do |t|
-            t.join
+      def foreach_folder(folders, &block)
+        sync_threads = []
+        folders.each do |id, folder_opts|
+          sync_threads << Thread.new(folder_opts) do |folder_opts|
+            block.call(folder_opts)
           end
         end
+        sync_threads.each do |t|
+          t.join
+        end
       end
     end
   end

data/lib/vagrant/zscp/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Zscp
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zscp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Colin Hebert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler