vagrant-mutate 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.4 (2014-01-23)
+* Generate new vagrantfiles instead of copying them
+* Set disk bus when converting to vagrant-libvirt (#41)
+
 # 0.2.3 (2014-01-20)
 * Warn when qemu version cannot read vmdk3 files (#29)
 * Fix errors in how box name and provider were parsed (#35)

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

@@ -1,4 +1,5 @@
 require_relative 'box'
+require 'rexml/document'
 
 module VagrantMutate
   module Box
@@ -14,9 +15,19 @@ module VagrantMutate
       end
 
       # TODO implement these methods
-      # architecture, mac_address, cpus, memor, disk_interface
+      # architecture, mac_address, cpus, memory
       # to support converting to providers besides libvirt
 
+      def disk_interface
+        domain_file = File.join( @dir, 'box.xml' )
+        begin
+          domain = REXML::Document.new( File.read(domain_file) )
+          domain.elements['/domain/devices/disk/target'].attributes['bus']
+        rescue => e
+          raise Errors::BoxAttributeError, :error_message => e.message
+        end
+      end
+
     end
   end
 end

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

@@ -11,6 +11,7 @@ module VagrantMutate
         @supported_output = true
         @image_format     = 'qcow2'
         @image_name       = 'box.img'
+        @mac              = nil
       end
 
       # since none of below can be determined from the box
@@ -22,8 +23,11 @@ module VagrantMutate
 
       # kvm prefix is 52:54:00
       def mac_address
-        octets = 3.times.map { rand(255).to_s(16) }
-        return "52:54:00:#{octets[0]}:#{octets[1]}:#{octets[2]}"
+        unless @mac
+          octets = 3.times.map { rand(255).to_s(16) }
+          @mac = "525400#{octets[0]}#{octets[1]}#{octets[2]}"
+        end
+        return @mac
       end
 
       def cpus

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

@@ -34,7 +34,7 @@ module VagrantMutate
 
         ovf.elements.each("//vbox:Machine/Hardware//Adapter") do |ele|
           if ele.attributes['enabled'] == 'true'
-            mac = format_mac( ele.attributes['MACAddress'] )
+            mac = ele.attributes['MACAddress']
             break
           end
         end
@@ -118,11 +118,6 @@ module VagrantMutate
         end
       end
 
-      # convert to more standard format with colons
-      def format_mac(mac)
-        mac.scan(/(.{2})/).join(':')
-      end
-
       # Takes a quantity and a unit
       # returns quantity in bytes
       # mib = true to use mebibytes, etc

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

@@ -34,14 +34,13 @@ module VagrantMutate
 
         @input_box.verify_format
         write_metadata
-        copy_vagrantfile
+        write_vagrantfile
         write_specific_files
         write_disk
       end
 
       private
 
-
       def write_metadata
         metadata = generate_metadata
         begin
@@ -54,17 +53,18 @@ module VagrantMutate
         @logger.info "Wrote metadata"
       end
 
-      def copy_vagrantfile
-        input = File.join( @input_box.dir, 'Vagrantfile' )
-        if File.exists? input
-          output = File.join( @output_box.dir, 'Vagrantfile' )
-          @logger.info "Copying #{input} to #{output}"
-          begin
-            FileUtils.copy_file(input, output)
-          rescue => e
-            raise Errors::WriteVagrantfileFailed, :error_message => e.message
+      def write_vagrantfile
+        body = generate_vagrantfile
+        begin
+          File.open( File.join( @output_box.dir, 'Vagrantfile'), 'w') do |f|
+            f.puts( 'Vagrant.configure("2") do |config|' )
+            f.puts( body )
+            f.puts( 'end' )
           end
+        rescue => e
+          raise Errors::WriteVagrantfileFailed, :error_message => e.message
         end
+        @logger.info "Wrote vagrantfile"
       end
 
       def write_disk

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

@@ -10,6 +10,10 @@ module VagrantMutate
         }
       end
 
+      def generate_vagrantfile
+        "  config.vm.base_mac = '#{@input_box.mac_address}'"
+      end
+
       def write_specific_files
         template_path = VagrantMutate.source_root.join('templates', 'kvm', 'box.xml.erb')
         template = File.read(template_path)
@@ -24,7 +28,7 @@ module VagrantMutate
         name = @input_box.name
         memory = @input_box.memory / 1024 # convert bytes to kib
         cpus = @input_box.cpus
-        mac = @input_box.mac_address
+        mac = format_mac( @input_box.mac_address )
         arch = @input_box.architecture
 
         qemu_bin = find_kvm
@@ -48,6 +52,11 @@ module VagrantMutate
         return qemu_bin
       end
 
+      # convert to format with colons
+      def format_mac(mac)
+        mac.scan(/(.{2})/).join(':')
+      end
+
     end
   end
 end

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

@@ -10,6 +10,14 @@ module VagrantMutate
         }
       end
 
+      def generate_vagrantfile
+        <<-EOF
+        config.vm.provider :libvirt do |libvirt|
+          libvirt.disk_bus = '#{@input_box.disk_interface}'
+        end
+        EOF
+      end
+
       def write_specific_files
         # nothing to do here
       end

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/test/expected_output/kvm/libvirt/Vagrantfile

@@ -1,11 +1,5 @@
-Vagrant::Config.run do |config|
-  # This Vagrantfile is auto-generated by `vagrant package` to contain
-  # the MAC address of the box. Custom configuration should be placed in
-  # the actual `Vagrantfile` in this box.
-  config.vm.base_mac = "08002755B88D"
+Vagrant.configure("2") do |config|
+        config.vm.provider :libvirt do |libvirt|
+          libvirt.disk_bus = 'virtio'
+        end
 end
-
-# Load include vagrant file if it exists after the auto-generated
-# so it can override any of the settings
-include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
-load include_vagrantfile if File.exist?(include_vagrantfile)

data/test/expected_output/libvirt/kvm/Vagrantfile

@@ -1,11 +1,3 @@
-Vagrant::Config.run do |config|
-  # This Vagrantfile is auto-generated by `vagrant package` to contain
-  # the MAC address of the box. Custom configuration should be placed in
-  # the actual `Vagrantfile` in this box.
-  config.vm.base_mac = "08002755B88D"
+Vagrant.configure("2") do |config|
+  config.vm.base_mac = '525400cbb280'
 end
-
-# Load include vagrant file if it exists after the auto-generated
-# so it can override any of the settings
-include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
-load include_vagrantfile if File.exist?(include_vagrantfile)

data/test/expected_output/virtualbox/kvm/Vagrantfile

@@ -1,11 +1,3 @@
-Vagrant::Config.run do |config|
-  # This Vagrantfile is auto-generated by `vagrant package` to contain
-  # the MAC address of the box. Custom configuration should be placed in
-  # the actual `Vagrantfile` in this box.
-  config.vm.base_mac = "08002755B88D"
+Vagrant.configure("2") do |config|
+  config.vm.base_mac = '08002755B88D'
 end
-
-# Load include vagrant file if it exists after the auto-generated
-# so it can override any of the settings
-include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
-load include_vagrantfile if File.exist?(include_vagrantfile)

data/test/expected_output/virtualbox/libvirt/Vagrantfile

@@ -1,11 +1,5 @@
-Vagrant::Config.run do |config|
-  # This Vagrantfile is auto-generated by `vagrant package` to contain
-  # the MAC address of the box. Custom configuration should be placed in
-  # the actual `Vagrantfile` in this box.
-  config.vm.base_mac = "08002755B88D"
+Vagrant.configure("2") do |config|
+        config.vm.provider :libvirt do |libvirt|
+          libvirt.disk_bus = 'sata'
+        end
 end
-
-# Load include vagrant file if it exists after the auto-generated
-# so it can override any of the settings
-include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
-load include_vagrantfile if File.exist?(include_vagrantfile)

data/test/test.rb

@@ -34,11 +34,14 @@ end
 def derandomize_output(input, output_dir)
   if input == 'libvirt'
     if File.split(output_dir).last == 'kvm'
-      path = File.join(output_dir, 'box.xml')
-      contents = File.read(path)
-      contents.gsub!(/52:54:00:[0-9a-f:]+/, '52:54:00:cb:b2:80')
-      File.open(path, 'w') do |f|
-        f.write(contents)
+      ['box.xml', 'Vagrantfile'].each do |f|
+        path = File.join(output_dir, f)
+        contents = File.read(path)
+        contents.gsub!(/52:54:00:[0-9a-f:]+/, '52:54:00:cb:b2:80')
+        contents.gsub!(/525400[0-9a-f]+/, '525400cbb280')
+        File.open(path, 'w') do |f|
+          f.write(contents)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler