vagrant-export 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092e8d4c803b9328bc7bed261ba4c5af5ab88815
-  data.tar.gz: 6afa02956e79e0101e33e6022adc4e1ee6a7564e
+  metadata.gz: a8f0ea634ac85a2b665cdc0361595517b92f6937
+  data.tar.gz: 46e778a223f126e41c9eaa35037eaf6bf0006dbe
 SHA512:
-  metadata.gz: 356aea56f25d699cdfaed23fff712f57ae50f04361810c2d3b66753c80fa5be9509775595f20ce0a94ee8f6be246b16e63be222fb6568c96e90245629596fbb1
-  data.tar.gz: f0a8e9528057aa7c4825cbd7dbc9b3b1749e9f632c12088be1f28b58d6aa641f0c1ff06e014420188342fa82c21de9d10936b93623625a8c3ab27d63e600c9bc
+  metadata.gz: 11371c4ce8c2fcaec74d8b43fb18b67c7b64f6f5878b4a8b78c2f66cd7d7c0910f541dd6d95c77c8ae2fdf73939777e1301238e099a97bbe6d168fb4a43b13fd
+  data.tar.gz: 073cb31479b171f97f17d2c992b6d4cdedc2fd2950a679ac58f6352540b54951e86e6b678a4a94f30286da66af7866f4daecd12ae79fe2b2abc928a3a29252b7

data/lib/vagrant-export/exporter.rb

@@ -186,7 +186,7 @@ module VagrantPlugins
         end
 
         # Export to file
-        exported_path = File.join(@env.tmp_path, Time.now.to_i.to_s)
+        exported_path = File.join(@env.tmp_path, 'export-' + Time.now.strftime('%Y%m%d%H%M%S'))
         @tmp_path = exported_path
         FileUtils.mkdir_p(exported_path)
 
@@ -271,11 +271,8 @@ module VagrantPlugins
         end
 
         # Add metadata json
-        begin
-          metadata = File.open(File.join(@tmp_path, 'metadata.json'), 'wb')
-          metadata.write('{"provider":"' + provider_name + '"}')
-        ensure
-          metadata.close
+        File.open(File.join(@tmp_path, 'metadata.json'), 'wb') do |f|
+          f.write('{"provider":"' + provider_name + '"}')
         end
 
         target_include_path = File.join(@tmp_path, 'include')
@@ -339,18 +336,20 @@ module VagrantPlugins
 
         Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
 
-          files = Dir.glob(File.join('.', '**', '*'))
+          files = Dir.glob(File.join(@tmp_path, '**', '*'))
           @logger.debug("Create box file #{@box_file_name} containing #{files}")
           bash_exec = Vagrant::Util::Which.which('bash').to_s;
 
-          if File.executable?(bash_exec) && Vagrant::Util::Which.which('pv') != nil && Vagrant::Util::Which.which('tar') && Vagrant::Util::Which.which('gzip')
+          if File.executable?(bash_exec) && ['pv', 'tar', 'gzip'].all? {|cmd| Vagrant::Util::Which.which(cmd) != nil }
             total_size = 0
+            files_list = []
 
             @logger.debug('Using custom packaging command to create progress output')
             @env.ui.info('Starting compression', new_line: false)
 
             files.each { |f|
               total_size += File.size(f)
+              files_list.push(f.to_s.gsub(@tmp_path.to_s, '').gsub(/^[\/\\]+/, ''))
             }
 
             @logger.debug("Complete size of files is #{total_size} bytes")
@@ -359,8 +358,11 @@ module VagrantPlugins
             opts[:notify] = [:stderr, :stdout]
 
             script_file = File.absolute_path(File.expand_path('../../../res/progress_tar.sh', __FILE__))
+            files_list  = files_list.join(' ')
+
+            @logger.debug("Files argument for bash script: #{files_list}")
 
-            Vagrant::Util::Subprocess.execute(bash_exec, script_file, @tmp_path.to_s, total_size.to_s, @box_file_name, opts) { |io, data|
+            Vagrant::Util::Subprocess.execute(bash_exec, script_file, @tmp_path.to_s, total_size.to_s, @box_file_name, files_list, opts) { |io, data|
               d = data.to_s
               p = d.match(/\d+/).to_a
 

data/lib/vagrant-export/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Export
-    VERSION = '0.3.7'
+    VERSION = '0.3.8'
   end
 end

data/res/progress_tar.sh

@@ -3,5 +3,7 @@
 DIRECTORY=$1
 TOTAL_SIZE=$2
 TARGET_TAR=$3
+FILES_LIST=$4
 
-tar -C ${DIRECTORY} -c ${DIRECTORY}/* | pv -f -n -s ${TOTAL_SIZE} | gzip -c > ${TARGET_TAR}
+cd ${DIRECTORY}
+tar -C ${DIRECTORY} -c ${FILES_LIST} | pv -f -n -s ${TOTAL_SIZE} | gzip -c > ${TARGET_TAR}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Georg Grossberger
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - README.md
 - lib/vagrant-export.rb
 - lib/vagrant-export/command.rb
@@ -28,7 +29,6 @@ files:
 - lib/vagrant-export/version.rb
 - res/cleanup.sh
 - res/progress_tar.sh
-- vagrant-export-0.3.6.gem
 - vagrant-export.gemspec
 homepage: https://github.com/trenker/vagrant-export
 licenses: