vagrant-mutate 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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)
+* Load box from file based on existence not name (#36)
+* Warn when image is not the expected type for the provider (#38)
+
 # 0.2.2 (2014-01-05)
 * Determine virtualbox disk filename from ovf (#30)
 * Move Qemu checks to own class

data/README.md

@@ -21,7 +21,7 @@ Vagrant-mutate has been tested against the following versions. It may work with
 
 ### qemu-img
 
-First, you must install [qemu-img](http://wiki.qemu.org/Main_Page). Support for the disk image format most commonly used in vagrant boxes for virtualbox was added in [version 1.2.0](http://wiki.qemu.org/ChangeLog/1.2#VMDK); if you have an older version vagrant-mutate will warn you and most likely won't work.
+First, you must install [qemu-img](http://wiki.qemu.org/Main_Page). Information on supported versions is listed at [QEMU Version Compatibility](https://github.com/sciurus/vagrant-mutate/wiki/QEMU-Version-Compatibility).
 
 #### Debian and derivatives
 

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

@@ -12,13 +12,25 @@ module VagrantMutate
       end
 
       def virtual_size
+        extract_from_qemu_info( /(\d+) bytes/ )
+      end
+
+      def verify_format
+        format_found = extract_from_qemu_info( /file format: (\w+)/ )
+        unless format_found == @image_format
+          @env.ui.warn "Expected input image format to be #{@image_format} but "\
+            "it is #{format_found}. Attempting conversion anyway."
+        end
+      end
+
+      def extract_from_qemu_info(expression)
         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/
+        if info =~ expression
           return $1
         else
-          raise Errors::DetermineImageSizeFailed
+          raise Errors::QemuInfoFailed
         end
       end
 

data/lib/vagrant-mutate/box_loader.rb

@@ -28,7 +28,7 @@ module VagrantMutate
     def load(box_arg)
       if box_arg =~ /:\/\//
         box = load_from_url(box_arg)
-      elsif box_arg =~ /\.box$/
+      elsif File.file?(box_arg)
         box = load_from_file(box_arg)
       else
         box = load_from_boxes_path(box_arg)
@@ -173,12 +173,16 @@ module VagrantMutate
     end
 
     def parse_identifier(identifier)
-      if identifier =~ /^([\w-]+)#{File::SEPARATOR}([\w-]+)$/
-        @logger.info "Parsed provider name as #{$1} and box name as #{$2}"
-        return $1, $2
-      else
+      split_id = identifier.split('/')
+      case split_id.length
+      when 2
+        @logger.info "Parsed provider name as #{split_id[0]} and box name as #{split_id[1]}"
+        return split_id[0], split_id[1]
+      when 1
         @logger.info "Parsed provider name as not given and box name as #{identifier}"
         return nil, identifier
+      else
+          raise Errors::ParseIdentifierFailed, :identifier => identifier
       end
     end
 

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

@@ -32,6 +32,7 @@ module VagrantMutate
         @env.ui.info "Converting #{@input_box.name} from #{@input_box.provider_name} "\
           "to #{@output_box.provider_name}."
 
+        @input_box.verify_format
         write_metadata
         copy_vagrantfile
         write_specific_files
@@ -95,7 +96,7 @@ module VagrantMutate
         # S for sparse file
         qemu_options = '-p -S 16k'
 
-        command = "qemu-img convert #{qemu_options} -f #{input_format} -O #{output_format} #{input_file} #{output_file}"
+        command = "qemu-img convert #{qemu_options} -O #{output_format} #{input_file} #{output_file}"
         @logger.info "Running #{command}"
         unless system(command)
           raise Errors::WriteDiskFailed, :error_message => "qemu-img exited with status #{$?.exitstatus}"

data/lib/vagrant-mutate/errors.rb

@@ -30,6 +30,10 @@ module VagrantMutate
       error_key(:extract_box_failed)
     end
 
+    class ParseIdentifierFailed < VagrantMutateError
+      error_key(:parse_identifier_failed)
+    end
+
     class DetermineProviderFailed < VagrantMutateError
       error_key(:determine_provider_failed)
     end
@@ -54,8 +58,8 @@ module VagrantMutate
       error_key(:parse_qemu_version_failed)
     end
 
-    class DetermineImageSizeFailed < VagrantMutateError
-      error_key(:determine_image_size_failed)
+    class QemuInfoFailed < VagrantMutateError
+      error_key(:qemu_info_failed)
     end
 
     class BoxAttributeError < VagrantMutateError

data/lib/vagrant-mutate/qemu.rb

@@ -21,12 +21,16 @@ module VagrantMutate
       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
+          # will need to change test once a version > 1.6 has a fix
+          if installed_version < Gem::Version.new('1.2.0') or
+              installed_version >= Gem::Version.new('1.6.0')
+
             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."
+              "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
         else
           raise Errors::ParseQemuVersionFailed

data/lib/vagrant-mutate/version.rb

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

data/locales/en.yml

@@ -14,6 +14,9 @@ en:
       extract_box_failed: |-
         Extracting box failed with error:
         %{error_message}
+      parse_identifier_failed: |-
+        Expected name or provider/name but you gave %{identifier}.
+        If you meant to specify a box by name fix this. If you meant to specify a box by path make sure the file exists.
       determine_provider_failed: |-
         Determining provider for box failed with error:
         %{error_message}
@@ -31,8 +34,8 @@ en:
         %{error_message}
       parse_qemu_version_failed: |-
         Determining the version of qemu-img installed failed
-      determine_image_size_failed: |-
-        Determining the virtual size of the disk image failed
+      qemu_info_failed: |-
+          Getting information about the disk image via qemu-info failed
       box_attribute_error: |-
         Error determining information about the input box:
         %{error_message}

metadata

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