vagrant-export 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebbfe47b8cb61c914617b5093dd3eff5cc6685c
-  data.tar.gz: e1a2327a50b858faa052da044c0931a217a6e179
+  metadata.gz: b75fdb202a785f439de0c9f88c6835cc0a02d8c6
+  data.tar.gz: 7367e4fd0cf82a55eb934a7401fc9d545657d33a
 SHA512:
-  metadata.gz: 051a3a01cd6caca98e9142798c9ed20e967e6094953beb2a6a97bc44ea48de850ec543bbea17a7eddce97c7e4f78f6dc643bba7a2587cca34f531ecb49ff8f8f
-  data.tar.gz: 98335fc927b5ef5915220465eae6df1b7af93bb34fe42b885033dbe885c7c618491ec8657976232b2482f7249d7522c61fe95d6f2e360004c502977b6870cf58
+  metadata.gz: 0e50541e5aa70b45e388403810262cad1eacde69c0dc890d028f5f7d0909afcd9d2dbbe6b7bbe7907a019b68da2a556b918ea089b994ddec01e24a8492bb7578
+  data.tar.gz: 0a3c6ac3856d22934398127933511e61f70ecc9e6753cc1f563758aa89c115d401bb0ac29b4adb4717ef99b1ebc454b5896dc595f3b990193ce676178af966bc

data/lib/vagrant-export/exporter.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           if can_compress
             compress
           else
-            @env.uid.error('Cannot compress this type of machine')
+            @vm.ui.error('Cannot compress this type of machine')
             return 1
           end
         end
@@ -48,7 +48,7 @@ module VagrantPlugins
         if @vm.state.short_description == 'running'
           @did_run = true
         else
-          @env.ui.info('Machine not running, bringing it up')
+          @vm.ui.info('Machine not running, bringing it up')
           @vm.action(:up)
         end
 
@@ -125,7 +125,7 @@ module VagrantPlugins
       def export
         # Halt the machine
         if @vm.state.short_description == 'running'
-          @env.ui.info('Halting VM for export')
+          @vm.ui.info('Halting VM for export')
           @vm.action(:halt)
         end
 
@@ -134,20 +134,33 @@ module VagrantPlugins
         @tmp_path = exported_path
         FileUtils.mkdir_p(exported_path)
 
-        @env.ui.info('Exporting machine')
+        @vm.ui.info('Exporting machine')
 
         provider_name = @vm.provider_name.to_s
 
         if /vmware/i =~ provider_name
           current_dir = File.dirname(@vm.id)
-          files = Dir.glob(File.join(current_dir, '**', '*')).select {|f|
-              !File.directory?(f)
-          }
+          files = Dir.glob(File.join(current_dir, '**', '*'))
+
+          files.select! {|f| !File.directory?(f) }
+          files.select!{ |f| f !~ /\.log$/ }
+          files.select!{ |f| f !~ /core$/ }
+          files.select!{ |f| f !~ /\.gz$/ }
+          files.select!{ |f| f !~ /.lck$/ }
+
           FileUtils.cp_r(files, exported_path)
+
+          @vm.ui.info('Compacting Vmware virtual disks')
+
+          Dir.glob(File.join(exported_path, '**', '*.vmdk')) { |f|
+            Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-d', f)
+            Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-k', f)
+          }
+
         else
           @vm.provider.driver.export File.join(exported_path, 'box.ovf' + ext) do |progress|
-            @env.ui.clear_line
-            @env.ui.report_progress(progress.percent, 100, false)
+            @vm.ui.clear_line
+            @vm.ui.report_progress(progress.percent, 100, false)
           end
         end
 
@@ -158,6 +171,13 @@ module VagrantPlugins
 
         provider_name = @vm.provider_name.to_s
 
+        # For Vmware, the remote provider is generic _desktop
+        # the local is a specific _fusion or _workstation
+        # Always use vmware_desktop to avoid problems with different provider plugins
+        if provider_name =~ /vmware/
+          provider_name = 'vmware_desktop'
+        end
+
         # Add metadata json
         begin
           metadata = File.open(File.join(@tmp_path, 'metadata.json'), 'wb')
@@ -196,7 +216,7 @@ module VagrantPlugins
         # and includes the original
         # The new Vagrantfile will include the old one, which
         # is put into the includeds directory
-        else
+        elsif vagrantfile_needs_mac
           File.open(File.join(@tmp_path, 'Vagrantfile'), 'wb') do |file|
             file.write(Vagrant::Util::TemplateRenderer.render('package_Vagrantfile', {
                 base_mac: @vm.provider.driver.read_mac_address
@@ -217,6 +237,8 @@ module VagrantPlugins
         # Make a box file out of it
         @box_file_name = @tmp_path + '.box'
 
+        @vm.ui.info('Packaging box file')
+
         Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
           files = Dir.glob(File.join('.', '**', '*'))
           Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
@@ -231,7 +253,7 @@ module VagrantPlugins
           box_name = @vm.box.name.gsub('/', '_')
           @target_box = File.join(@env.cwd, box_name + '.box')
           FileUtils.mv(@box_file_name, @target_box)
-          @env.ui.info('Created ' + @target_box)
+          @vm.ui.info('Created ' + @target_box)
         end
 
         # Remove the tmp files
@@ -239,7 +261,7 @@ module VagrantPlugins
 
         # Resume the machine
         if @did_run
-          @env.ui.info('Bringing the machine back up')
+          @vm.ui.info('Bringing the machine back up')
           @vm.action(:up)
         end
       end

data/lib/vagrant-export/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Export
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

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