vagrant-zscp 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d179ea21dd718545fd86aaa090f968866acfd088
-  data.tar.gz: 5dc67de587231d971d8e6e191d99ee6d22419fdd
+  metadata.gz: 98b0306ce377fd7732e122c431adf2b4cd39704b
+  data.tar.gz: 6d18d1ac0f8f679cd5b0a07fe0d7cb15f57dea1e
 SHA512:
-  metadata.gz: 9ae6f4c8863c24d7b0a415bbe4e5d94b7ed047c5c8a76caf8b99166ab637d68dca2ba904981e553c15a7fe1ed27b668f74fcfb7d7283f87f080033b8557af160
-  data.tar.gz: 629cc40a3e340a7a2f4553d56f5989cfa7ea360011bcfb01103273bfa83ec80f2878d6ff8d66164963385b8582934c63915502cd023dc2788f29602dc6b40db9
+  metadata.gz: 7d5370aab4f6c94a1377805ca55d634f83e221c0780955311b6a0bebfd3c3dbe95066d265da45f747731ccc24f8568d14e868f27a69ba1f8969c23a8cb676cae
+  data.tar.gz: fc1b28a0ed5821f098fab2813dfb5a5be3faff8eb9aa926897ae345095292ef637ffd1b27445935d829a88afd982df891b2dc2b254f485f535b7ac485a92d8ba

data/lib/vagrant/zscp/helper.rb

@@ -11,6 +11,7 @@ module Vagrant
 
       def self.scp(machine, ssh_info, opts)
         guestpath = opts[:guestpath]
+        guestpath += "/" if !guestpath.end_with?("/")
         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?("/")
@@ -25,11 +26,12 @@ module Vagrant
         host     = ssh_info[:host]
 
         machine.ui.info("Sending #{hostpath} to #{guestpath}")
-        remotely_execute(ssh_info, "sudo mkdir -p #{guestpath}; sudo chown #{username}:$(id -gn #{username}) #{guestpath}")
+        remotely_execute(ssh_info, "sudo mkdir -p #{guestpath} 2> /dev/null; sudo chown #{username}:$(id -gn #{username}) #{guestpath}")
 
-        temp_file = `mktemp -t 'temp.XXXX.tar.gz'`.strip
+        temp_file = `mktemp -t 'temp.tar.gz' 2> /dev/null || mktemp -t 'temp.tar.gz.XXXX'`.strip
+        temp_file_name = Pathname.new(temp_file).basename
         machine.ui.info("Compressing #{hostpath} into #{temp_file}")
-        system("tar -czhf #{temp_file} -C #{hostpath} #{included_files}")
+        `tar -czhf #{temp_file} -C #{hostpath} #{included_files}`
 
         machine.ui.info("Copying #{temp_file} to #{guestpath}")
         command = [
@@ -42,10 +44,9 @@ module Vagrant
           "#{temp_file}",
           "#{username}@#{host}:#{guestpath}"
         ].join(' ')
-        system(command)
+        `#{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")
+        remotely_execute(ssh_info, "tar -xzf #{guestpath}#{temp_file_name} -C #{guestpath}; rm #{guestpath}#{temp_file_name}")
         machine.ui.info("#{guestpath} synchronised")
       end
 
@@ -60,7 +61,7 @@ module Vagrant
           "#{ssh_info[:username]}@#{ssh_info[:host]}",
           "'#{command}'"
         ].join(' ')
-        system(ssh_command)
+        `#{ssh_command}`
       end
     end
   end

data/lib/vagrant/zscp/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Zscp
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

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