vagrant-mutate 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9f5739877315cbc00036f84ac76e697884eff45
-  data.tar.gz: f0dfedb7bf667667c9a81b3a6a8fb0425ab2f838
+  metadata.gz: d61d3a19b58fbf87b0c6dea226cceab60232c299
+  data.tar.gz: 8af3f8b241f7d525981d7682db1790f866596c3b
 SHA512:
-  metadata.gz: a17e8ea3d61dbca0bf7369ebf49ca273f14eaabb78930c6da9d0522cfd645c72512532995bfddb2bd119518e3ebbec6fd14671cb7bd7040d168a58b89a61f319
-  data.tar.gz: 9e6dc28b36f05489d755c7b16867d932a119ccef32b4d9e893c4584c91f8adfa466e6a1b9a4cc04e5b7110245cb9a76eedcc1fa16695df51cb790cc2bb6f8896
+  metadata.gz: ae8e9f694743c23db4c9703575fdae3401976f0482fbc11f34004995eca212b8ab8493d5fa8784ec2783695930ad0ebf5df88adba775bddbcb411840569a5f87
+  data.tar.gz: d4f9c7b7cdccb175da5c729853dab37806255972cf356990c355146cc8999e30da1fa1a3ccd1ef9397fa0e429cc9c8f3a38d415944f1432a45b24f2644c571af

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.3 (2015-10-15)
+* Fix compatibility with qemu version in EL6 (#76)
+
 # 1.0.2 (2015-09-06)
 * Allow period in box name when loading from URL (#75)
 

data/README.md

@@ -29,7 +29,7 @@ First, you must install [qemu-img](http://wiki.qemu.org/Main_Page) and the libvi
 
 #### Red Hat and derivatives
 
-    yum install qemu-img libvirt-devel ruby-libvirt
+    yum install qemu-img libvirt-devel ruby-libvirt ruby-devel
 
 #### OS X
 

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

@@ -93,8 +93,12 @@ module VagrantMutate
         # p for progress bar
         # S for sparse file
         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'
+        end
 
-        command = "qemu-img convert #{qemu_options} -O #{output_format} -o compat=1.1 #{input_file} #{output_file}"
+        command = "qemu-img convert #{qemu_options} -O #{output_format} #{input_file} #{output_file}"
         @logger.info "Running #{command}"
         unless system(command)
           fail Errors::WriteDiskFailed, error_message: "qemu-img exited with status #{$CHILD_STATUS.exitstatus}"

data/lib/vagrant-mutate/qemu.rb

@@ -17,22 +17,26 @@ module VagrantMutate
       fail Errors::QemuImgNotFound
     end
 
-    def self.verify_qemu_version(env)
+    def self.qemu_version()
       usage = `qemu-img --version`
       if usage =~ /(\d+\.\d+\.\d+)/
-        installed_version = Gem::Version.new(Regexp.last_match[1])
-        # less than 1.2 or equal to 1.6.x
-        if installed_version < Gem::Version.new('1.2.0') or (installed_version >= Gem::Version.new('1.6.0') and installed_version < Gem::Version.new('1.7.0'))
-
-          env.ui.warn "You have qemu #{installed_version} installed. "\
-            'This version cannot read some virtualbox boxes. '\
-            'If conversion fails, see below for recommendations. '\
-            'https://github.com/sciurus/vagrant-mutate/wiki/QEMU-Version-Compatibility'
-
-        end
+        return Gem::Version.new(Regexp.last_match[1])
       else
         fail Errors::ParseQemuVersionFailed
       end
     end
+
+    def self.verify_qemu_version(env)
+      installed_version = qemu_version()
+      # less than 1.2 or equal to 1.6.x
+      if installed_version < Gem::Version.new('1.2.0') or (installed_version >= Gem::Version.new('1.6.0') and installed_version < Gem::Version.new('1.7.0'))
+
+        env.ui.warn "You have qemu #{installed_version} installed. "\
+          'This version cannot read some virtualbox boxes. '\
+          'If conversion fails, see below for recommendations. '\
+          'https://github.com/sciurus/vagrant-mutate/wiki/QEMU-Version-Compatibility'
+
+      end
+    end
   end
 end

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brian Pitts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler