vagrant-mutate 0.2.6 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.0 (2014-05-04)
+* Support Vagrant 1.5 with unversioned boxes (#47)
+* Drop support for Vagrant < 1.5
+* Move input provider specifier into own option
+* Warn if user provided identifier for Vagrant Cloud
+
 # 0.2.6 (2014-05-04)
 * Include CentOS 6.5/RHEL 6.5-friendly Qemu paths (#50)
 

data/README.md

@@ -11,14 +11,16 @@ Vagrant-mutate is a vagrant plugin to convert vagrant boxes to work with differe
 
 ## Compatibility
 
-Vagrant-mutate is not yet compatible with Vagrant 1.5.
+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-mutate has been tested against the following versions. It may work with other versions too.
+Throughout its development vagrant-mutate has been tested against the following versions. It may work with other versions too.
 
-* [vagrant](http://www.vagrantup.com) 1.3.5 and 1.4.3
+* [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 does not yet fully support [versioned boxes](http://docs.vagrantup.com/v2/boxes/versioning.html). It always assumes a box has the version *0*.
+
 ## Installation
 
 ### qemu-img
@@ -67,12 +69,12 @@ Or if you had already added the box to vagrant and now want to use it with libvi
 
     vagrant mutate precise32 libvirt
 
-If you have a box for multiple providers, you must specify the provider to use for input by prepending it to the name with a slash, e.g.
+If you have a box for multiple providers, you must specify the provider to use for input using the *--input_provider* option, e.g.
 
     $ vagrant box list
     precise32  (kvm)
     precise32  (virtualbox)
-    $ vagrant mutate virtualbox/precise32 libvirt
+    $ vagrant mutate --input_provider=virtualbox precise32 libvirt
 
 To export a box you created with vagrant mutate, just repackage it, e.g.
 

data/lib/vagrant-mutate/box_loader.rb

@@ -25,13 +25,15 @@ module VagrantMutate
       end
     end
 
-    def load(box_arg)
+    def load(box_arg, provider_name)
       if box_arg =~ /:\/\//
         box = load_from_url(box_arg)
       elsif File.file?(box_arg)
         box = load_from_file(box_arg)
+      elsif box_arg =~ /\//
+        raise Errors::CloudNotSupported
       else
-        box = load_from_boxes_path(box_arg)
+        box = load_from_boxes_path(box_arg, provider_name)
       end
 
       if box.supported_input
@@ -88,9 +90,8 @@ module VagrantMutate
       box = create_box(provider_name, name, dir)
     end
 
-    def load_from_boxes_path(identifier)
-      @logger.info "Loading box #{identifier} from vagrants box path"
-      provider_name, name = parse_identifier(identifier)
+    def load_from_boxes_path(name, provider_name)
+      @logger.info "Loading box #{name} from vagrants box path"
       if provider_name
         dir = verify_input_dir(provider_name, name)
       else
@@ -129,8 +130,9 @@ module VagrantMutate
     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 )
+      # e.g. $HOME/.vagrant.d/boxes/fedora-19/0/libvirt
+      # TODO support versioned boxes
+      out_dir = File.join( @env.boxes_path, name, '0', provider_name )
       begin
         FileUtils.mkdir_p(out_dir)
       rescue => e
@@ -142,7 +144,7 @@ module VagrantMutate
 
     def unpack(file)
       @env.ui.info "Extracting box file to a temporary directory."
-      unless File.exists? file
+      unless File.exist? file
         raise Errors::BoxNotFound, :box => file
       end
       tmp_dir = Dir.mktmpdir(nil, @env.tmp_path)
@@ -158,7 +160,7 @@ module VagrantMutate
 
     def determine_provider(dir)
       metadata_file = File.join(dir, 'metadata.json')
-      if File.exists? metadata_file
+      if File.exist? metadata_file
         begin
           metadata = JSON.load( File.new( metadata_file, 'r') )
         rescue => e
@@ -172,22 +174,9 @@ module VagrantMutate
       end
     end
 
-    def parse_identifier(identifier)
-      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
-
     def verify_input_dir(provider_name, name)
-      input_dir = File.join( @env.boxes_path, name, provider_name)
+      # TODO support versioned boxes
+      input_dir = File.join( @env.boxes_path, name, '0', provider_name)
       if File.directory?(input_dir)
         @logger.info "Found input directory #{input_dir}"
         return input_dir
@@ -197,7 +186,8 @@ module VagrantMutate
     end
 
     def find_input_dir(name)
-      box_parent_dir = File.join( @env.boxes_path, name)
+      # TODO support versioned boxes
+      box_parent_dir = File.join( @env.boxes_path, name, '0')
 
       if Dir.exist?(box_parent_dir)
         providers = Dir.entries(box_parent_dir).reject { |entry| entry =~ /^\./ }

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

@@ -46,7 +46,7 @@ module VagrantMutate
                           '/usr/bin/qemu-kvm',
                           '/usr/libexec/qemu-kvm',
                           '/usr/bin/kvm' ]
-        qemu_bin = qemu_bin_list.detect { |binary| File.exists? binary }
+        qemu_bin = qemu_bin_list.detect { |binary| File.exist? binary }
         unless qemu_bin
           raise Errors::QemuNotFound
         end

data/lib/vagrant-mutate/errors.rb

@@ -6,6 +6,10 @@ module VagrantMutate
       error_namespace('vagrant_mutate.errors')
     end
 
+    class CloudNotSupported < VagrantMutateError
+      error_key(:cloud_not_supported)
+    end
+
     class ProvidersMatch < VagrantMutateError
       error_key(:providers_match)
     end

data/lib/vagrant-mutate/mutate.rb

@@ -7,9 +7,17 @@ module VagrantMutate
   class Mutate < Vagrant.plugin(2, :command)
 
     def execute
+      options = {}
+      options[:input_provider] = nil
+
       opts = OptionParser.new do |o|
         o.banner = 'Usage: vagrant mutate <box-name-or-file> <provider>'
+        o.on("--input_provider PROVIDER",
+          "Specify provider for input box") do |p|
+          options[:input_provider] = p
+        end
       end
+
       argv = parse_options(opts)
       return if !argv
 
@@ -18,17 +26,17 @@ module VagrantMutate
         return
       end
 
-      box_arg = argv[0]
-      output_provider_arg = argv[1]
+      options[:box_arg] = argv[0]
+      options[:output_provider] = argv[1]
 
       Qemu.verify_qemu_installed
       Qemu.verify_qemu_version(@env)
 
       input_loader  = BoxLoader.new(@env)
-      input_box = input_loader.load(box_arg)
+      input_box = input_loader.load( options[:box_arg], options[:input_provider] )
 
       output_loader = BoxLoader.new(@env)
-      output_box = output_loader.prepare_for_output( input_box.name, output_provider_arg)
+      output_box = output_loader.prepare_for_output( input_box.name, options[:output_provider])
 
       converter  = Converter::Converter.create(@env, input_box, output_box)
       converter.convert

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

data/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   vagrant_mutate:
     errors:
+      cloud_not_supported: |-
+          Vagrant-mutate can not download from Vagrant Cloud for you.
       providers_match: |-
         Input and output provider are the same. Aborting.
       provider_not_supported: |-

data/test/test.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 def cleanup
   puts "\nCLEANING UP"
-  base_output_dir = File.expand_path('../actual_output', __FILE__) 
+  base_output_dir = File.expand_path('../actual_output', __FILE__)
   if File.directory? base_output_dir
     FileUtils.rm_rf base_output_dir
   end
@@ -12,8 +12,8 @@ end
 
 def build_plugin
   puts "\nBUILDING PLUGIN"
-  pkg_dir = File.expand_path('../../pkg', __FILE__) 
-  working_dir = Dir.pwd 
+  pkg_dir = File.expand_path('../../pkg', __FILE__)
+  working_dir = Dir.pwd
   Dir.chdir pkg_dir
   FileUtils.rm( Dir.glob('*.gem') )
   system('rake build')
@@ -22,8 +22,8 @@ end
 
 def install_plugin
   puts "\nINSTALLING PLUGIN"
-  pkg_dir = File.expand_path('../../pkg', __FILE__) 
-  working_dir = Dir.pwd 
+  pkg_dir = File.expand_path('../../pkg', __FILE__)
+  working_dir = Dir.pwd
   Dir.chdir pkg_dir
   system('vagrant plugin install *.gem')
   Dir.chdir working_dir
@@ -39,8 +39,8 @@ def derandomize_output(input, output_dir)
         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)
+        File.open(path, 'w') do |o|
+          o.write(contents)
         end
       end
     end
@@ -49,11 +49,11 @@ end
 
 def test(input, outputs)
   failures = []
-  test_dir = File.expand_path( File.dirname(__FILE__) ) 
+  test_dir = File.expand_path( File.dirname(__FILE__) )
 
-  input_box = File.join(test_dir, 'input', input, 'mutate-test.box') 
+  input_box = File.join(test_dir, 'input', input, 'mutate-test.box')
 
-  vagrant_dir = File.join(test_dir, 'actual_output', input) 
+  vagrant_dir = File.join(test_dir, 'actual_output', input)
   FileUtils.mkdir_p vagrant_dir
   ENV['VAGRANT_HOME'] = vagrant_dir
   install_plugin
@@ -61,7 +61,8 @@ def test(input, outputs)
   outputs.each do |output|
     puts "\nTESTING #{input} to #{output}"
     system("vagrant mutate #{input_box} #{output}")
-    output_dir = File.join(vagrant_dir, 'boxes', 'mutate-test', output)
+    # 0 because input boxes are unversioned
+    output_dir = File.join(vagrant_dir, 'boxes', 'mutate-test', '0', output)
     expected_output_dir = File.join(test_dir, 'expected_output', input, output)
     derandomize_output(input, output_dir)
     Dir.foreach(expected_output_dir) do |f|
@@ -84,9 +85,9 @@ failures = test( 'virtualbox', ['kvm', 'libvirt'] )
 failures += test( 'libvirt', ['kvm'] )
 failures += test( 'kvm', ['libvirt'] )
 
-unless failures.empty?
+if failures.empty?
+  puts "\nALL TESTS PASSED"
+else
   puts "\nTESTS FAILED"
   failures.each {|f| puts f}
-else
-  puts "\nALL TESTS PASSED"
 end

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Brian Pitts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Convert vagrant boxes to work with different providers
@@ -45,7 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -88,26 +93,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Convert vagrant boxes to work with different providers
 test_files:
 - test/expected_output/kvm/libvirt/Vagrantfile

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4782f5d4cba1aea0370134ebe65d9bfe5466b158
-  data.tar.gz: 973ab07ff59bd8e8c8159156fe4473ac7de07f66
-SHA512:
-  metadata.gz: 6e741a3605d4c9d855554169a187fbdc6d0578c585809c8b77cf37c1093839411a1c9bb3fad6278b17472fd9affdb4c24edff2da45d199d92386b18982e4bff2
-  data.tar.gz: f2dfe11947e128475622c9b1cff97b1c2fe49ce313d77f39b410dfe2ba8f93e73c14ce025c07565c47e4715fde9a2aab08a2ff15fa1b3cfb846c1fee208296be