vagrant 0.2.0 → 0.3.0

data/Gemfile

@@ -1,12 +1,12 @@
 source :gemcutter
 
 # Gems required for the lib to even run
-gem "virtualbox", ">= 0.5.3"
+gem "virtualbox", "~> 0.6.0"
 gem "net-ssh", ">= 2.0.19"
 gem "net-scp", ">= 1.0.2"
-gem "git-style-binaries", ">= 0.1.10"
-gem "json", ">= 1.2.0"
-gem "archive-tar-minitar", ">= 0.5.2"
+gem "json_pure", ">= 1.2.0"
+gem "archive-tar-minitar", "= 0.5.2"
+gem "mario", "~> 0.0.6"
 
 # Gems required for testing only. To install run
 # gem bundle test

data/Rakefile

@@ -10,12 +10,12 @@ begin
     gemspec.homepage = "http://github.com/mitchellh/vagrant"
     gemspec.authors = ["Mitchell Hashimoto", "John Bender"]
 
-    gemspec.add_dependency('virtualbox', '>= 0.5.3')
+    gemspec.add_dependency('virtualbox', '~> 0.6.0')
     gemspec.add_dependency('net-ssh', '>= 2.0.19')
     gemspec.add_dependency('net-scp', '>= 1.0.2')
-    gemspec.add_dependency('json', '>= 1.2.0')
-    gemspec.add_dependency('git-style-binaries', '>= 0.1.10')
+    gemspec.add_dependency('json_pure', '>= 1.2.0')
     gemspec.add_dependency('archive-tar-minitar', '= 0.5.2')
+    gemspec.add_dependency('mario', '~> 0.0.6')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/vagrant

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fallback on rubygems
-  require "rubygems"
-end
+# Get library
+libdir = File.join(File.dirname(__FILE__), '..', 'lib')
+require File.expand_path('vagrant', libdir)
 
-require 'git-style-binary/command'
-
-GitStyleBinary.primary do
-  version "0.2.0"
-
-  run { educate }
-end
+# Call the command
+Vagrant::Command.execute(*ARGV)

data/config/default.rb

@@ -20,6 +20,7 @@ Vagrant::Config.run do |config|
   config.vm.provisioner = nil
   config.vm.shared_folder_uid = nil
   config.vm.shared_folder_gid = nil
+  config.vm.boot_mode = "vrdp"
 
   config.package.name = 'vagrant'
   config.package.extension = '.box'

data/keys/README.md

@@ -7,4 +7,11 @@ vagrant installations can automatically SSH into the boxes.
 If you're working with a team or company or with a custom box and
 you want more secure SSH, you should create your own keypair
 and configure the private key in the Vagrantfile with
-`config.ssh.private_key_path`
+`config.ssh.private_key_path`
+
+# Putty
+
+If you are using Vagrant on windows, the .ppk file contained here, in the keys directory,
+has been generated from the private key and should be used to connect Putty to any VMs that 
+are leveraging the default key pair. See [guide](http://vagrantup.com/docs/getting-started/windows.html) 
+in the documentation for more details on using Putty with Vagrant.

data/keys/vagrant.ppk

@@ -0,0 +1,26 @@
+PuTTY-User-Key-File-2: ssh-rsa
+Encryption: none
+Comment: imported-openssh-key
+Public-Lines: 6
+AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+k
+z4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdO
+KLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4
+O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGj
+yiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPK
+cF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
+Private-Lines: 14
+AAABAQDiKpY8le3NkDryYp0QuziMmx3KTL57B1l412zm2NycdTnNRgTbkr598kQP
+2pRYgJwtkNzzVMZaMfICoPUHDtemBTAWB5QnBSXNC6sC/7/JKfGLC5oYl+EUzUJp
+AfN9emGBWaX59lS+clRO/N9MrYuDoR1tQT1NqtSUF//E9+4SExKUgTmR5v9nPf8t
+SVGDzIOrPnD5BZUni62cqcqKrBk3SbCnBTthLImGVPhhXUXefhiMuzAznAmzaiqb
+SOyxC78FPS3IRc0NgEsQXgCwKVpa5InaSOrsqGuthfNqCqGdJ6L04NgVKEm7xRZV
+5zciFvlleXM7q901DUn1ex/ib7bLAAAAgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/
+orApiHmHDsURs5rUKDx0f9iPcXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsM
+kE4CUSiJcYrMANtx54cGH7RkEjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTG
+yAK+OLD3M2QdCQAAAIEA7cfKTQgMUe8oR2yFk9QB+uvl1jfG16u5d0Tv7pHmnIvf
+CX5G5MVEWYbcVfxx7r1IZzy3V908MoDwWGRTaOKc1RIc1qE7ZxLaxbniscnN/i42
+abqPpgZUOjkbX4JK/YAVaYV2RmBM5Ag95VXZfC+HMPQVaSqyQrNXObWhow4HSJ0A
+AACANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH+vq/
+5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQNE5O
+gEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+Private-MAC: bc710f345e67c736d57dd72aab10fe4625345dae

data/lib/vagrant.rb

@@ -3,13 +3,13 @@ PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT)
 
 # The libs which must be loaded prior to the rest
 %w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar
-  net/scp fileutils}.each do |lib|
+  net/scp fileutils mario}.each do |lib|
   require lib
 end
 
 # The vagrant specific files which must be loaded prior to the rest
-%w{vagrant/util vagrant/stacked_proc_runner vagrant/actions/base vagrant/downloaders/base vagrant/actions/collection
-  vagrant/actions/runner vagrant/config vagrant/provisioners/base vagrant/provisioners/chef}.each do |f|
+%w{vagrant/util vagrant/util/stacked_proc_runner vagrant/util/progress_meter vagrant/actions/base vagrant/downloaders/base vagrant/actions/collection
+  vagrant/actions/runner vagrant/config vagrant/provisioners/base vagrant/provisioners/chef vagrant/commands/base vagrant/commands/box}.each do |f|
   require File.expand_path(f, libdir)
 end
 

data/lib/vagrant/actions/base.rb

@@ -84,15 +84,15 @@ module Vagrant
       def rescue(exception); end
 
       # The following two methods are used for declaring action dependencies.
-      # For example, you require that the reload action be in place before 
+      # For example, you require that the reload action be in place before
       # a your new FooAction you might do the following
       #
       # def follows; [Reload] end
-      
+
       # This method is called when the runner is determining the actions that
       # must precede a given action. You would say "This action follows [Action1, Action2]"
       def follows; [] end
-      
+
       # This method is called when the runner is determining the actions that
       # must follow a given action. You would say "This action precedes [Action3, Action4]
       def precedes; [] end
@@ -102,6 +102,17 @@ module Vagrant
     # {Vagrant::Util#error_and_exit error_and_exit}, since it allows the {Runner} to call
     # {Base#rescue rescue} on all the actions and properly exit. Any message
     # passed into the {ActionException} is then shown and and vagrant exits.
-    class ActionException < Exception; end
+    class ActionException < Exception
+      attr_reader :key
+      attr_reader :data
+
+      def initialize(key, data = {})
+        @key = key
+        @data = data
+
+        message = Vagrant::Util::Errors.error_string(key, data)
+        super(message)
+      end
+    end
   end
 end

data/lib/vagrant/actions/box/add.rb

@@ -10,7 +10,7 @@ module Vagrant
       class Add < Base
         def prepare
           if File.exists?(@runner.directory)
-            raise ActionException.new("A box with the name '#{@runner.name}' already exists, please use another name or use `vagrant box remove #{@runner.name}`")
+            raise ActionException.new(:box_add_already_exists, :box_name => @runner.name)
           end
 
           @runner.add_action(Download)

data/lib/vagrant/actions/box/download.rb

@@ -1,66 +1,72 @@
-module Vagrant
-  module Actions
-    module Box
-      # An action which acts on a box by downloading the box file from
-      # the given URI into a temporary location. This action parses a
-      # given URI and handles downloading it via one of the many Vagrant
-      # downloads (such as {Vagrant::Downloaders::File}).
-      #
-      # This action cleans itself up by removing the downloaded box file.
-      class Download < Base
-        BASENAME = "box"
-        BUFFERSIZE = 1048576 # 1 MB
-
-        attr_reader :downloader
-
-        def prepare
-          # Parse the URI given and prepare a downloader
-          uri = URI.parse(@runner.uri)
-          uri_map = [[URI::HTTP, Downloaders::HTTP], [URI::Generic, Downloaders::File]]
-
-          uri_map.find do |uri_type, downloader_klass|
-            if uri.is_a?(uri_type)
-              logger.info "#{uri_type} for URI, downloading via #{downloader_klass}..."
-              @downloader = downloader_klass.new
-            end
-          end
-
-          raise ActionException.new("Unknown URI type for box download.") unless @downloader
-
-          # Prepare the downloader
-          @downloader.prepare(@runner.uri)
-        end
-
-        def execute!
-          with_tempfile do |tempfile|
-            download_to(tempfile)
-            @runner.temp_path = tempfile.path
-          end
-        end
-
-        def cleanup
-          if @runner.temp_path && File.exist?(@runner.temp_path)
-            logger.info "Cleaning up downloaded box..."
-            File.unlink(@runner.temp_path)
-          end
-        end
-
-        def rescue(exception)
-          cleanup
-        end
-
-        def with_tempfile
-          logger.info "Creating tempfile for storing box file..."
-          Tempfile.open(BASENAME, Env.tmp_path) do |tempfile|
-            yield tempfile
-          end
-        end
-
-        def download_to(f)
-          logger.info "Copying box to temporary location..."
-          downloader.download!(@runner.uri, f)
-        end
-      end
-    end
-  end
-end
+module Vagrant
+  module Actions
+    module Box
+      # An action which acts on a box by downloading the box file from
+      # the given URI into a temporary location. This action parses a
+      # given URI and handles downloading it via one of the many Vagrant
+      # downloads (such as {Vagrant::Downloaders::File}).
+      #
+      # This action cleans itself up by removing the downloaded box file.
+      class Download < Base
+        BASENAME = "box"
+        BUFFERSIZE = 1048576 # 1 MB
+
+        attr_reader :downloader
+
+        def prepare
+          # Check the URI given and prepare a downloader
+          [Downloaders::HTTP, Downloaders::File].each do |dler|
+            if dler.match?(@runner.uri)
+              logger.info "Downloading via #{dler}..."
+              @downloader = dler.new 
+            end
+          end
+
+          raise ActionException.new(:box_download_unknown_type) unless @downloader
+
+          # Prepare the downloader
+          @downloader.prepare(@runner.uri)
+        end
+
+        def execute!
+          with_tempfile do |tempfile|
+            download_to(tempfile)
+            @runner.temp_path = tempfile.path
+          end
+        end
+
+        def cleanup
+          if @runner.temp_path && File.exist?(@runner.temp_path)
+            logger.info "Cleaning up downloaded box..."
+            File.unlink(@runner.temp_path)
+          end
+        end
+
+        def rescue(exception)
+          cleanup
+        end
+
+        def with_tempfile
+          logger.info "Creating tempfile for storing box file..."
+          File.open(box_temp_path, file_options) do |tempfile|
+            yield tempfile
+          end
+        end
+        
+        def file_options
+          # create, write only, fail if the file exists, binary if windows
+          File::WRONLY|File::EXCL|File::CREAT|(Mario::Platform.windows? ? File::BINARY : 0)
+        end
+
+        def box_temp_path
+          File.join(@runner.env.tmp_path, BASENAME + Time.now.to_i.to_s)
+        end
+
+        def download_to(f)
+          logger.info "Copying box to temporary location..."
+          downloader.download!(@runner.uri, f)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/actions/box/unpackage.rb

@@ -21,10 +21,7 @@ module Vagrant
 
         def setup_box_dir
           if File.directory?(box_dir)
-            error_and_exit(<<-msg)
-This box appears to already exist! Please call `vagrant box remove #{@runner.name}`
-and then try to add it again.
-msg
+            error_and_exit(:box_already_exists, :box_name => @runner.name)
           end
 
           FileUtils.mkdir_p(box_dir)

data/lib/vagrant/actions/runner.rb

@@ -94,7 +94,7 @@ module Vagrant
 
           # If its an ActionException, error and exit the message
           if e.is_a?(ActionException)
