vagrant-export 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081ac42c7d7c7fc536631f148a6169561e8ccd9a
-  data.tar.gz: 0a80a48a476b5e743a1f37ebd96dc02df126d844
+  metadata.gz: 6e695757f1e8987195d06bdc0a690ac4b7d776dc
+  data.tar.gz: 42dd5af71a1ad5e04e240d8e7ded7c1ac600a0d6
 SHA512:
-  metadata.gz: 8b38d562b1d89947f8139811cf1b799e4c90261a0d1532525e9007db2f5effd3551281598e156fb717115b3e9a33bbffab3d4e2ccf565ddf65a6ab849bd0dc4f
-  data.tar.gz: 05981e87e43e6fcbacbd76928adc728ad61e30fa9d3c4586f8d5cb4a2eb3fb5f8d502091895a1ecb533d9b3e49d2ec3fc8741c280558c0ea6802f55bb42d25e5
+  metadata.gz: c09434885f41d9e40d11a67adb0b0c79d076531fe812520e8137340c64c43b73dc6fd746a8cfb09cc37b8eb37e23af26667d3680c5e790d7df976d7138e90f34
+  data.tar.gz: bddab4aacb17e68033fda5f574ec5bbba052d77c4d9b7b5248368d64bdfbb72d77a030e9f2eaffcf6ec7bce1855dc3a245439da039624ee7f42bed7d14102b5a

data/lib/vagrant-export/exporter.rb

@@ -161,7 +161,7 @@ module VagrantPlugins
 
         else
 
-          ovf_file = File.join(exported_path, @vm.box.name.gsub(/[^a-zA-Z0-9]+/, '_')) + '.ovf'
+          ovf_file = File.join(exported_path, 'box.ovf')
           vm_id = @vm.id.to_s
 
           opts = {}
@@ -191,6 +191,38 @@ module VagrantPlugins
         @logger.debug("Exported VM to #{exported_path}")
       end
 
+      # This will copy the generated private key into the box and use
+      # it for SSH by default. We have to do this because we now generate
+      # random keypairs on boot, so packaged boxes would stop working
+      # without this.
+      # Samelessly copied from Vagrant::Action::General::Package
+      def setup_private_key
+
+        # If we don't have a data dir, we also do nothing (base package)
+        return if !@vm.data_dir
+
+        # If we don't have a generated private key, we do nothing
+        path = @vm.data_dir.join("private_key")
+        return if !path.file?
+
+        # Copy it into our box directory
+        dir = Pathname.new(@tmp_path)
+        new_path = dir.join("vagrant_private_key")
+        FileUtils.cp(path, new_path)
+
+        # Append it to the Vagrantfile (or create a Vagrantfile)
+        vf_path = dir.join("Vagrantfile")
+        mode = "w+"
+        mode = "a" if vf_path.file?
+        vf_path.open(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("../vagrant_private_key", __FILE__)]
+          f.puts %Q[end]
+        end
+      end
+
       def files(bare)
 
         provider_name = @vm.provider_name.to_s
@@ -223,6 +255,9 @@ module VagrantPlugins
           FileUtils.cp_r(additional_files, @tmp_path)
         end
 
+        # Include a generated private key if it exists
+        setup_private_key
+
         # Make sure the Vagrantfile includes a HMAC when the provider is virtualbox
         if @vm.provider_name.to_s == 'virtualbox'
 
@@ -250,7 +285,6 @@ module VagrantPlugins
               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]
@@ -268,29 +302,26 @@ module VagrantPlugins
           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;
+          
+          total_size = 0
+          files_list = []
+          box_files.each { |f|
+            total_size += File.size(f)
+            files_list.push(f.to_s.gsub(@tmp_path.to_s, '').gsub(/^[\/\\]+/, ''))
+          }
+          @logger.debug("Complete size of files is #{total_size} bytes")
+          @logger.debug("Files argument for bash script: #{files_list}")
 
           if File.executable?(bash_exec) && ['pv', 'tar', 'gzip'].all? {|cmd| Vagrant::Util::Which.which(cmd) != nil }
-            total_size = 0
-            files_list = []
-
             @logger.debug('Using custom packaging command to create progress output')
             @env.ui.info('Starting compression', new_line: false)
 
-            box_files.each { |f|
-              total_size += File.size(f)
-              files_list.push(f.to_s.gsub(@tmp_path.to_s, '').gsub(/^[\/\\]+/, ''))
-            }
-
-            @logger.debug("Complete size of files is #{total_size} bytes")
-
             opts = {}
             opts[:notify] = [:stderr, :stdout]
 
             script_file = File.absolute_path(File.expand_path('../../../res/progress_tar.sh', __FILE__))
             files_list  = files_list.join(' ')
 
-            @logger.debug("Files argument for bash script: #{files_list}")
-
             Vagrant::Util::Subprocess.execute(bash_exec, script_file, @tmp_path.to_s, total_size.to_s, @box_file_name, files_list, opts) { |io, data|
               d = data.to_s
               p = d.match(/\d+/).to_a
@@ -301,13 +332,11 @@ module VagrantPlugins
                 @env.ui.clear_line
                 @env.ui.info(p.pop.to_s + '%', new_line: false)
               end
-
             }
 
             @env.ui.clear_line
-
           else
-            Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *box_files)
+            Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, '-C', @tmp_path.to_s, *files_list)
           end
         end
 

data/lib/vagrant-export/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-28 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,7 @@ files:
 - lib/vagrant-export/version.rb
 - res/cleanup.sh
 - res/progress_tar.sh
+- vagrant-export-0.4.1.gem
 - vagrant-export.gemspec
 homepage: https://github.com/trenker/vagrant-export
 licenses: