vagrant-mutate 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.2 (2014-01-05)
+* Determine virtualbox disk filename from ovf (#30)
+* Move Qemu checks to own class
+
 # 0.2.1 (2014-01-02)
 * Support kvm as input (#17)
 

data/lib/vagrant-mutate/box/box.rb

@@ -12,7 +12,7 @@ module VagrantMutate
       end
 
       def virtual_size
-        input_file = File.join( @dir, @image_name )
+        input_file = File.join( @dir, image_name )
         info = `qemu-img info #{input_file}`
         @logger.debug "qemu-img info output\n#{info}"
         if info =~ /(\d+) bytes/

data/lib/vagrant-mutate/box/virtualbox.rb

@@ -11,7 +11,11 @@ module VagrantMutate
         @supported_input  = true
         @supported_output = false
         @image_format     = 'vmdk'
-        @image_name       = 'box-disk1.vmdk'
+      end
+
+      # this is usually box-disk1.vmdk but some tools like packer customize it
+      def image_name
+        ovf.elements['//References/File'].attributes['ovf:href']
       end
 
       # the architecture is not defined in the ovf file,

data/lib/vagrant-mutate/box_loader.rb

@@ -13,23 +13,6 @@ module VagrantMutate
       @tmp_files = []
     end
 
-    def create_box(provider_name, name, dir)
-        @logger.info "Creating box #{name} with provider #{provider_name} in #{dir}"
-        case provider_name
-        when 'kvm'
-          require_relative 'box/kvm'
-          Box::Kvm.new(@env, name, dir)
-        when 'libvirt'
-          require_relative 'box/libvirt'
-          Box::Libvirt.new(@env, name, dir)
-        when 'virtualbox'
-          require_relative 'box/virtualbox'
-          Box::Virtualbox.new(@env, name, dir)
-        else
-          raise Errors::ProviderNotSupported, :provider => provider_name, :direction => 'input or output'
-        end
-    end
-
     def prepare_for_output(name, provider_name)
       @logger.info "Preparing #{name} for output as #{provider_name}"
       dir = create_output_dir(name, provider_name)
@@ -128,6 +111,51 @@ module VagrantMutate
 
     private
 
+    def create_box(provider_name, name, dir)
+        @logger.info "Creating box #{name} with provider #{provider_name} in #{dir}"
+        case provider_name
+        when 'kvm'
+          require_relative 'box/kvm'
+          Box::Kvm.new(@env, name, dir)
+        when 'libvirt'
+          require_relative 'box/libvirt'
+          Box::Libvirt.new(@env, name, dir)
+        when 'virtualbox'
+          require_relative 'box/virtualbox'
+          Box::Virtualbox.new(@env, name, dir)
+        else
+          raise Errors::ProviderNotSupported, :provider => provider_name, :direction => 'input or output'
+        end
+    end
+
+    def create_output_dir(name, provider_name)
+      # e.g. $HOME/.vagrant.d/boxes/fedora-19/libvirt
+      out_dir = File.join( @env.boxes_path, name, provider_name )
+      begin
+        FileUtils.mkdir_p(out_dir)
+      rescue => e
+        raise Errors::CreateBoxDirFailed, :error_message => e.message
+      end
+      @logger.info "Created output directory #{out_dir}"
+      return out_dir
+    end
+
+    def unpack(file)
+      @env.ui.info "Extracting box file to a temporary directory."
+      unless File.exists? file
+        raise Errors::BoxNotFound, :box => file
+      end
+      tmp_dir = Dir.mktmpdir(nil, @env.tmp_path)
+      @tmp_files << tmp_dir
+      result = Vagrant::Util::Subprocess.execute(
+       "bsdtar", "-v", "-x", "-m", "-C", tmp_dir.to_s, "-f", file)
+      if result.exit_code != 0
+        raise Errors::ExtractBoxFailed, :error_message => result.stderr.to_s
+      end
+      @logger.info "Unpacked box to #{tmp_dir}"
+      return tmp_dir
+    end
+
     def determine_provider(dir)
       metadata_file = File.join(dir, 'metadata.json')
       if File.exists? metadata_file
@@ -154,6 +182,16 @@ module VagrantMutate
       end
     end
 
+    def verify_input_dir(provider_name, name)
+      input_dir = File.join( @env.boxes_path, name, provider_name)
+      if File.directory?(input_dir)
+        @logger.info "Found input directory #{input_dir}"
+        return input_dir
+      else
+        raise Errors::BoxNotFound, :box => input_dir
+      end
+    end
+
     def find_input_dir(name)
       box_parent_dir = File.join( @env.boxes_path, name)
 
@@ -177,43 +215,5 @@ module VagrantMutate
       end
     end
 
-    def verify_input_dir(provider_name, name)
-      input_dir = File.join( @env.boxes_path, name, provider_name)
-      if File.directory?(input_dir)
-        @logger.info "Found input directory #{input_dir}"
-        return input_dir
-      else
-        raise Errors::BoxNotFound, :box => input_dir
-      end
-    end
-
-    def create_output_dir(name, provider_name)
-      # e.g. $HOME/.vagrant.d/boxes/fedora-19/libvirt
-      out_dir = File.join( @env.boxes_path, name, provider_name )
-      begin
-        FileUtils.mkdir_p(out_dir)
-      rescue => e
-        raise Errors::CreateBoxDirFailed, :error_message => e.message
-      end
-      @logger.info "Created output directory #{out_dir}"
-      return out_dir
-    end
-
-    def unpack(file)
-      @env.ui.info "Extracting box file to a temporary directory."
-      unless File.exists? file
-        raise Errors::BoxNotFound, :box => file
-      end
-      tmp_dir = Dir.mktmpdir(nil, @env.tmp_path)
-      @tmp_files << tmp_dir
-      result = Vagrant::Util::Subprocess.execute(
-       "bsdtar", "-v", "-x", "-m", "-C", tmp_dir.to_s, "-f", file)
-      if result.exit_code != 0
-        raise Errors::ExtractBoxFailed, :error_message => result.stderr.to_s
-      end
-      @logger.info "Unpacked box to #{tmp_dir}"
-      return tmp_dir
-    end
-
   end
 end

data/lib/vagrant-mutate/converter/converter.rb

@@ -22,8 +22,6 @@ module VagrantMutate
         @input_box  = input_box
         @output_box = output_box
         @logger = Log4r::Logger.new('vagrant::mutate')
-        verify_qemu_installed
-        verify_qemu_version
       end
 
       def convert()
@@ -42,37 +40,6 @@ module VagrantMutate
 
       private
 
-      # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-      def verify_qemu_installed
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = File.join(path, "qemu-img#{ext}")
-            if File.executable? exe
-              @logger.info "Found qemu"
-              return
-            end
-          end
-        end
-        # if we make it here qemu-img command was not found
-        raise Errors::QemuNotFound
-      end
-
-      def verify_qemu_version
-        usage = `qemu-img`
-        if usage =~ /(\d+\.\d+\.\d+)/
-          recommended_version = Gem::Version.new('1.2.0')
-          installed_version = Gem::Version.new($1)
-          if installed_version < recommended_version
-            @env.ui.warn "You have qemu #{installed_version} installed. "\
-              "This version is too old to read some virtualbox boxes. "\
-              "If conversion fails, try upgrading to qemu 1.2.0 or newer."
-          end
-        else
-          raise Errors::ParseQemuVersionFailed
-        end
-      end
-
 
       def write_metadata
         metadata = generate_metadata

data/lib/vagrant-mutate/mutate.rb

@@ -1,4 +1,5 @@
 require 'vagrant-mutate/box_loader'
+require 'vagrant-mutate/qemu'
 require 'vagrant-mutate/converter/converter'
 
 module VagrantMutate
@@ -20,6 +21,9 @@ module VagrantMutate
       box_arg = argv[0]
       output_provider_arg = argv[1]
 
+      Qemu.verify_qemu_installed
+      Qemu.verify_qemu_version(@env)
+
       input_loader  = BoxLoader.new(@env)
       input_box = input_loader.load(box_arg)
 

data/lib/vagrant-mutate/qemu.rb

@@ -0,0 +1,37 @@
+module VagrantMutate
+  class Qemu
+
+      # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+      def self.verify_qemu_installed
+        logger = Log4r::Logger.new('vagrant::mutate')
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "qemu-img#{ext}")
+            if File.executable? exe
+              logger.info "Found qemu"
+              return
+            end
+          end
+        end
+        # if we make it here qemu-img command was not found
+        raise Errors::QemuNotFound
+      end
+
+      def self.verify_qemu_version(env)
+        usage = `qemu-img`
+        if usage =~ /(\d+\.\d+\.\d+)/
+          recommended_version = Gem::Version.new('1.2.0')
+          installed_version = Gem::Version.new($1)
+          if installed_version < recommended_version
+            env.ui.warn "You have qemu #{installed_version} installed. "\
+              "This version is too old to read some virtualbox boxes. "\
+              "If conversion fails, try upgrading to qemu 1.2.0 or newer."
+          end
+        else
+          raise Errors::ParseQemuVersionFailed
+        end
+      end
+
+  end
+end

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - lib/vagrant-mutate/converter/libvirt.rb
 - lib/vagrant-mutate/errors.rb
 - lib/vagrant-mutate/mutate.rb
+- lib/vagrant-mutate/qemu.rb
 - lib/vagrant-mutate/version.rb
 - locales/en.yml
 - templates/kvm/box.xml.erb