vagrant-export 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b75fdb202a785f439de0c9f88c6835cc0a02d8c6
-  data.tar.gz: 7367e4fd0cf82a55eb934a7401fc9d545657d33a
+  metadata.gz: 48931115e8fd25527afc676c98ce1104281ab66d
+  data.tar.gz: befa92a53e1fa97fc036d6d0f428c2c581f87c65
 SHA512:
-  metadata.gz: 0e50541e5aa70b45e388403810262cad1eacde69c0dc890d028f5f7d0909afcd9d2dbbe6b7bbe7907a019b68da2a556b918ea089b994ddec01e24a8492bb7578
-  data.tar.gz: 0a3c6ac3856d22934398127933511e61f70ecc9e6753cc1f563758aa89c115d401bb0ac29b4adb4717ef99b1ebc454b5896dc595f3b990193ce676178af966bc
+  metadata.gz: dbb99ff418f44bd31f96c80f058a31ea62813118ba207f72c838a82d73d23383ac112d4cb276e25b3884e0df79176806e17c2c7c94b075cfb64ac1c64083b6ba
+  data.tar.gz: 80d2fd744aa98f518d9cda978ed84f5942af921fb7ebdaed1872ed8a0b8f9197201bdecbaad228de0bd39867dba3f1b5638a0370680c85f805fa7fef3bc5674a

data/lib/vagrant-export/exporter.rb

@@ -106,12 +106,35 @@ module VagrantPlugins
 
         # Copy it into our box directory
         new_path = File.join(@tmp_path, 'vagrant_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+'
-        mode = 'a' if File.file?(vf_path)
+
+        @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
@@ -139,26 +162,37 @@ module VagrantPlugins
         provider_name = @vm.provider_name.to_s
 
         if /vmware/i =~ provider_name
+
+          @logger.debug("Using vmware method for provider #{provider_name}")
+
           current_dir = File.dirname(@vm.id)
           files = Dir.glob(File.join(current_dir, '**', '*'))
 
+          @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$/ }
 
+          @logger.debug("Copying #{files} to #{exported_path}")
+
           FileUtils.cp_r(files, exported_path)
 
           @vm.ui.info('Compacting Vmware virtual disks')
 
           Dir.glob(File.join(exported_path, '**', '*.vmdk')) { |f|
+
+            @logger.debug("Running 'vmware-vdiskmanager -d #{f}'")
             Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-d', f)
+
+            @logger.debug("Running 'vmware-vdiskmanager -k #{f}'")
             Vagrant::Util::Subprocess.execute('vmware-vdiskmanager', '-k', f)
           }
 
         else
-          @vm.provider.driver.export File.join(exported_path, 'box.ovf' + ext) do |progress|
+          @vm.provider.driver.export File.join(exported_path, 'box.ovf') do |progress|
             @vm.ui.clear_line
             @vm.ui.report_progress(progress.percent, 100, false)
           end
@@ -171,11 +205,14 @@ module VagrantPlugins
 
         provider_name = @vm.provider_name.to_s
 
+        @logger.debug("Provider identified as #{provider_name}")
+
         # 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'
+          @logger.debug("Forcing provider name #{provider_name}")
         end
 
         # Add metadata json
@@ -191,6 +228,7 @@ module VagrantPlugins
 
         # 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
 
@@ -201,6 +239,7 @@ module VagrantPlugins
 
         # 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
@@ -210,6 +249,7 @@ module VagrantPlugins
 
         # 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,
@@ -217,6 +257,7 @@ module VagrantPlugins
         # 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
@@ -226,8 +267,10 @@ module VagrantPlugins
           # 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, File.join(target_include_path, '_Vagrantfile'))
+            FileUtils.cp(original_vagrantfile, included_vagrantfile)
           end
         end
 
@@ -241,6 +284,7 @@ module VagrantPlugins
 
         Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
           files = Dir.glob(File.join('.', '**', '*'))
+          @logger.debug("Create box file #{@box_file_name} containing #{files}")
           Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
         end
 

data/lib/vagrant-export/version.rb

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

metadata

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