vagrant-zscp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52bafa08098200fcff95f7b7ab64e7417aaffaf0
-  data.tar.gz: 605975a0670d709208ab42a7b24e994a765ef876
+  metadata.gz: 1cfec9790fb14520e88a95d4247bdf2f9b0d649c
+  data.tar.gz: a4ff392d5e915713a737cfc595ebf4546a899ade
 SHA512:
-  metadata.gz: 4083ce9f9d2dfecabb30c76773648567ed26082ecf9eeb374c4cbe8c51fedf863604fb55ac952169cf494955c739fa153143a47c5cd5983cd376ca3bad1bd10a
-  data.tar.gz: f34547d0aa98e659ded0ef944975b38e86a7f2540cee4bbca9c818477de3427c1aa6c6c67991bd02c071bf4e5d18713a5df07252b43d0b2b7766de904333d848
+  metadata.gz: 7250f507f84ee9fed5c09a1517772b45f01d9304ce85b9302d4e4c8c9505f61547a7f7df5d15321a2f104ce8adfd0e8e30f49d4bbfff9afc3f3a1d1f1ba5bd01
+  data.tar.gz: 50de1d6a6e4a363c6fe00db8163cf3a852c14414b23d4239674507ff57b92904738dc1e70f5101be4522f81d82a1510e67f67b79fe7e8ae7a12f6b7b362cf1ee

data/.gitignore

@@ -1 +1,3 @@
-/*.gem
+/*.gem
+/pkg
+/Gemfile.lock

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+task :bump do
+  `gem bump`
+end

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

@@ -44,8 +44,15 @@ module Vagrant
             ssh_info = machine.ssh_info
 
             # Sync them!
+            sync_threads = []
             folders.each do |id, folder_opts|
-              ZscpHelper.scp(machine, ssh_info, folder_opts)
+              sync_threads << Thread.new(id, folder_opts) do |id, folder_opts|
+                ZscpHelper.scp(machine, ssh_info, folder_opts)
+              end
+            end
+
+            sync_threads.each do |t|
+              t.join
             end
           end
 

data/lib/vagrant/zscp/helper.rb

@@ -22,30 +22,43 @@ module Vagrant
         end
 
         machine.ui.info("Sending #{hostpath} to #{guestpath}")
-        Dir.mktmpdir { |dir|
           machine.ui.info("Removing remote #{guestpath}")
-          machine.communicate.execute("sudo rm -rf #{guestpath}; sudo mkdir -p #{guestpath}; sudo chown #{username}:$(id -gn) #{guestpath}")
+          remotely_execute(ssh_info, "sudo rm -rf #{guestpath}; sudo mkdir -p #{guestpath}; sudo chown #{username}:$(id -gn) #{guestpath}")
 
-          machine.ui.info("Compressing #{hostpath} into #{dir}/temp.tar.gz")
-          `tar -czLf #{dir}/temp.tar.gz -C #{hostpath} #{included_files}`
+          temp_file = `mktemp -t 'temp.XXXX.tar.gz'`.strip
 
-          machine.ui.info("Copying #{dir}/temp.tar.gz to #{guestpath}")
+          machine.ui.info("Compressing #{hostpath} into #{temp_file}")
+          system("tar -czLf #{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]}'",
-            "#{dir}/temp.tar.gz",
+            "#{temp_file}",
             "#{username}@#{host}:#{guestpath}"
           ].join(' ')
           system(command)
 
-          machine.ui.info("Extracting remotely #{guestpath}/temp.tar.gz")
-          machine.communicate.execute("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
+
+      def self.remotely_execute(ssh_info, command)
+        ssh_command = [
+          'ssh',
+          '-o StrictHostKeyChecking=no',
+          '-o UserKnownHostsFile=/dev/null',
+          "-o port=#{ssh_info[:port]}",
+          "-i '#{ssh_info[:private_key_path][0]}'",
+          "#{ssh_info[:username]}@#{ssh_info[:host]}",
+          "'#{command}'"
+        ].join(' ')
+        system(ssh_command)
+      end
     end
   end
 end

data/lib/vagrant/zscp/synced_folder.rb

@@ -22,7 +22,16 @@ module Vagrant
         ssh_info = machine.ssh_info
 
         folders.each do |id, folder_opts|
-          ZscpHelper.scp(machine, ssh_info, 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
+
+          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.2"
+    VERSION = "0.1.3"
   end
 end

data/vagrant-zscp.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Colin Hebert"]
   spec.email         = ["chebert@atlassian.com"]
 
-  spec.summary       = %q{Copies files to a vagrant VM using scp and compressing the content.}
+  spec.summary       = %q{Copies files to a vagrant VM using scp.}
   spec.description   = %q{Copies files to a vagrant VM using scp and compressing the content.}
   spec.homepage      = "https://www.atlassian.com"
 
@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "gem-release", "~> 0.7.3"
   spec.add_runtime_dependency "log4r", "~> 1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zscp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Colin Hebert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -95,5 +109,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Copies files to a vagrant VM using scp and compressing the content.
+summary: Copies files to a vagrant VM using scp.
 test_files: []