vagrant-export 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddbe360fa54bea73f25c2241a25154f40740a4a
-  data.tar.gz: 46c28c9124e22569ae174c8a90b1de86dfa57103
+  metadata.gz: 1c449b4ab728d16122ab1684cc5c2950b20bc818
+  data.tar.gz: adce85990ea7f430caf4f2b9e427f624f48fe8b0
 SHA512:
-  metadata.gz: cdf99b3412fbb5680e3b6c499c70c7af87f4590c1661f7609540954468cd3dfa36cacf4d2c9136c4d69daeda14661aebc5e38f780e76c693fafa551ba96b9b4d
-  data.tar.gz: 535bc6e78a326bc85e06d513e125c6a53f3b75abe94fd2c29931017e0a3a076e6613775207654d1e00618349756f4b9332c25699b9a5b5be8855afb046b5fbad
+  metadata.gz: 449990b155f38b7f3af3fd342bbdac52b65cc361c68d78076dd2efc7c2581172ce36490b0ab607169b1fef6a30363b7145102a18628c1f64c940fe869df3e3ae
+  data.tar.gz: 26f494c83a132fe4d802d76fe7501755ea78d701913a9d0ba931530995be5a9eb1c456b1c286ac1713912b961f9323a3e87acb654ed50d61fde7da8150371a93

data/lib/vagrant-export/error.rb

@@ -14,5 +14,8 @@ module VagrantPlugins
     class NotCreated < Vagrant::Errors::VagrantError
       error_message('Cannot export a not created machine. Please make at least one vagrant up')
     end
+    class TarFailed < Vagrant::Errors::VagrantError
+      error_message('Error during creating the box file')
+    end
   end
 end

data/lib/vagrant-export/exporter.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
         end
 
         begin
-          ssh_info = vm.ssh_info
+          ssh_info = @vm.ssh_info
           unless ssh_info == nil
             @private_key = ssh_info[:private_key_path]
           end
@@ -52,14 +52,14 @@ module VagrantPlugins
 
           finalize
         ensure
-          FileUtils.rm_rf(@tmp_path) if Dir.exists?(@tmp_path)
-          FileUtils.rm_rf(@box_file_name) if File.file?(@box_file_name)
+          FileUtils.rm_rf(@tmp_path) if @tmp_path != nil && Dir.exists?(@tmp_path)
+          FileUtils.rm_rf(@box_file_name) if @box_file_name != nil &&  File.file?(@box_file_name)
         end
         target_box
       end
 
       def target_box
-        box_name = @vm.box.name.gsub('/', '_')
+        box_name = @vm.box.name.gsub(/[^a-z0-9\-]+/, '_')
         File.join(@env.cwd, box_name + '.box')
       end
 
@@ -77,7 +77,7 @@ module VagrantPlugins
 
         if @vm.config.vm.communicator != :winrm
 
-          ssh_info = vm.ssh_info
+          ssh_info = @vm.ssh_info
           unless ssh_info == nil
             @private_key = ssh_info[:private_key_path]
           end
@@ -128,15 +128,15 @@ module VagrantPlugins
       def setup_private_key
 
         # Key generated by vagrant
-        path = @vm.data_dir.join('private_key')
+        path = @vm.data_dir.join('private_key').to_s
 
         # Use a different generated key if configured
         if @private_key != nil
-          path = File.new(@private_key.to_s, 'r') unless @private_key == Vagrant.source_root.join('keys', 'vagrant')
+          path = @private_key.to_s
         end
 
         # If we don't have a generated private key, we do nothing
-        return unless path.file?
+        return unless File.file?(path)
 
         # Copy it into our box directory
         new_path = File.join(@tmp_path, 'private_key')
@@ -341,11 +341,12 @@ module VagrantPlugins
 
           files = Dir.glob(File.join('.', '**', '*'))
           @logger.debug("Create box file #{@box_file_name} containing #{files}")
+          bash_exec = Vagrant::Util::Which.which('bash');
 
-          if Vagrant::Util::Which.which('pv') != nil && Vagrant::Util::Which.which('tar') && Vagrant::Util::Which.which('gzip')
+          if File.executable?(bash_exec) && Vagrant::Util::Which.which('pv') != nil && Vagrant::Util::Which.which('tar') && Vagrant::Util::Which.which('gzip')
             total_size = 0
 
-            logger.debug('Using custom packaging command to create progress output')
+            @logger.debug('Using custom packaging command to create progress output')
             @env.ui.info('Starting compression')
 
             files.each { |f|
@@ -357,7 +358,9 @@ module VagrantPlugins
             opts = {}
             opts[:notify] = [:stderr, :stdout]
 
-            Vagrant::Util::Subprocess.execute('tar', ' -cf - ', *files, ' | pv -n -s ', total_size, ' | gzip -c > ', @box_file_name) { |io, data|
+            script_file = File.absolute_path(File.expand_path('../../../res/progress_tar.sh', __FILE__))
+
+            Vagrant::Util::Subprocess.execute(bash_exec, script_file, @tmp_path.to_s, total_size.to_s, @box_file_name, opts) { |io, data|
               d = data.to_s
 
               if io == :stderr
@@ -375,6 +378,8 @@ module VagrantPlugins
           end
         end
 
+        raise TarFailed unless File.file?(@box_file_name)
+
         0
       end
 

data/lib/vagrant-export/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Export
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

data/res/progress_tar.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash -eu
+
+DIRECTORY=$1
+TOTAL_SIZE=$2
+TARGET_TAR=$3
+
+tar -c ${DIRECTORY}/* | pv -n -s ${TOTAL_SIZE} | gzip -c > ${TARGET_TAR}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Export boxes to .box files including the original Vagrantfile and some
   cleanups inside the VM
@@ -29,6 +29,8 @@ files:
 - lib/vagrant-export/plugin.rb
 - lib/vagrant-export/version.rb
 - res/cleanup.sh
+- res/progress_tar.sh
+- vagrant-export-0.3.4.gem
 - vagrant-export.gemspec
 homepage: https://github.com/trenker/vagrant-export
 licenses: