vagrantup 0.8.10 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d203b4e75bd9863148783e62b3e0c44c7a0c74fd
-  data.tar.gz: ba47c82904c026da8893e0db9ec78792521bd92a
+  metadata.gz: 2dcef6916402f3ffabcf961a01ff5ccf739e3598
+  data.tar.gz: 53800395c7d04a4d3a914039ff5d71f956c20859
 SHA512:
-  metadata.gz: 79f96afa43f449937304f3a6f9291730e475519a54ffbf0d7ec909072501b1278038e5cf004c74c18275b085476ed00ac5f2cb390728faed0d4df46ca27c9821
-  data.tar.gz: cfabb32b38aa99b8442c19be146d6b2e6de6e605d33663e5af448a368e660bdcbd4a292076ae8e56b062bb6b78ceef12a6acc8981360f51d1641aa2c80114a75
+  metadata.gz: 52537409e5b638394d0d092e1086dc02fd3ee46245d1f1b61ce420252310209e33864c0f242c0a38adba50948d3f70f0b99486603bb41702ce1f498c337965b6
+  data.tar.gz: 31b769e88900a22d8dbe4e7f84bdf4df09e1a7c3aaf88d5cde2b7b0dff05eeb98e2be203a8bbaaa371cfa7d97de263487fe19a91369c44d97c22fd2329a4e513

data/CHANGELOG.md

@@ -1,7 +1,83 @@
+## 0.9.0 (January 17, 2012)
+
+  - VirtualBox 4.0 support backported in addition to supporting VirtualBox 4.1.
+  - `config.vm.network` syntax changed so that the first argument is now the type
+    of argument. Previously where you had `config.vm.network "33.33.33.10"` you
+    should now put `config.vm.network :hostonly, "33.33.33.10"`. This is in order
+    to support bridged networking, as well.
+  - `config.vm.forward_port` no longer requires a name parameter.
+  - Bridged networking. `config.vm.network` with `:bridged` as the option will
+    setup a bridged network.
+  - Host only networks can be configured with DHCP now. Specify `:dhcp` as
+    the IP and it will be done.
+  - `config.vm.customize` now takes a command to send to `VBoxManage`, so any
+    arbitrary command can be sent. The older style of passing a block no longer
+    works and Vagrant will give a proper error message if it notices this old-style
+    being used.
+  - `config.ssh.forwarded_port_key` is gone. Vagrant no longer cares about
+    forwarded port names for any reason. Please use `config.ssh.guest_port`
+    (more below).
+  - `config.ssh.forwarded_port_destination` has been replaced by
+    `config.ssh.guest_port` which more accurately reflects what it is
+    used for. Vagrant will automatically scan forwarded ports that match the
+    guest port to find the SSH port.
+  - Logging. The entire Vagrant source has had logging sprinkled throughout
+    to make debugging issues easier. To enable logging, set the VAGRANT_LOG
+    environmental variable to the log level you wish to see. By default,
+    logging is silent.
+  - `system` renamed to `guest` throughout the source. Any `config.vm.system`
+    configurations must be changed to `config.vm.guest`
+  - Puppet provisioner no longer defaults manifest to "box.pp." Instead, it
+    is now "default.pp"
+  - All Vagrant commands that take a VM name in a Multi-VM environment
+    can now be given a regular expression. If the name starts and ends with a "/"
+    then it is assumed to be a regular expression. [GH-573]
+  - Added a "--plain" flag to `vagrant ssh` which will cause Vagrant to not
+    perform any authentication. It will simply `ssh` into the proper IP and
+    port of the virtual machine.
+  - If a shared folder now has a `:create` flag set to `true`, the path on the
+    host will be created if it doesn't exist.
+  - Added `--force` flag to `box add`, which will overwite any existing boxes
+    if they exist. [GH-631]
+  - Added `--provision-with` to `up` which configures what provisioners run,
+    by shortcut. [GH-367]
+  - Arbitrary mount options can be passed with `:extra` to any shared
+    folders. [GH-551]
+  - Options passed after a `--` to `vagrant ssh` are now passed directly to
+    `ssh`. [GH-554]
+  - Ubuntu guests will now emit a `vagrant-mounted` upstart event after shared
+    folders are mounted.
+  - `attempts` is a new option on chef client and chef solo provisioners. This
+    will run the provisioner multiple times until erroring about failing
+    convergence. [GH-282]
+  - Removed Thor as a dependency for the command line interfaces. This resulted
+    in general speed increases across all command line commands.
+  - Linux uses `shutdown -h` instead of `halt` to hopefully more consistently
+    power off the system. [GH-575]
+  - Tweaks to SSH to hopefully be more reliable in coming up.
+  - Helpful error message when SCP is unavailable in the guest. [GH-568]
+  - Error message for improperly packaged box files. [GH-198]
+  - Copy insecure private key to user-owned directory so even
+    `sudo` installed Vagrant installations work. [GH-580]
+  - Provisioner stdout/stderr is now color coded based on stdout/stderr.
+    stdout is green, stderr is red. [GH-595]
+  - Chef solo now prompts users to run a `reload` if shared folders
+    are not found on the VM. [GH-253]
+  - "--no-provision" once again works for certain commands. [GH-591]
+  - Resuming a VM from a saved state will show an error message if there
+    would be port collisions. [GH-602]
+  - `vagrant ssh -c` will now exit with the same exit code as the command
+    run. [GH-598]
+  - `vagrant ssh -c` will now send stderr to stderr and stdout to stdout
+    on the host machine, instead of all output to stdout.
+  - `vagrant box add` path now accepts unexpanded shell paths such as
+    `~/foo` and will properly expand them. [GH-633]
+  - Vagrant can now be interrupted during the "importing" step.
+  - NFS exports will no longer be cleared when an expected error occurs. [GH-577]
+
 ## 0.8.10 (December 10, 2011)
 
   - Revert the SSH tweaks made in 0.8.8. It affected stability
-    that I'd rather not test in a patch release.
 
 ## 0.8.8 (December 1, 2011)
 

data/Gemfile

@@ -1,17 +1,3 @@
-require "rbconfig"
-platform = RbConfig::CONFIG["host_os"].downcase
-
 source "http://rubygems.org"
 
 gemspec
-
-# Use the following gems straight from git, since Vagrant dev
-# typically coincides with it
-gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
-
-if platform.include?("mingw") || platform.include?("mswin")
-  # JRuby requires these gems for development, but only
-  # on windows.
-  gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
-  gem "jruby-win32ole", "~> 0.8.5", :platforms => :jruby
-end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 Mitchell Hashimoto and John Bender
+Copyright (c) 2010-2012Mitchell Hashimoto and John Bender
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/vagrant

@@ -1,33 +1,60 @@
 #!/usr/bin/env ruby
+require 'log4r'
 require 'vagrant'
 require 'vagrant/cli'
+require 'vagrant/util/platform'
 
-env = Vagrant::Environment.new
+# Create a logger right away
+logger = Log4r::Logger.new("vagrant::bin::vagrant")
+logger.info("`vagrant` invoked: #{ARGV.inspect}")
 
-begin
-  # Begin logging early here
-  env.logger.info("vagrant") { "`vagrant` invoked: #{ARGV.inspect}" }
+# Stdout/stderr should not buffer output
+$stdout.sync = true
+$stderr.sync = true
 
-  # Disable color if the proper argument was passed
-  shell = nil
-  if !$stdout.tty? || ARGV.include?("--no-color")
-    shell = Thor::Shell::Basic.new
-  else
-    shell = Thor::Base.shell.new
-  end
+# These will be the options that are passed to initialze the Vagrant
+# environment.
+opts = {}
 
-  # Set the UI early in case any errors are raised, and load
-  # the config immediately, so we gather any new commands from
-  # plugins
-  env.ui = Vagrant::UI::Shell.new(env, shell)
+# Disable color if the proper argument was passed or if we're
+# on Windows since the default Windows terminal doesn't support
+# colors.
+if !$stdout.tty? || ARGV.include?("--no-color") || Vagrant::Util::Platform.windows?
+  # Delete the argument from the list so that it doesn't cause any
+  # invalid arguments down the road.
+  ARGV.delete("--no-color")
+  opts[:ui_class] = Vagrant::UI::Basic
+else
+  opts[:ui_class] = Vagrant::UI::Colored
+end
+
+env = nil
+begin
+  # Create the environment, which is the cwd of wherever the
+  # `vagrant` command was invoked from
+  logger.debug("Creating Vagrant environment")
+  env = Vagrant::Environment.new(opts)
+
+  # Load the environment
+  logger.debug("Loading environment")
   env.load!
 
-  # Kick start the CLI
-  Vagrant::CLI.start(ARGV, :env => env)
+  # Execute the CLI interface
+  env.cli(ARGV)
 rescue Vagrant::Errors::VagrantError => e
-  opts = { :prefix => false }
-  env.ui.error e.message, opts if e.message
-  env.ui.error e.backtrace.join("\n"), opts if ENV["VAGRANT_DEBUG"]
+  logger.error("Vagrant experienced an error! Details:")
+  logger.error(e.inspect)
+  logger.error(e.message)
+  logger.error(e.backtrace.join("\n"))
+
+  if env
+    opts = { :prefix => false }
+    env.ui.error e.message, opts if e.message
+  else
+    $stderr.puts "Vagrant failed to initialize at a very early stage:\n\n"
+    $stderr.puts e.message
+  end
+
   exit e.status_code if e.respond_to?(:status_code)
   exit 999 # An error occurred with no status code defined
 end

data/config/default.rb

@@ -2,30 +2,22 @@ Vagrant::Config.run do |config|
   # default config goes here
   config.vagrant.dotfile_name = ".vagrant"
   config.vagrant.host = :detect
-  config.vagrant.ssh_session_cache = false
 
   config.ssh.username = "vagrant"
+  config.ssh.password = "vagrant"
   config.ssh.host = "127.0.0.1"
-  config.ssh.forwarded_port_key = "ssh"
-  config.ssh.forwarded_port_destination = 22
+  config.ssh.guest_port = 22
   config.ssh.max_tries = 100
-  config.ssh.timeout = 7
-  config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
+  config.ssh.timeout = 10
   config.ssh.forward_agent = false
   config.ssh.forward_x11 = false
 
   config.vm.auto_port_range = (2200..2250)
-  config.vm.box_ovf = "box.ovf"
   config.vm.box_url = nil
   config.vm.base_mac = nil
-  config.vm.forward_port("ssh", 22, 2222, :auto => true)
-  config.vm.boot_mode = "vrdp"
-  config.vm.system = :linux
-
-  config.vm.customize do |vm|
-    # Make VM name the name of the containing folder by default
-    vm.name = File.basename(config.env.cwd) + "_#{Time.now.to_i}"
-  end
+  config.vm.forward_port 22, 2222, :name => "ssh", :auto => true
+  config.vm.boot_mode = "headless"
+  config.vm.guest = :linux
 
   # Share the root folder. This can then be overridden by
   # other Vagrantfiles, if they wish.

data/lib/vagrant/action/box/destroy.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       class Destroy
         def initialize(app, env)
@@ -10,8 +10,12 @@ module Vagrant
         end
 
         def call(env)
-          env.ui.info I18n.t("vagrant.actions.box.destroy.destroying", :name => env["box"].name)
-          FileUtils.rm_rf(env["box"].directory)
+          # Delete the existing box
+          env[:ui].info I18n.t("vagrant.actions.box.destroy.destroying", :name => env[:box_name])
+          FileUtils.rm_rf(env[:box_directory])
+
+          # Reload the box collection
+          env[:box_collection].reload!
 
           @app.call(env)
         end

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

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     module Box
       class Download
         BASENAME = "box"
@@ -36,9 +36,9 @@ module Vagrant
 
             # Use the class if it matches the given URI or if this
             # is the last class...
-            if classes.length == (i + 1) || klass.match?(@env["box"].uri)
-              @env.ui.info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
-              @downloader = klass.new(@env)
+            if classes.length == (i + 1) || klass.match?(@env["box_url"])
+              @env[:ui].info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
+              @downloader = klass.new(@env[:ui])
               break
             end
           end
@@ -47,7 +47,7 @@ module Vagrant
           # just in case for now.
           raise Errors::BoxDownloadUnknownType if !@downloader
 
-          @downloader.prepare(@env["box"].uri)
+          @downloader.prepare(@env["box_url"])
           true
         end
 
@@ -60,7 +60,7 @@ module Vagrant
 
         def recover(env)
           if temp_path && File.exist?(temp_path)
-            env.ui.info I18n.t("vagrant.actions.box.download.cleaning")
+            env[:ui].info I18n.t("vagrant.actions.box.download.cleaning")
             File.unlink(temp_path)
           end
         end
@@ -72,11 +72,11 @@ module Vagrant
         end
 
         def box_temp_path
-          @env.env.tmp_path.join(BASENAME + Time.now.to_i.to_s)
+          @env[:tmp_path].join(BASENAME + Time.now.to_i.to_s)
         end
 
         def download_to(f)
-          @downloader.download!(@env["box"].uri, f)
+          @downloader.download!(@env["box_url"], f)
         end
       end
     end

data/lib/vagrant/action/box/package.rb

@@ -1,7 +1,7 @@
 require 'vagrant/action/general/package'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       # Packages a box which has already been unpackaged (such as
       # for the `vagrant box repackage` command) by leveraging the
@@ -10,7 +10,7 @@ module Vagrant
         # Alias instead of calling super for testability
         alias_method :general_call, :call
         def call(env)
-          env["package.directory"] = env["box"].directory
+          env["package.directory"] = env["box_directory"]
           general_call(env)
         end
       end

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

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'archive/tar/minitar'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       # Unpackages a downloaded box to a given directory with a given
       # name.
