vagrant-export 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef07c62c48d761e28d7b31a6bbe682c77d5b0d69
-  data.tar.gz: 29dc20690f1cb381a8e5f6ba0f6eb9a67f5ec01b
+  metadata.gz: ca43dade64192c5fb5fa7e7791ec719ded8cf48c
+  data.tar.gz: 54401f0258c8c1760866e480c3ed7b458cb1a040
 SHA512:
-  metadata.gz: 03f69ba16fdedc0f3bc2c403ac32de79ee428a28772edee72ba877236c4589d75e748ba704b693dc4ca30ce48d2a9ced5f1377aadbd9a57fbfe193588a77a1c9
-  data.tar.gz: 36adfb60e2e714d0d95855afd7185b18d6a807306fcaded6ff5fd58d8658198c9e788cf60f0420172a026549520bd6918c98fdc7bc54e3ad36f14b37dd493272
+  metadata.gz: 1ce74785f6932ebed41f267313f7e59c0dcb61c4cd68c996dd262a9a189e2e2bb55394a4be18b0be68c526058acfb4be117cafe5536095fc7b8822487d78fd84
+  data.tar.gz: cd1a40933bbaa940496e55624494b6bd4e1ae53d113bee866a1d46efa80c9d22c5ba1e1a042f8207162370f2e91fcc9b68ab9376809bc78518f322f2522c2e73

data/.gitignore

@@ -1,4 +1,4 @@
-/.idea
-/.vagrant
-/Gemfile.lock
-Vagrantfile
+/.idea
+/.vagrant
+/Gemfile.lock
+Vagrantfile

data/Gemfile

@@ -1,9 +1,9 @@
-source 'https://rubygems.org'
-
-group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
-end
-
-group :plugins do
-  gem 'vagrant-export', path: '.'
-end
+source 'https://rubygems.org'
+
+group :development do
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+end
+
+group :plugins do
+  gem 'vagrant-export', path: '.'
+end

data/README.md

