vagrant-export 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f0ea634ac85a2b665cdc0361595517b92f6937
-  data.tar.gz: 46e778a223f126e41c9eaa35037eaf6bf0006dbe
+  metadata.gz: b1122a5f92b1f785a5bc0d32aecaa8081d1bedc3
+  data.tar.gz: eafee68a5a8575bba9adb5c2508aa4b347247cf3
 SHA512:
-  metadata.gz: 11371c4ce8c2fcaec74d8b43fb18b67c7b64f6f5878b4a8b78c2f66cd7d7c0910f541dd6d95c77c8ae2fdf73939777e1301238e099a97bbe6d168fb4a43b13fd
-  data.tar.gz: 073cb31479b171f97f17d2c992b6d4cdedc2fd2950a679ac58f6352540b54951e86e6b678a4a94f30286da66af7866f4daecd12ae79fe2b2abc928a3a29252b7
+  metadata.gz: a2bbed4f4bac8dbf1ed8a63f2dbb82129422cf972ff82edce2dcffd69795b7e9843da9d181cd3ae30a9c3fd09476350e9bcf91cec147001bf86b0cb79302e441
+  data.tar.gz: e01f513a7ce4000e45fbf592ddfdffed942904e69981daa376b7234270792a851074472177c617bfddc359700afeec447655f0e2fd23da649a5225af40017b7b

data/lib/vagrant-export/exporter.rb

@@ -122,62 +122,6 @@ module VagrantPlugins
         end
       end
 
-
-      # Add the private key if we have one
-      # Shamelessly stolen from Vagrant::Action::General::Package
-      def setup_private_key
-
-        # Key generated by vagrant
-        path = @vm.data_dir.join('private_key').to_s
-
-        # Use a different generated key if configured
-        if @private_key != nil
-          path = @private_key.to_s
-        end
-
-        # If we don't have a generated private key, we do nothing
-        return unless File.file?(path)
-
-        # Copy it into our box directory
-        new_path = File.join(@tmp_path, 'private_key')
-        @logger.debug("Copy private key from #{path} to #{new_path}")
-        FileUtils.cp(path, new_path)
-
-        # Append it to the Vagrantfile (or create a Vagrantfile)
-        vf_path = File.join(@tmp_path, 'Vagrantfile')
-        mode = 'w+'
-
-        @logger.debug("Check and add private_key_path setting to #{vf_path}")
-
-        if File.file?(vf_path)
-          mode = 'a'
-          has_private_key_path = false
-
-          @logger.debug('Vagrantfile exists, check for private_key_path')
-
-          File.readlines(vf_path).each { |line|
-            if line.to_s =~ /ssh\.private_key_path/i
-              has_private_key_path = true
-            end
-          }
-
-          if has_private_key_path
-            @logger.debug('Existing Vagrantfile already has a private_key_path setting')
-            return
-          end
-        else
-          @logger.debug('No Vagrantfile found, create one')
-        end
-
-        File.open(vf_path, mode) do |f|
-          f.binmode
-          f.puts
-          f.puts %Q[Vagrant.configure("2") do |config|]
-          f.puts %Q[  config.ssh.private_key_path = File.expand_path("../private_key", __FILE__)]
-          f.puts %Q[end]
-        end
-      end
-
       def export
         # Halt the machine
         if @vm.state.short_description == 'running'
@@ -203,11 +147,8 @@ module VagrantPlugins
 
           @logger.debug("Files found in #{current_dir}: #{files}")
 
-          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$/ }
+          files.select! { |f| !File.directory?(f) }
+          files.select! { |f| f ~ /\.(vmdk|nvram|vmtm|vmx|vmxf)$/ }
 
           @logger.debug("Copying #{files} to #{exported_path}")
 
@@ -216,11 +157,8 @@ module VagrantPlugins
           @vm.ui.info('Compacting Vmware virtual disks')
 
           Dir.glob(File.join(exported_path, '**', '*.vmdk')) { |f|
-
-            @logger.debug("Running 'vmware-vdiskmanager -d #{f}'")
+            @logger.debug("Compacting disk file #{f}")
             Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-d', f)
-
-            @logger.debug("Running 'vmware-vdiskmanager -k #{f}'")
             Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-k', f)
           }
 
