vagrant-export 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48931115e8fd25527afc676c98ce1104281ab66d
-  data.tar.gz: befa92a53e1fa97fc036d6d0f428c2c581f87c65
+  metadata.gz: 3ddbe360fa54bea73f25c2241a25154f40740a4a
+  data.tar.gz: 46c28c9124e22569ae174c8a90b1de86dfa57103
 SHA512:
-  metadata.gz: dbb99ff418f44bd31f96c80f058a31ea62813118ba207f72c838a82d73d23383ac112d4cb276e25b3884e0df79176806e17c2c7c94b075cfb64ac1c64083b6ba
-  data.tar.gz: 80d2fd744aa98f518d9cda978ed84f5942af921fb7ebdaed1872ed8a0b8f9197201bdecbaad228de0bd39867dba3f1b5638a0370680c85f805fa7fef3bc5674a
+  metadata.gz: cdf99b3412fbb5680e3b6c499c70c7af87f4590c1661f7609540954468cd3dfa36cacf4d2c9136c4d69daeda14661aebc5e38f780e76c693fafa551ba96b9b4d
+  data.tar.gz: 535bc6e78a326bc85e06d513e125c6a53f3b75abe94fd2c29931017e0a3a076e6613775207654d1e00618349756f4b9332c25699b9a5b5be8855afb046b5fbad

data/.gitignore

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

data/Gemfile.lock

@@ -0,0 +1,102 @@
+GIT
+  remote: https://github.com/mitchellh/vagrant.git
+  revision: a8dcf92f14d8bb8828a43b91804334673508f467
+  specs:
+    vagrant (1.7.2)
+      bundler (>= 1.5.2, < 1.8.0)
+      childprocess (~> 0.5.0)
+      erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
+      i18n (>= 0.6.0, <= 0.8.0)
+      listen (~> 2.8.0)
+      log4r (~> 1.1.9, < 1.1.11)
+      net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
+      net-ssh (>= 2.6.6, < 2.10.0)
+      nokogiri (= 1.6.3.1)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
+      wdm (~> 0.1.0)
+      winrm (~> 1.3)
+      winrm-fs (~> 0.1.0)
+
+PATH
+  remote: .
+  specs:
+    vagrant-export (0.3.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    childprocess (0.5.5)
+      ffi (~> 1.0, >= 1.0.11)
+    erubis (2.7.0)
+    ffi (1.9.7)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.2.3)
+      builder (>= 2.1.2)
+    hashicorp-checkpoint (0.1.4)
+    hitimes (1.2.2)
+    httpclient (2.6.0.1)
+    i18n (0.7.0)
+    listen (2.8.6)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
+    log4r (1.1.10)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    mime-types (2.4.3)
+    mini_portile (0.6.0)
+    multi_json (1.11.0)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    netrc (0.10.3)
+    nokogiri (1.6.3.1-x64-mingw32)
+      mini_portile (= 0.6.0)
+    nori (2.4.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    rest-client (1.7.3-x64-mingw32)
+      ffi (~> 1.9)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rubyntlm (0.4.0)
+    rubyzip (1.1.7)
+    timers (4.0.1)
+      hitimes
+    uuidtools (2.1.5)
+    wdm (0.1.0)
+    winrm (1.3.0)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nori (~> 2.0)
+      rubyntlm (~> 0.4.0)
+      uuidtools (~> 2.1.2)
+    winrm-fs (0.1.0)
+      erubis (~> 2.7)
+      logging (~> 1.6, >= 1.6.1)
+      rubyzip (~> 1.1)
+      winrm (~> 1.3.0)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  vagrant!
+  vagrant-export!

data/Vagrantfile

@@ -0,0 +1,3 @@
+Vagrant.configure('2') do |config|
+  config.vm.box = 'hashicorp/precise32'
+end

data/lib/vagrant-export/command.rb

@@ -33,10 +33,16 @@ module VagrantPlugins
         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])
+          ex = Exporter.new(@env, @logger, machine)
+
+          if File.file?(ex.target_box)
+            require_relative 'error'
+            raise BoxAlreadyExists
+          end
+
+          ex.handle(options[:fast], options[:bare])
         end
         0
       end

data/lib/vagrant-export/error.rb

@@ -0,0 +1,18 @@
+#                                                                       #
+# 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 VirtualboxExportError < Vagrant::Errors::VagrantError
+      error_message('Cannot export Virtualbox machine to appliance')
+    end
+    class BoxAlreadyExists < Vagrant::Errors::VagrantError
+      error_message('A box file for this machine already exists')
+    end
+    class NotCreated < Vagrant::Errors::VagrantError
+      error_message('Cannot export a not created machine. Please make at least one vagrant up')
+    end
+  end
+end

data/lib/vagrant-export/exporter.rb

@@ -4,6 +4,7 @@
 #                                                                       #
 
 require 'fileutils'
+require_relative 'error'
 
 module VagrantPlugins
   module Export
@@ -11,39 +12,59 @@ module VagrantPlugins
 
       # @param env Vagrant::Environment
       # @param logger Log4r::Logger
-      def initialize(env, logger)
+      # @param vm Vagrant::Machine
+      def initialize(env, logger, vm)
+        @vm = vm
         @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
+      def handle(fast, bare)
+        @did_run     = false
+        @private_key = nil
+        @tmp_path    = nil
+        @box_file_name = nil
+
+        if @vm.state.short_description == 'not created'
+          raise VagrantPlugins::Export::NotCreated
+        end
 
-        unless fast
-          if can_compress
-            compress
-          else
-            @vm.ui.error('Cannot compress this type of machine')
-            return 1
+        begin
+          ssh_info = vm.ssh_info
+          unless ssh_info == nil
+            @private_key = ssh_info[:private_key_path]
+          end
+
+          unless fast
+            if can_compress
+              compress
+            else
+              @vm.ui.error('Cannot compress this type of machine')
+              return 1
+            end
           end
-        end
 
-        return 1 unless export
-        return 1 unless files(bare)
+          return 1 unless export
+          return 1 unless files(bare)
 
-        finalize
+          finalize
+        ensure
+          FileUtils.rm_rf(@tmp_path) if Dir.exists?(@tmp_path)
+          FileUtils.rm_rf(@box_file_name) if File.file?(@box_file_name)
+        end
+        target_box
+      end
 
-        @target_box
+      def target_box
+        box_name = @vm.box.name.gsub('/', '_')
+        File.join(@env.cwd, box_name + '.box')
       end
 
       protected
 
-
       def can_compress
         if @vm.state.short_description == 'running'
           @did_run = true
@@ -55,6 +76,12 @@ module VagrantPlugins
         compress_supported = false
 
         if @vm.config.vm.communicator != :winrm
+
+          ssh_info = vm.ssh_info
+          unless ssh_info == nil
+            @private_key = ssh_info[:private_key_path]
+          end
+
           @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
@@ -100,12 +127,19 @@ module VagrantPlugins
       # Shamelessly stolen from Vagrant::Action::General::Package
       def setup_private_key
 
-        # If we don't have a generated private key, we do nothing
+        # Key generated by vagrant
         path = @vm.data_dir.join('private_key')
+
+        # Use a different generated key if configured
+        if @private_key != nil
+          path = File.new(@private_key.to_s, 'r') unless @private_key == Vagrant.source_root.join('keys', 'vagrant')
+        end
+
+        # If we don't have a generated private key, we do nothing
         return unless path.file?
 
         # Copy it into our box directory
-        new_path = File.join(@tmp_path, 'vagrant_private_key')
+        new_path = File.join(@tmp_path, 'private_key')
         @logger.debug("Copy private key from #{path} to #{new_path}")
         FileUtils.cp(path, new_path)
 
@@ -135,12 +169,11 @@ module VagrantPlugins
           @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("../vagrant_private_key", __FILE__)]
+          f.puts %Q[  config.ssh.private_key_path = File.expand_path("../private_key", __FILE__)]
           f.puts %Q[end]
         end
       end
@@ -192,12 +225,34 @@ module VagrantPlugins
           }
 
         else
-          @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
+
+          ovf_file = File.join(exported_path, @vm.box.name.gsub(/[^a-zA-Z0-9]+/, '_')) + '.ovf'
+          vm_id = @vm.id.to_s
+
+          opts = {}
+          opts[:notify] = [:stdout, :stderr]
+
+          @logger.debug("Export #{vm_id} to #{ovf_file}")
+          @env.ui.info('0%', new_line: false)
+
+          Vagrant::Util::Subprocess.execute('VBoxManage', 'export', vm_id, '-o', ovf_file, opts) { |io, data|
+
+            d = data.to_s
+            @logger.debug(d)
+
+            unless io == :stdout
+              if /\d+%/ =~ d
+                @env.ui.clear_line
+                @env.ui.info(d.match(/\d+%/).to_a.pop, new_line: false)
+              else
+                @logger.error(d)
+                raise VirtualboxExportError
+              end
+            end
+          }
         end
 
+        @env.ui.clear_line
         @logger.debug("Exported VM to #{exported_path}")
       end
 
@@ -283,9 +338,41 @@ module VagrantPlugins
         @vm.ui.info('Packaging box file')
 
         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)
+
+          if Vagrant::Util::Which.which('pv') != nil && Vagrant::Util::Which.which('tar') && Vagrant::Util::Which.which('gzip')
+            total_size = 0
+
+            logger.debug('Using custom packaging command to create progress output')
+            @env.ui.info('Starting compression')
+
+            files.each { |f|
+              total_size += File.size(f)
+            }
+
+            @logger.debug("Complete size of files is #{total_size} bytes")
+
+            opts = {}
+            opts[:notify] = [:stderr, :stdout]
+
+            Vagrant::Util::Subprocess.execute('tar', ' -cf - ', *files, ' | pv -n -s ', total_size, ' | gzip -c > ', @box_file_name) { |io, data|
+              d = data.to_s
+
+              if io == :stderr
+                @logger.error(d)
+              else
+                @env.ui.clear_line
+                @env.ui.info(d.match(/\d+/).to_a.pop.to_s + '%')
+              end
+            }
+
+            @env.ui.clear_line
+
+          else
+            Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
+          end
         end
 
         0
@@ -294,15 +381,11 @@ module VagrantPlugins
       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)
-          @vm.ui.info('Created ' + @target_box)
+          target = target_box
+          FileUtils.mv(@box_file_name, target)
+          @vm.ui.info('Created ' + target)
         end
 
-        # Remove the tmp files
-        FileUtils.rm_rf(@tmp_path)
-
         # Resume the machine
         if @did_run
           @vm.ui.info('Bringing the machine back up')

data/lib/vagrant-export/version.rb

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

data/res/cleanup.sh

@@ -15,7 +15,7 @@ done
 
 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}')
+apt-get -qq -y --purge remove $(dpkg --list | egrep '^i' | egrep 'linux-(image(-extra)?|headers)-[0-9]' | awk '{print $3,$2}' | grep -v $(uname -r | sed -e s/-generic//g) | awk '{print $2}')
 
 echo "Cleaning up apt"
 apt-get -qq -y --purge autoremove
@@ -27,6 +27,7 @@ echo "Cleaning up home"
 rm -rf $HOME/.cache
 rm -rf $HOME/.local
 rm -rf $HOME/.npm
+rm -rf $HOME/.composer
 rm -rf $HOME/tmp
 
 if [[ -d /www ]]; then
@@ -37,41 +38,39 @@ else
     DOCROOT="/var/www"
 fi
 
-echo "Cleaning up document root $DOCROOT"
+echo "Cleaning up document root ${DOCROOT}"
 
-if [[ -d $DOCROOT/typo3temp ]]; then
+if [[ -d ${DOCROOT}/typo3temp ]]; then
     echo "Removing TYPO3 CMS temp files"
-    find $DOCROOT/typo3temp -type f -exec rm -f {} \;
-    find $DOCROOT/typo3temp -type d -iname "_processed_" -exec rm -rf {} \; > /dev/null 2>&1
+    find ${DOCROOT}/typo3temp -type f -exec rm -f {} \;
 
-    if [[ -d $DOCROOT/fileadmin/_processed_ ]]; then
-        rm -rf $DOCROOT/fileadmin/_processed_/* > /dev/null 2>&1
+    if [[ -d ${DOCROOT}/fileadmin/_processed_ ]]; then
+        rm -rf ${DOCROOT}/fileadmin/_processed_/* > /dev/null 2>&1
     fi
 fi
 
-if [[ -d $DOCROOT/Data/Temporary ]]; then
+if [[ -d ${DOCROOT}/Data/Temporary ]]; then
     echo "Removing TYPO3 Flow temp files"
-    rm -rf $DOCROOT/Data/Temporary/* > /dev/null 2>&1
+    rm -rf ${DOCROOT}/Data/Temporary/* > /dev/null 2>&1
 fi
 
 if [[ -d /var/www/var/cache ]]; then
     echo "Removing Magento temp files"
-    rm -rf $DOCROOT/downloader/.cache/*
-    rm -rf $DOCROOT/downloader/pearlib/cache/*
-    rm -rf $DOCROOT/downloader/pearlib/download/*
-    rm -rf $DOCROOT/var/cache/*
-    rm -rf $DOCROOT/var/locks/*
-    rm -rf $DOCROOT/var/log/*
-    rm -rf $DOCROOT/var/report/*
-    rm -rf $DOCROOT/var/session/*
-    rm -rf $DOCROOT/var/tmp/*
+    rm -rf ${DOCROOT}/downloader/.cache/*
+    rm -rf ${DOCROOT}/downloader/pearlib/cache/*
+    rm -rf ${DOCROOT}/downloader/pearlib/download/*
+    rm -rf ${DOCROOT}/var/cache/*
+    rm -rf ${DOCROOT}/var/locks/*
+    rm -rf ${DOCROOT}/var/log/*
+    rm -rf ${DOCROOT}/var/report/*
+    rm -rf ${DOCROOT}/var/session/*
+    rm -rf ${DOCROOT}/var/tmp/*
 fi
 
 echo "Zeroing device to make space..."
-dd if=/dev/zero of=/EMPTY bs=1M  > /dev/null 2>&1
+dd if=/dev/zero of=/EMPTY bs=1M > /dev/null 2>&1
+sync
 rm -f /EMPTY
-
-echo "Sync to disc"
 sync
 
 exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Export boxes to .box files including the original Vagrantfile and some
   cleanups inside the VM
@@ -19,9 +19,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - README.md
+- Vagrantfile
 - lib/vagrant-export.rb
 - lib/vagrant-export/command.rb
+- lib/vagrant-export/error.rb
 - lib/vagrant-export/exporter.rb
 - lib/vagrant-export/plugin.rb
 - lib/vagrant-export/version.rb
@@ -47,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Export boxes to .box files including the original Vagrantfile and some cleanups