@@ -1,50 +1,50 @@
-# Vagrant Export
-
-[Vagrant](http://www.vagrantup.com) plugin to export compressed and optimized linux boxes from virtualbox into a .box file
-
-## Installation
-
-```bash
-vagrant plugin install vagrant-export
-```
-
-## Useage
-
-```bash
-vagrant export
-```
-Exports the current box into a .box file. The file name is determined by the setting `config.vm.name`, were slashes are replaced with underscores.
-
-So a Vagrantfile with this setting:
-
-```ruby
-Vagrant.configure(2) do |config|
-	config.vm.name = "hashicorp/precise32"
-end
-```
-
-will be exported to a file named `hashicorp_precise32.box`
-
-## License
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Georg Großberger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+# Vagrant Export
+
+[Vagrant](http://www.vagrantup.com) plugin to export compressed and optimized linux boxes from virtualbox into a .box file
+
+## Installation
+
+```bash
+vagrant plugin install vagrant-export
+```
+
+## Useage
+
+```bash
+vagrant export
+```
+Exports the current box into a .box file. The file name is determined by the setting `config.vm.name`, were slashes are replaced with underscores.
+
+So a Vagrantfile with this setting:
+
+```ruby
+Vagrant.configure(2) do |config|
+	config.vm.name = "hashicorp/precise32"
+end
+```
+
+will be exported to a file named `hashicorp_precise32.box`
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Georg Großberger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/vagrant-export/command.rb

@@ -1,45 +1,45 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-module VagrantPlugins
-  module Export
-    class Command < Vagrant.plugin '2', :command
-
-      def self.synopsis
-        'exports a box file with additional actions taken'
-      end
-
-      def execute
-        options = {}
-        options[:fast] = false
-        options[:bare] = false
-
-        opts = OptionParser.new do |o|
-          o.banner = 'Usage: vagrant export [switches]'
-          o.separator ''
-
-          o.on('-f', '--fast', 'Do not perform cleanups.') do |f|
-            options[:fast] = f
-          end
-
-          o.on('-b', '--bare', 'Do not include additional files.') do |b|
-            options[:bare] = b
-          end
-        end
-
-        argv = parse_options(opts)
-        return 1 unless argv
-
-        require_relative 'exporter'
-        ex = Exporter.new(@env, @logger)
-
-        with_target_vms argv, reverse: true do |machine|
-          ex.handle(machine, options[:fast], options[:bare])
-        end
-        0
-      end
-    end
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+module VagrantPlugins
+  module Export
+    class Command < Vagrant.plugin '2', :command
+
+      def self.synopsis
+        'exports a box file with additional actions taken'
+      end
+
+      def execute
+        options = {}
+        options[:fast] = false
+        options[:bare] = false
+
+        opts = OptionParser.new do |o|
+          o.banner = 'Usage: vagrant export [switches]'
+          o.separator ''
+
+          o.on('-f', '--fast', 'Do not perform cleanups.') do |f|
+            options[:fast] = f
+          end
+
+          o.on('-b', '--bare', 'Do not include additional files.') do |b|
+            options[:bare] = b
+          end
+        end
+
+        argv = parse_options(opts)
+        return 1 unless argv
+
+        require_relative 'exporter'
+        ex = Exporter.new(@env, @logger)
+
+        with_target_vms argv, reverse: true do |machine|
+          ex.handle(machine, options[:fast], options[:bare])
+        end
+        0
+      end
+    end
+  end
+end

data/lib/vagrant-export/exporter.rb

@@ -1,204 +1,248 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-require 'fileutils'
-
-module VagrantPlugins
-  module Export
-    class Exporter
-
-      # @param env Vagrant::Environment
-      # @param logger Log4r::Logger
-      def initialize env, logger
-        @env = env
-        @logger = logger
-      end
-
-      # @param vm Vagrant::Machine
-      # @param fast Boolean
-      # @param bare Boolean
-      # @return string
-      def handle(vm, fast, bare)
-        @vm = vm
-        @did_run = false
-
-        unless fast
-          if can_compress
-            compress
-          else
-            @env.uid.error('Cannot compress this type of machine')
-            return 1
-          end
-        end
-
-        return 1 unless export
-        return 1 unless files(bare)
-
-        finalize
-
-        @target_box
-      end
-
-      protected
-
-
-      def can_compress
-        if @vm.state.short_description == 'running'
-          @did_run = true
-        else
-          @env.ui.info('Machine not running, bringing it up')
-          @vm.action(:up)
-        end
-
-        compress_supported = false
-
-        if @vm.config.vm.communicator != :winrm
-          @vm.communicate.execute('lsb_release -i -s', error_key: :ssh_bad_exit_status_muted) do |type, data|
-            if type == :stdout && data.to_s =~ /mint|ubuntu|debian/i
-              compress_supported = true
-            end
-          end
-        end
-
-        compress_supported
-      end
-
-      def compress
-
-        target_script = "/tmp/_cleanup_#{Time.now.to_i.to_s}.sh"
-        source_script = File.expand_path('../../../res/cleanup.sh', __FILE__)
-        comm = @vm.communicate
-
-        @logger.debug("Uploading #{source_script} to #{target_script}")
-        comm.upload(source_script, target_script)
-
-        sudo(comm, "chmod +x #{target_script}")
-        sudo(comm, "#{target_script}")
-
-        0
-      end
-
-      def sudo(communicator, command)
-        @logger.debug("Execute '#{command}'")
-        communicator.sudo(command, error_key: :ssh_bad_exit_status_muted) do |type, data|
-          if [:stderr, :stdout].include?(type)
-            return if data.empty?
-            data = data.to_s.chomp.strip
-            if type == :stdout
-              @vm.ui.info(data)
-            else
-              @vm.ui.error(data)
-            end
-          end
-        end
-      end
-
-      def export
-        # Halt the machine
-        if @vm.state.short_description == 'running'
-          @env.ui.info('Halting VM for export')
-          @vm.action(:halt)
-        end
-
-        # Export to file
-        exported_path = File.join(@env.tmp_path, Time.now.to_i.to_s)
-        @tmp_path = exported_path
-        FileUtils.mkdir_p(exported_path)
-
-        @env.ui.info('Exporting machine')
-        @vm.provider.driver.export File.join(exported_path, 'box.ovf') do |progress|
-          @env.ui.clear_line
-          @env.ui.report_progress(progress.percent, 100, false)
-        end
-
-        @logger.debug("Exported VM to #{exported_path}")
-      end
-
-      def files(bare)
-
-        # Add metadata json
-        begin
-          metadata = File.open(File.join(@tmp_path, 'metadata.json'), 'wb')
-          metadata.write('{"provider":"' + @vm.provider_name.to_s + '"}')
-        ensure
-          metadata.close
-        end
-
-        target_include_path = File.join(@tmp_path, 'include')
-        source_include_path = File.join(@vm.box.directory, 'include')
-
-        # Copy includes
-        if Dir.exist?(source_include_path) && !bare
-          FileUtils.cp_r(source_include_path, @tmp_path)
-        end
-
-        original_vagrantfile = File.join(@vm.box.directory, 'Vagrantfile')
-        vagrantfile_exists   = File.exist?(original_vagrantfile)
-        vagrantfile_has_mac  = false
-
-        # Check the original vagrant file for a mac settings
-        if vagrantfile_exists
-          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
-          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
-        else
-          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
-            }))
-          end
-
-          # If there is a Vagrantfile, but without a mac
-          # ensure it is included
-          if vagrantfile_exists
-            FileUtils.mkdir_p(target_include_path) unless Dir.exist?(target_include_path)
-            FileUtils.cp(original_vagrantfile, File.join(target_include_path, '_Vagrantfile'))
-          end
-        end
-
-        # Make a box file out of it
-        @box_file_name = @tmp_path + '.box'
-
-        Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
-          files = Dir.glob(File.join('.', '**', '*'))
-          Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
-        end
-
-        0
-      end
-
-      def finalize
-        # Rename the box file
-        if File.exist?(@box_file_name)
-          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)
-        end
-
-        # Remove the tmp files
-        FileUtils.rm_rf(@tmp_path)
-
-        # Resume the machine
-        if @did_run
-          @env.ui.info('Bringing the machine back up')
-          @vm.action(:up)
-        end
-      end
-    end
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+require 'fileutils'
+
+module VagrantPlugins
+  module Export
+    class Exporter
+
+      # @param env Vagrant::Environment
+      # @param logger Log4r::Logger
+      def initialize(env, logger)
+        @env = env
+        @logger = logger
+      end
+
+      # @param vm Vagrant::Machine
+      # @param fast Boolean
+      # @param bare Boolean
+      # @return string
+      def handle(vm, fast, bare)
+        @vm = vm
+        @did_run = false
+
+        unless fast
+          if can_compress
+            compress
+          else
+            @env.uid.error('Cannot compress this type of machine')
+            return 1
+          end
+        end
+
+        return 1 unless export
+        return 1 unless files(bare)
+
+        finalize
+
+        @target_box
+      end
+
+      protected
+
+
+      def can_compress
+        if @vm.state.short_description == 'running'
+          @did_run = true
+        else
+          @env.ui.info('Machine not running, bringing it up')
+          @vm.action(:up)
+        end
+
+        compress_supported = false
+
+        if @vm.config.vm.communicator != :winrm
+          @vm.communicate.execute('lsb_release -i -s', error_key: :ssh_bad_exit_status_muted) do |type, data|
+            if type == :stdout && data.to_s =~ /mint|ubuntu|debian/i
+              compress_supported = true
+            end
+          end
+        end
+
+        compress_supported
+      end
+
+      def compress
+
+        target_script = "/tmp/_cleanup_#{Time.now.to_i.to_s}.sh"
+        source_script = File.expand_path('../../../res/cleanup.sh', __FILE__)
+        comm = @vm.communicate
+
+        @logger.debug("Uploading #{source_script} to #{target_script}")
+        comm.upload(source_script, target_script)
+
+        sudo(comm, "chmod +x #{target_script}")
+        sudo(comm, "#{target_script}")
+
+        0
+      end
+
+      def sudo(communicator, command)
+        @logger.debug("Execute '#{command}'")
+        communicator.sudo(command, error_key: :ssh_bad_exit_status_muted) do |type, data|
+          if [:stderr, :stdout].include?(type)
+            return if data.empty?
+            data = data.to_s.chomp.strip
+            if type == :stdout
+              @vm.ui.info(data)
+            else
+              @vm.ui.error(data)
+            end
+          end
+        end
+      end
+
+
+      # Add the private key if we have one
+      # Shamelessly stolen from Vagrant::Action::General::Package
+      def setup_private_key
+
+        # If we don't have a generated private key, we do nothing
+        path = @vm.data_dir.join('private_key')
+        return unless path.file?
+
+        # Copy it into our box directory
+        new_path = @tmp_path.join('vagrant_private_key')
+        FileUtils.cp(path, new_path)
+
+        # Append it to the Vagrantfile (or create a Vagrantfile)
+        vf_path = @tmp_path.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 export
+        # Halt the machine
+        if @vm.state.short_description == 'running'
+          @env.ui.info('Halting VM for export')
+          @vm.action(:halt)
+        end
+
+        # Export to file
+        exported_path = File.join(@env.tmp_path, Time.now.to_i.to_s)
+        @tmp_path = exported_path
+        FileUtils.mkdir_p(exported_path)
+
+        @env.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)
+          }
+          FileUtils.cp_r(files, exported_path)
+        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)
+          end
+        end
+
+        @logger.debug("Exported VM to #{exported_path}")
+      end
+
+      def files(bare)
+
+        provider_name = @vm.provider_name.to_s
+
+        # Add metadata json
+        begin
+          metadata = File.open(File.join(@tmp_path, 'metadata.json'), 'wb')
+          metadata.write('{"provider":"' + provider_name + '"}')
+        ensure
+          metadata.close
+        end
+
+        target_include_path = File.join(@tmp_path, 'include')
+        source_include_path = File.join(@vm.box.directory, 'include')
+
+        # Copy includes
+        if Dir.exist?(source_include_path) && !bare
+          FileUtils.cp_r(source_include_path, @tmp_path)
+        end
+
+        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'
+
+        # Check the original vagrant file for a mac settings
+        if vagrantfile_exists && vagrantfile_needs_mac
+          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)
+          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
+        else
+          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
+            }))
+          end
+
+          # If there is a Vagrantfile, but without a mac
+          # ensure it is included
+          if vagrantfile_exists
+            FileUtils.mkdir_p(target_include_path) unless Dir.exist?(target_include_path)
+            FileUtils.cp(original_vagrantfile, File.join(target_include_path, '_Vagrantfile'))
+          end
+        end
+
+        # Copy the private key if available
+        setup_private_key
+
+        # Make a box file out of it
+        @box_file_name = @tmp_path + '.box'
+
+        Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
+          files = Dir.glob(File.join('.', '**', '*'))
+          Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
+        end
+
+        0
+      end
+
+      def finalize
+        # Rename the box file
+        if File.exist?(@box_file_name)
+          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)
+        end
+
+        # Remove the tmp files
+        FileUtils.rm_rf(@tmp_path)
+
+        # Resume the machine
+        if @did_run
+          @env.ui.info('Bringing the machine back up')
+          @vm.action(:up)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-export/plugin.rb

@@ -1,25 +1,25 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-module VagrantPlugins
-  module Export
-    class Plugin < Vagrant.plugin '2'
-
-      name 'Vagrant Export'
-
-      description <<-EOF
-      Export an existing box to a .box file, like the vagrant repackage command
-      Additionally it will include the original Vagrantfile and other included
-      files and perform several cleanup operations inside the VM to reduce its
-      exported size. The latter requires a Ubuntu or compatible guest.
-      EOF
-
-      command 'export' do
-        require_relative 'command'
-        Command
-      end
-   	end
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+module VagrantPlugins
+  module Export
+    class Plugin < Vagrant.plugin '2'
+
+      name 'Vagrant Export'
+
+      description <<-EOF
+      Export an existing box to a .box file, like the vagrant repackage command
+      Additionally it will include the original Vagrantfile and other included
+      files and perform several cleanup operations inside the VM to reduce its
+      exported size. The latter requires a Ubuntu or compatible guest.
+      EOF
+
+      command 'export' do
+        require_relative 'command'
+        Command
+      end
+   	end
+  end
+end

data/lib/vagrant-export/version.rb

@@ -1,10 +1,10 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-module VagrantPlugins
-  module Export
-    VERSION = '0.2.7'
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+module VagrantPlugins
+  module Export
+    VERSION = '0.3.0'
+  end
+end

data/lib/vagrant-export.rb

@@ -1,7 +1,7 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-require 'vagrant-export/plugin'
-require 'vagrant-export/version'
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+require 'vagrant-export/plugin'
+require 'vagrant-export/version'

data/res/cleanup.sh

@@ -13,11 +13,6 @@ do
         mysql -u root $DB
 done
 
-echo "Reset vagrant authorized keys file"
-wget -q --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O '/tmp/auth_keys'
-cat /tmp/auth_keys >> /home/vagrant/.ssh/authorized_keys
-rm /tmp/auth_keys
-
 echo "Removing old kernel packages"
 apt-get -qq -y --purge remove $(dpkg --list | egrep '^rc' | awk '{print $2}')
 apt-get -qq -y --purge remove $(dpkg --list | egrep 'linux-(image(-extra)?|headers)-[0-9]' | awk '{print $3,$2}' | grep -v $(uname -r | sed -e s/-generic//g) | awk '{ print $2}')
@@ -79,5 +74,4 @@ rm -f /EMPTY
 echo "Sync to disc"
 sync
 
-echo "Exit happily"
 exit 0

data/vagrant-export.gemspec

@@ -1,49 +1,49 @@
-$:.unshift(File.expand_path('../lib', __FILE__))
-
-require 'vagrant-export/version'
-
-Gem::Specification.new do |g|
-  g.name          = 'vagrant-export'
-  g.version       = VagrantPlugins::Export::VERSION
-  g.platform      = Gem::Platform::RUBY
-  g.license       = 'MIT'
-  g.authors       = 'Georg Großberger'
-  g.email         = 'contact@grossberger-ge.org'
-  g.homepage      = 'https://github.com/trenker/vagrant-export'
-  g.summary       = 'Export boxes to .box files including the original Vagrantfile and some cleanups inside the VM'
-  g.description   = 'Export boxes to .box files including the original Vagrantfile and some cleanups inside the VM'
-
-  # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob('**/{*,.*}') }
-  all_files.reject! { |file| %w(. ..).include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, '.gitignore')
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  g.files         = unignored_files
-  g.require_path  = 'lib'
-end
+$:.unshift(File.expand_path('../lib', __FILE__))
+
+require 'vagrant-export/version'
+
+Gem::Specification.new do |g|
+  g.name          = 'vagrant-export'
+  g.version       = VagrantPlugins::Export::VERSION
+  g.platform      = Gem::Platform::RUBY
+  g.license       = 'MIT'
+  g.authors       = 'Georg Großberger'
+  g.email         = 'contact@grossberger-ge.org'
+  g.homepage      = 'https://github.com/trenker/vagrant-export'
+  g.summary       = 'Export boxes to .box files including the original Vagrantfile and some cleanups inside the VM'
+  g.description   = 'Export boxes to .box files including the original Vagrantfile and some cleanups inside the VM'
+
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob('**/{*,.*}') }
+  all_files.reject! { |file| %w(. ..).include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, '.gitignore')
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  g.files         = unignored_files
+  g.require_path  = 'lib'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Georg Großberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies: []
 description: Export boxes to .box files including the original Vagrantfile and some
   cleanups inside the VM
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Export boxes to .box files including the original Vagrantfile and some cleanups