vagrant-export 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1122a5f92b1f785a5bc0d32aecaa8081d1bedc3
-  data.tar.gz: eafee68a5a8575bba9adb5c2508aa4b347247cf3
+  metadata.gz: 081ac42c7d7c7fc536631f148a6169561e8ccd9a
+  data.tar.gz: 0a80a48a476b5e743a1f37ebd96dc02df126d844
 SHA512:
-  metadata.gz: a2bbed4f4bac8dbf1ed8a63f2dbb82129422cf972ff82edce2dcffd69795b7e9843da9d181cd3ae30a9c3fd09476350e9bcf91cec147001bf86b0cb79302e441
-  data.tar.gz: e01f513a7ce4000e45fbf592ddfdffed942904e69981daa376b7234270792a851074472177c617bfddc359700afeec447655f0e2fd23da649a5225af40017b7b
+  metadata.gz: 8b38d562b1d89947f8139811cf1b799e4c90261a0d1532525e9007db2f5effd3551281598e156fb717115b3e9a33bbffab3d4e2ccf565ddf65a6ab849bd0dc4f
+  data.tar.gz: 05981e87e43e6fcbacbd76928adc728ad61e30fa9d3c4586f8d5cb4a2eb3fb5f8d502091895a1ecb533d9b3e49d2ec3fc8741c280558c0ea6802f55bb42d25e5

data/lib/vagrant-export/exporter.rb

@@ -23,9 +23,8 @@ module VagrantPlugins
       # @param bare Boolean
       # @return string
       def handle(fast, bare)
-        @did_run     = false
-        @private_key = nil
-        @tmp_path    = nil
+        @private_key   = nil
+        @tmp_path      = nil
         @box_file_name = nil
 
         if @vm.state.short_description == 'not created'
@@ -66,9 +65,7 @@ module VagrantPlugins
       protected
 
       def can_compress
-        if @vm.state.short_description == 'running'
-          @did_run = true
-        else
+        unless @vm.state.short_description == 'running'
           @vm.ui.info('Machine not running, bringing it up')
           @vm.action(:up)
         end
@@ -143,16 +140,16 @@ module VagrantPlugins
           @logger.debug("Using vmware method for provider #{provider_name}")
 
           current_dir = File.dirname(@vm.id)
-          files = Dir.glob(File.join(current_dir, '**', '*'))
+          vm_data_files = Dir.glob(File.join(current_dir, '**', '*'))
 
-          @logger.debug("Files found in #{current_dir}: #{files}")
+          @logger.debug("Files found in #{current_dir}: #{vm_data_files}")
 
-          files.select! { |f| !File.directory?(f) }
-          files.select! { |f| f ~ /\.(vmdk|nvram|vmtm|vmx|vmxf)$/ }
+          vm_data_files.select! { |f| !File.directory?(f) }
+          vm_data_files.select! { |f| f ~ /\.(vmdk|nvram|vmtm|vmx|vmxf)$/ }
 
           @logger.debug("Copying #{files} to #{exported_path}")
 
-          FileUtils.cp_r(files, exported_path)
+          FileUtils.cp_r(vm_data_files, exported_path)
 
           @vm.ui.info('Compacting Vmware virtual disks')
 
@@ -179,8 +176,8 @@ module VagrantPlugins
             @logger.debug(d)
 
             unless io == :stdout
+              @env.ui.clear_line
               if /\d+%/ =~ d
-                @env.ui.clear_line
                 @env.ui.info(d.match(/\d+%/).to_a.pop, new_line: false)
               else
                 @logger.error(d)
@@ -214,13 +211,17 @@ module VagrantPlugins
         end
 
         # Copy additional files
-        additional_files = Dir.glob(File.join(@vm.box.directory, '**', '*'))
-        additional_files.select! { |f| !File.directory?(f) }
-        additional_files.select! { |f| f !~ /(tar|gz|core|lck|log|vmdk|ovf|ova)$/ }
-        additional_files.select! { |f| f !~ /(nvram|vmem|vmsd|vmsn|vmss|vmtm|vmx|vmxf)$/ }
+        unless bare
+          additional_files = Dir.glob(File.join(@vm.box.directory, '**', '*'))
+          additional_files.select! { |f| !File.directory?(f) }
+          additional_files.select! { |f| f !~ /(gz|core|lck|log|vmdk|ovf|ova)$/ }
+          additional_files.select! { |f| f !~ /(nvram|vmem|vmsd|vmsn|vmss|vmtm|vmx|vmxf)$/ }
+          additional_files.select! { |f| !File.file?(f.gsub(@vm.box.directory.to_s, @tmp_path.to_s)) }
+
+          @logger.debug("Copy includes #{additional_files} to #{@tmp_path}")
 
-        @logger.debug("Copy includes #{additional_files} to #{@tmp_path}")
-        FileUtils.cp_r(additional_files, @tmp_path)
+          FileUtils.cp_r(additional_files, @tmp_path)
+        end
 
         # Make sure the Vagrantfile includes a HMAC when the provider is virtualbox
         if @vm.provider_name.to_s == 'virtualbox'
@@ -245,7 +246,7 @@ module VagrantPlugins
 
             @logger.debug("Found HMAC setting in file #{vagrantfile_name.to_s}")
 
-            vagrantfile_name.open(mode) { |f|
+            File.open(vagrantfile_name.to_s, mode) { |f|
               hmac_address = @vm.provider.driver.read_mac_address
               f.binmode
               f.puts
@@ -264,8 +265,8 @@ module VagrantPlugins
 
         Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
 
-          files = Dir.glob(File.join(@tmp_path, '**', '*'))
-          @logger.debug("Create box file #{@box_file_name} containing #{files}")
+          box_files = Dir.glob(File.join(@tmp_path, '**', '*'))
+          @logger.debug("Create box file #{@box_file_name} containing #{box_files}")
           bash_exec = Vagrant::Util::Which.which('bash').to_s;
 
           if File.executable?(bash_exec) && ['pv', 'tar', 'gzip'].all? {|cmd| Vagrant::Util::Which.which(cmd) != nil }
@@ -275,7 +276,7 @@ module VagrantPlugins
             @logger.debug('Using custom packaging command to create progress output')
             @env.ui.info('Starting compression', new_line: false)
 
-            files.each { |f|
+            box_files.each { |f|
               total_size += File.size(f)
               files_list.push(f.to_s.gsub(@tmp_path.to_s, '').gsub(/^[\/\\]+/, ''))
             }
@@ -306,7 +307,7 @@ module VagrantPlugins
             @env.ui.clear_line
 
           else
-            Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
+            Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *box_files)
           end
         end
 
@@ -322,12 +323,6 @@ module VagrantPlugins
           FileUtils.mv(@box_file_name, target)
           @vm.ui.info('Created ' + target)
         end
-
-        # Resume the machine
-        if @did_run
-          @vm.ui.info('Bringing the machine back up')
-          @vm.action(:up)
-        end
       end
     end
   end

data/lib/vagrant-export/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Export
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Export boxes to .box files including the original Vagrantfile and some
   cleanups inside the VM