-            error_and_exit(e.message)
+            error_and_exit(e.key, e.data)
             return
           end
 

data/lib/vagrant/actions/vm/boot.rb

@@ -3,7 +3,7 @@ module Vagrant
     module VM
       class Boot < Base
         def prepare
-          Vagrant.config.vm.share_folder("vagrant-root", Vagrant.config.vm.project_directory, Env.root_path)
+          @runner.env.config.vm.share_folder("v-root", @runner.env.config.vm.project_directory, @runner.env.root_path)
         end
 
         def execute!
@@ -14,25 +14,23 @@ module Vagrant
             # Wait for it to complete booting, or error if we could
             # never detect it booted up successfully
             if !wait_for_boot
-              error_and_exit(<<-error)
-Failed to connect to VM! Failed to boot?
-error
+              error_and_exit(:vm_failed_to_boot)
             end
           end
         end
 
         def boot
           logger.info "Booting VM..."
-          @runner.vm.start(:headless, true)
+          @runner.vm.start(@runner.env.config.vm.boot_mode)
         end
 
         def wait_for_boot(sleeptime=5)
           logger.info "Waiting for VM to boot..."
 
-          Vagrant.config[:ssh][:max_tries].to_i.times do |i|
+          @runner.env.config.ssh.max_tries.to_i.times do |i|
             logger.info "Trying to connect (attempt ##{i+1} of #{Vagrant.config[:ssh][:max_tries]})..."
 
-            if Vagrant::SSH.up?
+            if @runner.env.ssh.up?
               logger.info "VM booted and ready for use!"
               return true
             end

data/lib/vagrant/actions/vm/customize.rb

@@ -6,10 +6,10 @@ module Vagrant
           logger.info "Running any VM customizations..."
 
           # Run the customization procs over the VM
-          Vagrant.config.vm.run_procs!(@runner.vm)
+          @runner.env.config.vm.run_procs!(@runner.vm)
 
           # Save the vm
-          @runner.vm.save(true)
+          @runner.vm.save
         end
       end
     end

data/lib/vagrant/actions/vm/destroy.rb

@@ -11,11 +11,11 @@ module Vagrant
 
         def destroy_vm
           logger.info "Destroying VM and associated drives..."
-          @runner.vm.destroy(:destroy_image => true)
+          @runner.vm.destroy(:destroy_medium => :delete)
         end
 
         def depersist
-          Env.depersist_vm(@runner)
+          @runner.env.depersist_vm
         end
       end
     end

data/lib/vagrant/actions/vm/down.rb

@@ -6,6 +6,13 @@ module Vagrant
           @runner.add_action(Halt) if @runner.vm.running?
           @runner.add_action(Destroy)
         end
+
+        def after_halt
+          # This sleep is necessary to wait for the GUI to clean itself up.
+          # There appears to be nothing in the API that does this "wait"
+          # for us.
+          Kernel.sleep(1) if @runner.env.config.vm.boot_mode == "gui"
+        end
       end
     end
   end

data/lib/vagrant/actions/vm/export.rb

@@ -2,6 +2,8 @@ module Vagrant
   module Actions
     module VM
       class Export < Base
+        include Util::ProgressMeter
+
         attr_reader :temp_dir
 
         def execute!
@@ -21,19 +23,23 @@ module Vagrant
         end
 
         def setup_temp_dir
-          @temp_dir = File.join(Env.tmp_path, Time.now.to_i.to_s)
+          @temp_dir = File.join(@runner.env.tmp_path, Time.now.to_i.to_s)
 
           logger.info "Creating temporary directory for export..."
           FileUtils.mkpath(temp_dir)
         end
 
         def ovf_path
-          File.join(temp_dir, Vagrant.config.vm.box_ovf)
+          File.join(temp_dir, @runner.env.config.vm.box_ovf)
         end
 
         def export
-          logger.info "Exporting VM to #{ovf_path} ..."
-          @runner.vm.export(ovf_path, {}, true)
+          logger.info "Exporting VM to #{ovf_path}..."
+          @runner.vm.export(ovf_path) do |progress|
+            update_progress(progress, 100, false)
+          end
+
+          complete_progress
         end
       end
     end