vagrant 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.1 (January 18, 2012)
+
+  - Use `ifconfig device down` instead of `ifdown`. [GH-649]
+  - Clearer invalid log level error. [GH-645]
+  - Fix exception raised with NFS `recover` method.
+  - Fix `ui` `NoMethodError` exception in puppet server.
+  - Fix `vagrant box help` on Ruby 1.8.7. [GH-647]
+
 ## 0.9.0 (January 17, 2012)
 
   - VirtualBox 4.0 support backported in addition to supporting VirtualBox 4.1.

data/README.md

@@ -10,7 +10,7 @@ Vagrant is a tool for building and distributing virtualized development environm
 By providing automated creation and provisioning of virtual machines using [Oracle’s VirtualBox](http://www.virtualbox.org),
 Vagrant provides the tools to create and configure lightweight, reproducible, and portable
 virtual environments. For more information, see the part of the getting started guide
-on “[Why Vagrant?](http://vagrantup.com/docs/getting-started/index.html)”
+on “[Why Vagrant?](http://vagrantup.com/docs/getting-started/why.html)”
 
 ## Quick Start
 

data/lib/vagrant.rb

@@ -14,7 +14,21 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
     # This means that the logging constant wasn't found,
     # which is fine. We just keep `level` as `nil`. But
     # we tell the user.
+    level = nil
+  end
+
+  # Some constants, such as "true" resolve to booleans, so the
+  # above error checking doesn't catch it. This will check to make
+  # sure that the log level is an integer, as Log4r requires.
+  level = nil if !level.is_a?(Integer)
+
+  if !level
+    # We directly write to stderr here because the VagrantError system
+    # is not setup yet.
     $stderr.puts "Invalid VAGRANT_LOG level is set: #{ENV["VAGRANT_LOG"]}"
+    $stderr.puts ""
+    $stderr.puts "Please use one of the standard log levels: debug, info, warn, or error"
+    exit 1
   end
 
   # Set the logging level on all "vagrant" namespaced

data/lib/vagrant/action/vm/nfs.rb

@@ -36,15 +36,6 @@ module Vagrant
           mount_folders if !folders.empty?
         end
 
-        def recover(env)
-          # Ignore any VagrantErrors, because they were expected and
-          # will cause the VM to stick around.
-          return if env["vagrant.error"].is_a?(Errors::VagrantError)
-
-          # Otherwise, clear the NFS exports.
-          clear_nfs_exports(env)
-        end
-
         # Returns the folders which are to be synced via NFS.
         def folders
           @folders ||= {}

data/lib/vagrant/command/box.rb

@@ -41,7 +41,7 @@ module Vagrant
           # Add the available subcommands as separators in order to print them
           # out as well.
           keys = []
-          @subcommands.each { |key, value| keys << key }
+          @subcommands.each { |key, value| keys << key.to_s }
 
           keys.sort.each do |key|
             opts.separator "     #{key}"

data/lib/vagrant/guest/debian.rb

@@ -38,7 +38,7 @@ module Vagrant
         # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
         # SSH never dies.
         interfaces.each do |interface|
-          vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
+          vm.channel.sudo("/sbin/ifconfig eth#{interface} down 2> /dev/null")
         end
 
         vm.channel.sudo("cat /tmp/vagrant-network-entry >> /etc/network/interfaces")
@@ -50,7 +50,7 @@ module Vagrant
       end
 
       def change_host_name(name)
-        if !vm.channel.test?("hostname --fqdn | grep '^#{name}$' || hostname --short | grep '^#{name}$'")
+        if !vm.channel.test("hostname --fqdn | grep '^#{name}$' || hostname --short | grep '^#{name}$'")
           vm.channel.sudo("sed -r -i 's/^(127[.]0[.]1[.]1[[:space:]]+).*$/\\1#{name} #{name.split('.')[0]}/' /etc/hosts")
           vm.channel.sudo("sed -i 's/.*$/#{name.split('.')[0]}/' /etc/hostname")
           vm.channel.sudo("hostname -F /etc/hostname")

data/lib/vagrant/guest/redhat.rb

@@ -39,7 +39,7 @@ module Vagrant
         # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
         # SSH never dies.
         interfaces.each do |interface|
-          vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
+          vm.channel.sudo("/sbin/ifconfig eth#{interface} down 2> /dev/null")
           vm.channel.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-eth#{interface}")
           vm.channel.sudo("/sbin/ifup eth#{interface}")
         end

data/lib/vagrant/provisioners/puppet_server.rb

@@ -44,9 +44,14 @@ module Vagrant
 
         command = "puppetd #{options} --server #{config.puppet_server} --certname #{cn}"
 
-        env.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
+        env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
         env[:vm].channel.sudo(command) do |type, data|
-          env.ui.info(data)
+          # Output the data with the proper color based on the stream.
+          color = type == :stdout ? :green : :red
+
+          # Note: Be sure to chomp the data to avoid the newlines that the
+          # Chef outputs.
+          env[:ui].info(data.chomp, :color => color, :prefix => false)
         end
       end
     end

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement