vagrant-export 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 22ffb620520d9ce8de162db23c13534aaf2c6066
+  data.tar.gz: 9384052c5d82e9e8a6927c660dccf4373758a13f
+SHA512:
+  metadata.gz: 9cc20fffcfe53286ff5900d86a1d17ebc6f8bed5b3263499580273f960a6b90260779c210bb888d17eae989b2a7a5fd61bd4fe42f38d8fbc85ae0749a0bd45b3
+  data.tar.gz: 1f619a25c1733c7eca78d84bef249873ff0f5ebd31d1de98d7b3654a609bf7f4f9d3f20adcd4c8dffa515080b748aa8c45455bd0a367fa018ee4d8d33ffed526

data/lib/vagrant-export/command.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
         ex = Exporter.new(@env, @logger)
 
         with_target_vms argv, reverse: true do |machine|
-          ex.handle machine, options[:fast], options[:bare]
+          ex.handle(machine, options[:fast], options[:bare])
         end
         0
       end

data/lib/vagrant-export/exporter.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
       # @param vm Vagrant::Machine
       # @param fast Boolean
       # @param bare Boolean
-      def handle vm, fast, bare
+      def handle(vm, fast, bare)
         @vm = vm
         @did_run = false
 
@@ -27,16 +27,13 @@ module VagrantPlugins
           if can_compress
             compress
           else
-            @env.uid.error 'Cannot compress this type of machine'
+            @env.uid.error('Cannot compress this type of machine')
             return 1
           end
         end
 
         return 1 unless export
-
-        unless bare
-          return 1 unless files
-        end
+        return 1 unless files(bare)
 
         finalize
       end
@@ -48,14 +45,14 @@ module VagrantPlugins
         if @vm.state.short_description == 'running'
           @did_run = true
         else
-          @env.ui.info 'Machine not running, bringing it up'
-          @vm.action :up
+          @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|
+          @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
@@ -71,25 +68,25 @@ module VagrantPlugins
         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
+        @logger.debug("Uploading #{source_script} to #{target_script}")
+        comm.upload(source_script, target_script)
 
-        sudo comm, "chmod +x #{target_script}"
-        sudo comm, "#{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|
+      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
+              @vm.ui.info(data)
             else
-              @vm.ui.error data
+              @vm.ui.error(data)
             end
           end
         end
@@ -98,56 +95,74 @@ module VagrantPlugins
       def export
         # Halt the machine
         if @vm.state.short_description == 'running'
-          @env.ui.info 'Halting VM for export'
+          @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
+        exported_path = File.join(@env.tmp_path, Time.now.to_i.to_s)
         @tmp_path = exported_path
-        FileUtils.mkpath exported_path
+        FileUtils.mkdir_p(exported_path)
 
-        @env.ui.info I18n.t 'vagrant.actions.vm.export.exporting'
+        @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
+          @env.ui.report_progress(progress.percent, 100, false)
         end
 
-        @logger.debug "Exported VM to #{exported_path}"
+        @logger.debug("Exported VM to #{exported_path}")
       end
 
-      def files
+      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 + '"}'
+          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'
+        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
-          FileUtils.cp_r source_include_path, @tmp_path
+        if Dir.exist?(source_include_path) && !bare
+          FileUtils.cp_r(source_include_path, @tmp_path)
+        end
 
-        # Add the orignal vagrant file as include
-        else
-          FileUtils.mkpath target_include_path
-          Dir.glob(File.join(@vm.box.directory, '**', '*')).each do |file|
-            if file.to_s =~ /Vagrantfile$/
-              FileUtils.cp file.to_s, File.join(target_include_path, '_Vagrantfile')
+        original_vagrantfile = File.join(@vm.box.directory, 'include')
+        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*("|')[a-z0-9]+("|')/i
+              vagrantfile_has_mac = true
             end
-          end
+          }
         end
 
-        # Add the mac address setting as a Vagrantfile
-        File.open(File.join(@tmp_path, 'Vagrantfile'), 'wb') do |f|
-          f.write(Vagrant::Util::TemplateRenderer.render('package_Vagrantfile', {
-              base_mac: @vm.provider.driver.read_mac_address
-          }))
+        # Otherwise, just put 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 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
@@ -163,19 +178,20 @@ 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'
-          File.rename @box_file_name, target_box
+        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
+        FileUtils.rm_rf(@tmp_path)
 
         # Resume the machine
         if @did_run
-          @env.ui.info 'Bringing the machine back up'
-          @vm.action :up
+          @env.ui.info('Bringing the machine back up')
+          @vm.action(:up)
         end
       end
     end

data/lib/vagrant-export/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Export
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/vagrant-export.rb

@@ -3,5 +3,5 @@
 # the terms of the MIT- / X11 - License                                 #
 #                                                                       #
 
-require "vagrant-export/plugin"
-require "vagrant-export/version"
+require 'vagrant-export/plugin'
+require 'vagrant-export/version'

data/res/cleanup.sh

@@ -1,83 +1,50 @@
-#!/bin/bash -eux
+#!/bin/bash
 
-# Removing old kernel packages
+echo "Removing old kernel packages"
 apt-get -y --purge remove $(dpkg --list | grep '^rc' | awk '{print $2}')
 apt-get -y --purge remove $(dpkg --list | egrep 'linux-image-[0-9]' | awk '{print $3,$2}' | sort -nr | tail -n +2 | grep -v $(uname -r) | awk '{ print $2}')
 
-# Cleaning up apt
+echo "Cleaning up apt"
 apt-get -y --purge autoremove
 apt-get -y clean
 rm -rf /var/lib/apt/lists/*
 rm -rf /var/lib/aptitude/*
 
-# Cleaning up home
+echo "Cleaning up home"
 rm -rf $HOME/.cache
 rm -rf $HOME/.local
 rm -rf $HOME/.npm
 rm -rf $HOME/tmp
 
-# Empty TYPO3 CMS temp files
 if [[ -d /var/www/typo3temp ]]; then
+    echo "Empty TYPO3 CMS temp files"
     find /var/www/typo3temp -type f -exec rm -f {} \;
 fi
 
-# Empty Flow temp files
 if [[ -d /var/www/Data/Temporary ]]; then
-    rm -rf /var/www/Data/Temporary
+    echo "Empty TYPO3 Flow temp files"
+    rm -rf /var/www/Data/Temporary/*
 fi
 
-
-# Empty Magento temp files
 if [[ -d /var/www/downloader/.cache ]]; then
+    echo "Empty Magento temp files"
     rm -rf /var/www/downloader/.cache/*
-fi
-
-if [[ -d /var/www/downloader/pearlib/cache ]]; then
     rm -rf /var/www/downloader/pearlib/cache/*
-fi
-
-if [[ -d /var/www/downloader/pearlib/download ]]; then
     rm -rf /var/www/downloader/pearlib/download/*
-fi
-
-if [[ -d /var/www/var/cache ]]; then
     rm -rf /var/www/var/cache/*
-fi
-
-if [[ -d /var/www/var/locks ]]; then
     rm -rf /var/www/var/locks/*
-fi
-
-if [[ -d /var/www/var/log ]]; then
     rm -rf /var/www/var/log/*
-fi
-
-if [[ -d /var/www/var/report ]]; then
     rm -rf /var/www/var/report/*
-fi
-
-if [[ -d /var/www/var/cache ]]; then
-    rm -rf /var/www/var/cache/*
-fi
-
-if [[ -d /var/www/var/session ]]; then
     rm -rf /var/www/var/session/*
-fi
-
-if [[ -d /var/www/var/tmp ]]; then
     rm -rf /var/www/var/tmp/*
 fi
 
-
-# Empty tmp
-rm -rf /tmp/*
-
-# Make sure we sync before the next step
+echo "Sync to disc"
 sync
 
-# Zero out the free space to save space in the final image:
 echo "Zeroing device to make space..."
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
+echo "Exit happily"
 exit 0

data/vagrant-export.gemspec

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path("../lib", __FILE__)
+$:.unshift(File.expand_path('../lib', __FILE__))
 
 require 'vagrant-export/version'
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-export
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Georg Großberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Export boxes to .box files including the original Vagrantfile and some
   cleanups inside the VM
@@ -18,39 +17,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - lib/vagrant-export.rb
-- lib/vagrant-export/exporter.rb
-- lib/vagrant-export/version.rb
 - lib/vagrant-export/command.rb
+- lib/vagrant-export/exporter.rb
 - lib/vagrant-export/plugin.rb
-- vagrant-export.gemspec
+- lib/vagrant-export/version.rb
 - res/cleanup.sh
-- .gitignore
+- vagrant-export.gemspec
 homepage: https://github.com/trenker/vagrant-export
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Export boxes to .box files including the original Vagrantfile and some cleanups
   inside the VM
 test_files: []