@@ -275,60 +213,50 @@ module VagrantPlugins
           f.write('{"provider":"' + provider_name + '"}')
         end
 
-        target_include_path = File.join(@tmp_path, 'include')
-        source_include_path = File.join(@vm.box.directory, 'include')
+        # 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)$/ }
 
-        # Copy includes
-        if Dir.exist?(source_include_path) && !bare
-          @logger.debug("Copy includes from #{source_include_path} to #{target_include_path}")
-          FileUtils.cp_r(source_include_path, @tmp_path)
-        end
+        @logger.debug("Copy includes #{additional_files} to #{@tmp_path}")
+        FileUtils.cp_r(additional_files, @tmp_path)
 
-        original_vagrantfile  = File.join(@vm.box.directory, 'Vagrantfile')
-        vagrantfile_exists    = File.exist?(original_vagrantfile)
-        vagrantfile_has_mac   = false
-        vagrantfile_needs_mac = @vm.provider_name.to_s == 'virtualbox'
+        # Make sure the Vagrantfile includes a HMAC when the provider is virtualbox
+        if @vm.provider_name.to_s == 'virtualbox'
 
-        # Check the original vagrant file for a mac settings
-        if vagrantfile_exists && vagrantfile_needs_mac
           @logger.debug('Provider needs a hmac setting in the Vagrantfile')
-          File.readlines(original_vagrantfile).each { |line|
-            if line.to_s =~ /base_mac\s*=\s*("|')/i
-              vagrantfile_has_mac = true
-            end
-          }
-        end
 
-        # If it has one, just copy it
-        if vagrantfile_has_mac || (!vagrantfile_needs_mac && vagrantfile_exists)
-          @logger.debug('Box has already a hmac in its Vagrantfile, copy existing')
-          FileUtils.cp(original_vagrantfile, File.join(@tmp_path, 'Vagrantfile'))
-
-        # If none, create a new one that has the mac setting,
-        # and includes the original
-        # The new Vagrantfile will include the old one, which
-        # is put into the includeds directory
-        elsif vagrantfile_needs_mac
-          @logger.debug('Vagrantfile has no hmac, set one ourselves')
-          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
-            }))
+          vagrantfile_name    = File.join(@tmp_path, 'Vagrantfile')
+          vagrantfile_has_mac = false
+          mode                = 'w+'
+
+          if File.exist?(vagrantfile_name)
+            mode = 'a'
+            File.readlines(vagrantfile_name.to_s).each { |line|
+              if line.to_s =~ /base_mac\s*=\s*("|')/i
+                @logger.debug("Found HMAC setting in file #{vagrantfile_name.to_s}")
+                vagrantfile_has_mac = true
+              end
+            }
           end
 
-          # If there is a Vagrantfile, but without a mac
-          # ensure it is included
-          if vagrantfile_exists
-            included_vagrantfile = File.join(target_include_path, '_Vagrantfile')
-            @logger.debug("Box already has a Vagrantfile, copy it from #{original_vagrantfile} to #{included_vagrantfile}")
-            FileUtils.mkdir_p(target_include_path) unless Dir.exist?(target_include_path)
-            FileUtils.cp(original_vagrantfile, included_vagrantfile)
+          unless vagrantfile_has_mac
+
+            @logger.debug("Found HMAC setting in file #{vagrantfile_name.to_s}")
+
+            vagrantfile_name.open(mode) { |f|
+              hmac_address = @vm.provider.driver.read_mac_address
+              f.binmode
+              f.puts
+              f.puts %Q[# Automatically added by export]
+              f.puts %Q[Vagrant.configure("2") do |config|]
+              f.puts %Q[  config.vm.base_mac = "#{hmac_address}"]
+              f.puts %Q[end]
+            }
           end
         end
 
-        # Copy the private key if available
-        setup_private_key
-
         # Make a box file out of it
         @box_file_name = @tmp_path + '.box'
 

data/lib/vagrant-export/version.rb

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

metadata

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