@@ -37,16 +37,22 @@ module Vagrant
         end
 
         def setup_box_directory
-          raise Errors::BoxAlreadyExists, :name => @env["box"].name if File.directory?(@env["box"].directory)
+          if File.directory?(@env["box_directory"])
+            raise Errors::BoxAlreadyExists, :name => @env["box_name"]
+          end
 
-          FileUtils.mkdir_p(@env["box"].directory)
-          @box_directory = @env["box"].directory
+          FileUtils.mkdir_p(@env["box_directory"])
+          @box_directory = @env["box_directory"]
         end
 
         def decompress
-          Dir.chdir(@env["box"].directory) do
-            @env.ui.info I18n.t("vagrant.actions.box.unpackage.extracting")
-            Archive::Tar::Minitar.unpack(@env["download.temp_path"], @env["box"].directory.to_s)
+          Dir.chdir(@env["box_directory"]) do
+            @env[:ui].info I18n.t("vagrant.actions.box.unpackage.extracting")
+            begin
+              Archive::Tar::Minitar.unpack(@env["download.temp_path"], @env["box_directory"].to_s)
+            rescue SystemCallError
+              raise Errors::BoxUnpackageFailure
+            end
           end
         end
       end

data/lib/vagrant/action/box/verify.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     module Box
       class Verify
         def initialize(app, env)
@@ -8,10 +8,10 @@ module Vagrant
         end
 
         def call(env)
-          begin
-            env.ui.info I18n.t("vagrant.actions.box.verify.verifying")
-            VirtualBox::Appliance.new(env["box"].ovf_file.to_s)
-          rescue Exception
+          @env[:ui].info I18n.t("vagrant.actions.box.verify.verifying")
+
+          driver = Driver::VirtualBox.new(nil)
+          if !driver.verify_image(env["box_directory"].join("box.ovf").to_s)
             raise Errors::BoxVerificationFailed
           end
 

data/lib/vagrant/action/builder.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     # Action builder which provides a nice DSL for building up
     # a middleware sequence for Vagrant actions. This code is based
     # heavily off of `Rack::Builder` and `ActionDispatch::MiddlewareStack`
@@ -23,14 +23,6 @@ module Vagrant
         instance_eval(&block) if block_given?
       end
 
-      # Returns the current stack of middlewares. You probably won't
-      # need to use this directly, and it's recommended that you don't.
-      #
-      # @return [Array]
-      def stack
-        @stack ||= []
-      end
-
       # Returns a mergeable version of the builder. If `use` is called with
       # the return value of this method, then the stack will merge, instead
       # of being treated as a separate single middleware.
@@ -46,10 +38,12 @@ module Vagrant
       #
       # @param [Class] middleware The middleware class
       def use(middleware, *args, &block)
-        if middleware.kind_of?(Builder)
-          # Prepend with a environment setter if args are given
-          self.use(Env::Set, *args, &block) if !args.empty? && args.first.is_a?(Hash)
+        # Prepend with a environment setter if args are given
+        if !args.empty? && args.first.is_a?(Hash) && middleware != Env::Set
+          self.use(Env::Set, args.shift, &block)
+        end
 
+        if middleware.kind_of?(Builder)
           # Merge in the other builder's stack into our own
           self.stack.concat(middleware.stack)
         else
@@ -75,9 +69,9 @@ module Vagrant
         insert(index + 1, middleware, *args, &block)
       end
 
-      # Swaps out the given middlware object or index with the new
+      # Replaces the given middlware object or index with the new
       # middleware.
-      def swap(index, middleware, *args, &block)
+      def replace(index, middleware, *args, &block)
         if index.is_a?(Integer)
           delete(index)
           insert(index, middleware, *args, &block)
@@ -93,6 +87,13 @@ module Vagrant
         stack.delete_at(index)
       end
 
+      # Runs the builder stack with the given environment.
+      def call(env)
+        to_app(env).call(env)
+      end
+
+      protected
+
       # Returns the numeric index for the given middleware object.
       #
       # @param [Object] object The item to find the index for
@@ -105,6 +106,14 @@ module Vagrant
         nil
       end
 
+      # Returns the current stack of middlewares. You probably won't
+      # need to use this directly, and it's recommended that you don't.
+      #
+      # @return [Array]
+      def stack
+        @stack ||= []
+      end
+
       # Converts the builder stack to a runnable action sequence.
       #
       # @param [Vagrant::Action::Environment] env The action environment
@@ -114,11 +123,6 @@ module Vagrant
         # and predictable behavior upon exceptions.
         Warden.new(stack.dup, env)
       end
-
-      # Runs the builder stack with the given environment.
-      def call(env)
-        to_app(env).call(env)
-      end
     end
   end
 end