vagrant-mutate 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d95a6ed26edca3fd9acfc503fac048f3f5e895b
-  data.tar.gz: 011568c7558b966ffd0559f5732d1defd027ba8d
+  metadata.gz: db1c439fc85325283fe530d325f2b5da691903c6
+  data.tar.gz: 8d7fcc03d6d5415b56c9cc0cdc136d305d676f1e
 SHA512:
-  metadata.gz: e1f6285665108a943b5d6c913aa32e4c92b46146869b896f7402d8af3a376e197ff6c027ebb3d0f2f671990658f30a78742076671184b211c761b8004f96ee30
-  data.tar.gz: ebb8c38126842b3f19122e201501fe87e32bd57f4f6600c683d1d5be5eb8c143703ac19ca166ae975416046f4fa2695e0358aa63ed5a3d7b34874a03794b71da
+  metadata.gz: ad16f50d0c9cfd2882e5976b994af9ba7bff1313765b22bbac08180c99d9c29f34e690cfb001d47406afaf94f4b5a77afc9dca85e1982d0bb1ec10bcb123b7aa
+  data.tar.gz: fee91995f7fc4abe26638233a10fc1ad90851963af01154c8de7194218ab03ebe2e7498b94d9a89b6c2ba0994a662c628f8db7123920e627d8f49a7b44ffccfc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.0 (2016-08-15)
+* Add support for converting to bhyve (#86)
+
 # 1.1.1 (2016-02-24)
 * Add option to force use of virtio for disks (#82)
 

data/README.md

@@ -6,16 +6,13 @@ Vagrant-mutate is a vagrant plugin to convert vagrant boxes to work with differe
 
 * Virtualbox to kvm
 * Virtualbox to libvirt
+* Virtualbox to bhyve
 * Libvirt to kvm
 * Kvm to libvirt
 
 ## Compatibility
 
-Throughout its development vagrant-mutate has been tested against the following versions. It may work with other versions too. Note that Vagrant-mutate 0.3 and later requires Vagrant 1.5. If you are using an older vagrant, install vagrant-mutate version 0.2.6.
-
-* [vagrant](http://www.vagrantup.com) 1.3.5, 1.4.3, and 1.5.4
-* [vagrant-kvm](https://github.com/adrahon/vagrant-kvm) 0.1.4
-* [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt) 0.0.11
+Vagrant-mutate 0.3 and later requires Vagrant 1.5. If you are using an older vagrant, install vagrant-mutate version 0.2.6.
 
 ## Installation
 
@@ -25,7 +22,7 @@ First, you must install [qemu-img](http://wiki.qemu.org/Main_Page) and the libvi
 
 #### Debian and derivatives
 
-    apt-get install qemu-utils libvirt-dev
+    apt-get install qemu-utils libvirt-dev ruby-dev
 
 #### Red Hat and derivatives
 

data/lib/vagrant-mutate.rb

@@ -6,6 +6,20 @@ module VagrantMutate
     @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
   end
 
+  # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+  def self.find_bin(bin)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each do |ext|
+        exe = File.join(path, "#{bin}#{ext}")
+        if File.executable? exe
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+    end
+    return nil
+  end
+
   class Plugin < Vagrant.plugin('2')
     name 'vagrant-mutate'
 

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

@@ -0,0 +1,19 @@
+require_relative 'box'
+
+module VagrantMutate
+  module Box
+    class Bhyve < Box
+      def initialize(env, name, version, dir)
+        super
+        @provider_name    = 'bhyve'
+        @supported_input  = true
+        @supported_output = true
+        @image_format     = 'raw'
+        @image_name       = 'disk.img'
+      end
+
+      # TODO
+
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 require_relative 'box'
-require 'rexml/document'
+require 'nokogiri'
 
 module VagrantMutate
   module Box
@@ -20,8 +20,8 @@ module VagrantMutate
       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']
+          domain = File.open(domain_file) { |f| Nokogiri::XML(f) }
+          domain.xpath("//*[local-name()='domain']/*[local-name()='devices']/*[local-name()='disk']/*[local-name()='target']").attribute('bus')
         rescue => e
           raise Errors::BoxAttributeError, error_message: e.message
         end

data/lib/vagrant-mutate/box_loader.rb

@@ -137,6 +137,9 @@ module VagrantMutate
     def create_box(provider_name, name, version, dir)
       @logger.info "Creating box #{name} with provider #{provider_name} and version #{version} in #{dir}"
       case provider_name
+      when 'bhyve'
+        require_relative 'box/bhyve'
+        Box::Bhyve.new(@env, name, version, dir)
       when 'kvm'
         require_relative 'box/kvm'
         Box::Kvm.new(@env, name, version, dir)

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

@@ -0,0 +1,40 @@
+require 'erb'
+
+module VagrantMutate
+  module Converter
+    class Bhyve < Converter
+      def generate_metadata
+
+        output_name = File.join(@output_box.dir, @output_box.image_name).shellescape
+
+        file_output = `file #{output_name}`
+
+        if file_output.include? "GRUB"
+         loader = "grub-bhyve"
+        else
+         loader = "bhyveload"
+        end
+
+        {
+          "provider" => @output_box.provider_name,
+        }
+      end
+
+      def generate_vagrantfile
+        memory = @input_box.memory / 1024 / 1024 # convert bytes to mebibytes
+        cpus = @input_box.cpus
+        <<-EOF
+        config.vm.provider :bhyve do |vm|
+          vm.memory = "#{memory}M"
+          vm.cpus = "#{cpus}"
+        end
+        EOF
+      end
+
+      def write_specific_files
+        # nothing yet
+      end
+
+    end
+  end
+end

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

@@ -6,6 +6,9 @@ module VagrantMutate
     class Converter
       def self.create(env, input_box, output_box, force_virtio='false')
       case output_box.provider_name
+        when 'bhyve'
+          require_relative 'bhyve'
+          Bhyve.new(env, input_box, output_box)
         when 'kvm'
           require_relative 'kvm'
           Kvm.new(env, input_box, output_box)
@@ -34,10 +37,10 @@ module VagrantMutate
           "to #{@output_box.provider_name}."
 
         @input_box.verify_format
+        write_disk
         write_metadata
         write_vagrantfile
         write_specific_files
-        write_disk
       end
 
       private
@@ -97,7 +100,9 @@ module VagrantMutate
         qemu_options = '-p -S 16k'
         qemu_version = Qemu.qemu_version()
         if qemu_version >= Gem::Version.new('1.1.0')
-          qemu_options += ' -o compat=1.1'
+          if output_format == 'qcow2'
+            qemu_options += ' -o compat=1.1'
+          end
         end
 
         command = "qemu-img convert #{qemu_options} -O #{output_format} #{input_file} #{output_file}"

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

@@ -43,15 +43,22 @@ module VagrantMutate
       private
 
       def find_kvm
-        qemu_bin_list = ['/usr/bin/qemu-system-x86_64',
-                         '/usr/bin/qemu-system-i386',
-                         '/usr/bin/qemu-kvm',
-                         '/usr/libexec/qemu-kvm',
-                         '/usr/bin/kvm']
-        qemu_bin = qemu_bin_list.find { |binary| File.exist? binary }
+        qemu_bin = nil
+
+        qemu_bin_list = ['qemu-system-x86_64',
+                         'qemu-system-i386',
+                         'qemu-kvm',
+                         'kvm']
+        logger = Log4r::Logger.new('vagrant::mutate')
+        qemu_bin_list.each do |qemu|
+          qemu_bin = VagrantMutate.find_bin(qemu)
+          break
+        end
+
         unless qemu_bin
           fail Errors::QemuNotFound
         end
+        logger.info 'Found qemu_bin: ' + qemu_bin
         qemu_bin
       end
 

data/lib/vagrant-mutate/qemu.rb

@@ -1,20 +1,14 @@
 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
+      qemu_img_bin = nil
       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
+      qemu_img_bin = VagrantMutate.find_bin("qemu-img")
+      unless qemu_img_bin
+        fail Errors::QemuImgNotFound
       end
-      # if we make it here qemu-img command was not found
-      fail Errors::QemuImgNotFound
+      logger.info 'Found qemu-img: ' + qemu_img_bin
+      qemu_img_bin
     end
 
     def self.qemu_version()

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/expected_output/virtualbox/bhyve/Vagrantfile

@@ -0,0 +1,6 @@
+Vagrant.configure("2") do |config|
+        config.vm.provider :bhyve do |vm|
+          vm.memory = "256M"
+          vm.cpus = "1"
+        end
+end

data/test/expected_output/virtualbox/bhyve/metadata.json

@@ -0,0 +1 @@
+{"provider":"bhyve"}

data/test/test.rb

@@ -89,7 +89,7 @@ end
 cleanup
 ensure_pkg_dir
 build_plugin
-failures = test('virtualbox', %w(kvm libvirt))
+failures = test('virtualbox', %w(kvm libvirt bhyve))
 failures += test('libvirt', ['kvm'])
 failures += test('kvm', ['libvirt'])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brian Pitts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,11 +52,13 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-mutate.rb
+- lib/vagrant-mutate/box/bhyve.rb
 - lib/vagrant-mutate/box/box.rb
 - lib/vagrant-mutate/box/kvm.rb
 - lib/vagrant-mutate/box/libvirt.rb
 - lib/vagrant-mutate/box/virtualbox.rb
 - lib/vagrant-mutate/box_loader.rb
+- lib/vagrant-mutate/converter/bhyve.rb
 - lib/vagrant-mutate/converter/converter.rb
 - lib/vagrant-mutate/converter/kvm.rb
 - lib/vagrant-mutate/converter/libvirt.rb
@@ -73,6 +75,9 @@ files:
 - test/expected_output/libvirt/kvm/box-disk1.img
 - test/expected_output/libvirt/kvm/box.xml
 - test/expected_output/libvirt/kvm/metadata.json
+- test/expected_output/virtualbox/bhyve/Vagrantfile
+- test/expected_output/virtualbox/bhyve/disk.img
+- test/expected_output/virtualbox/bhyve/metadata.json
 - test/expected_output/virtualbox/kvm/Vagrantfile
 - test/expected_output/virtualbox/kvm/box-disk1.img
 - test/expected_output/virtualbox/kvm/box.xml
@@ -117,6 +122,9 @@ test_files:
 - test/expected_output/libvirt/kvm/box-disk1.img
 - test/expected_output/libvirt/kvm/box.xml
 - test/expected_output/libvirt/kvm/metadata.json
+- test/expected_output/virtualbox/bhyve/Vagrantfile
+- test/expected_output/virtualbox/bhyve/disk.img
+- test/expected_output/virtualbox/bhyve/metadata.json
 - test/expected_output/virtualbox/kvm/Vagrantfile
 - test/expected_output/virtualbox/kvm/box-disk1.img
 - test/expected_output/virtualbox/kvm/box.xml