vagrant 0.9.5 → 0.9.7

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.9.7 (February 9, 2012)
+
+  - Fix regression where all subprocess IO simply didn't work with
+    Windows. [GH-721]
+
+## 0.9.6 (February 7, 2012)
+
+  - Fix strange issue with inconsistent childprocess reads on JRuby. [GH-711]
+  - `vagrant ssh` does a direct `exec()` syscall now instead of going through
+    the shell. This makes it so things like shell expansion oddities no longer
+    cause problems. [GH-715]
+  - Fix crashing case if there are no ports to forward.
+  - Fix issue surrounding improper configuration of host only networks on
+    RedHat guests. [GH-719]
+  - NFS should work properly on Gentoo. [GH-706]
+
 ## 0.9.5 (February 5, 2012)
 
   - Fix crashing case when all network options are `:auto_config false`.

data/lib/vagrant.rb

@@ -160,6 +160,7 @@ Vagrant.hosts.register(:arch)    { Vagrant::Hosts::Arch }
 Vagrant.hosts.register(:bsd)     { Vagrant::Hosts::BSD }
 Vagrant.hosts.register(:fedora)  { Vagrant::Hosts::Fedora }
 Vagrant.hosts.register(:freebsd) { Vagrant::Hosts::FreeBSD }
+Vagrant.hosts.register(:gentoo)  { Vagrant::Hosts::Gentoo }
 Vagrant.hosts.register(:linux)   { Vagrant::Hosts::Linux }
 Vagrant.hosts.register(:windows) { Vagrant::Hosts::Windows }
 

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

@@ -81,7 +81,10 @@ module Vagrant
             ports << options.merge(:name => options[:name], :adapter => options[:adapter])
           end
 
-          @env[:vm].driver.forward_ports(ports)
+          if !ports.empty?
+            # We only need to forward ports if there are any to forward
+            @env[:vm].driver.forward_ports(ports)
+          end
         end
       end
     end

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -144,7 +144,7 @@ module Vagrant
                        pf_builder.join(",")])
         end
 
-        execute("modifyvm", @uuid, *args)
+        execute("modifyvm", @uuid, *args) if !args.empty?
       end
 
       def halt

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -144,7 +144,7 @@ module Vagrant
                        pf_builder.join(",")])
         end
 
-        execute("modifyvm", @uuid, *args)
+        execute("modifyvm", @uuid, *args) if !args.empty?
       end
 
       def halt

data/lib/vagrant/guest/redhat.rb

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

data/lib/vagrant/hosts.rb

@@ -7,6 +7,7 @@ module Vagrant
     autoload :BSD,     'vagrant/hosts/bsd'
     autoload :FreeBSD, 'vagrant/hosts/freebsd'
     autoload :Fedora,  'vagrant/hosts/fedora'
+    autoload :Gentoo,  'vagrant/hosts/gentoo'
     autoload :Linux,   'vagrant/hosts/linux'
     autoload :Windows, 'vagrant/hosts/windows'
 

data/lib/vagrant/hosts/gentoo.rb

@@ -0,0 +1,20 @@
+module Vagrant
+  module Hosts
+    class Gentoo < Linux
+      def self.match?
+        return File.exists?("/etc/gentoo-release")
+      end
+
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
+      def initialize(*args)
+        super
+
+        @nfs_server_binary = "/etc/init.d/nfs"
+      end
+    end
+  end
+end

data/lib/vagrant/provisioners/puppet.rb

@@ -146,12 +146,7 @@ module Vagrant
                              :manifest => @manifest_file)
 
         env[:vm].channel.sudo(command) do |type, 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)
+          env[:ui].info(data.chomp, :prefix => false)
         end
       end
 

data/lib/vagrant/ssh.rb

@@ -75,26 +75,26 @@ module Vagrant
       options[:private_key_path] = ssh_info[:private_key_path]
 
       # Command line options
-      command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",
-                         "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
-                         "-o LogLevel=ERROR"]
-      command_options << "-i #{options[:private_key_path]}" if !plain_mode
-      command_options << "-o ForwardAgent=yes" if ssh_info[:forward_agent]
+      command_options = ["-p", options[:port].to_s, "-o", "UserKnownHostsFile=/dev/null",
+                         "-o", "StrictHostKeyChecking=no", "-o", "IdentitiesOnly=yes",
+                         "-o", "LogLevel=ERROR"]
+      command_options += ["-i", options[:private_key_path]] if !plain_mode
+      command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
 
       # If there are extra options, then we append those
       command_options.concat(opts[:extra_args]) if opts[:extra_args]
 
       if ssh_info[:forward_x11]
         # Both are required so that no warnings are shown regarding X11
-        command_options << "-o ForwardX11=yes"
-        command_options << "-o ForwardX11Trusted=yes"
+        command_options += ["-o", "ForwardX11=yes"]
+        command_options += ["-o", "ForwardX11Trusted=yes"]
       end
 
       host_string = options[:host]
       host_string = "#{options[:username]}@#{host_string}" if !plain_mode
-      command = "ssh #{command_options.join(" ")} #{host_string}".strip
-      @logger.info("Invoking SSH: #{command}")
-      safe_exec(command)
+      command_options << host_string
+      @logger.info("Invoking SSH: #{command_options.inspect}")
+      safe_exec("ssh", *command_options)
     end
 
     # Checks the file permissions for a private key, resetting them

data/lib/vagrant/test_helpers.rb

@@ -78,8 +78,11 @@ module Vagrant
     # given vagrant environment. This allows for testing of middlewares.
     def action_env(v_env = nil)
       v_env ||= vagrant_env
+      # duplicate the Vagrant::Environment ui and get the default vm object
+      # for the new action environment from the first pair in the vms list
+      opts = {:ui => v_env.ui.dup, :vm => v_env.vms.first.last}
       app = lambda { |env| }
-      env = Vagrant::Action::Environment.new(v_env)
+      env = Vagrant::Action::Environment.new(opts)
       env["vagrant.test"] = true
       [app, env]
     end

data/lib/vagrant/util/ansi_escape_code_remover.rb

@@ -15,7 +15,6 @@ module Vagrant
         matchers = [/\e\[\d*[ABCD]/,       # Matches things like \e[4D
                     /\e\[(\d*;)?\d*[HF]/,  # Matches \e[1;2H or \e[H
                     /\e\[(s|u|2J|K)/,      # Matches \e[s, \e[2J, etc.
-                    /\e\[(\d*;){0,2}\d*m/, # Matches color escapes: \e[32m
                     /\e\[=\d*[hl]/,        # Matches \e[=24h
                     /\e\[\?[1-9][hl]/,     # Matches \e[?2h
                     /\e\[20[hl]/,          # Matches \e[20l]

data/lib/vagrant/util/safe_exec.rb

@@ -7,7 +7,7 @@ module Vagrant
     # thread. In that case, `safe_exec` automatically falls back to
     # forking.
     module SafeExec
-      def safe_exec(command)
+      def safe_exec(command, *args)
         # Create a list of things to rescue from. Since this is OS
         # specific, we need to do some defined? checks here to make
         # sure they exist.
@@ -20,7 +20,7 @@ module Vagrant
         begin
           pid = nil
           pid = fork if fork_instead
-          Kernel.exec(command) if pid.nil?
+          Kernel.exec(command, *args) if pid.nil?
           Process.wait(pid) if pid
         rescue *rescue_from
           # We retried already, raise the issue and be done

data/lib/vagrant/util/subprocess.rb

@@ -64,9 +64,13 @@ module Vagrant
         # Make sure the stdin does not buffer
         process.io.stdin.sync = true
 
-        # Close the writer pipes, since we're just reading
-        stdout_writer.close
-        stderr_writer.close
+        if RUBY_PLATFORM != "java"
+          # On Java, we have to close after. See down the method...
+          # Otherwise, we close the writers right here, since we're
+          # not on the writing side.
+          stdout_writer.close
+          stderr_writer.close
+        end
 
         # Create a dictionary to store all the output we see.
         io_data = { :stdout => "", :stderr => "" }
@@ -140,6 +144,13 @@ module Vagrant
           yield io_name, extra_data if block_given?
         end
 
+        if RUBY_PLATFORM == "java"
+          # On JRuby, we need to close the writers after the process,
+          # for some reason. See GH-711.
+          stdout_writer.close
+          stderr_writer.close
+        end
+
         # Return an exit status container
         return Result.new(process.exit_code, io_data[:stdout], io_data[:stderr])
       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.5"
+  VERSION = "0.9.7"
 end

data/test/unit/vagrant/util/ansi_escape_code_remover_test.rb

@@ -11,7 +11,6 @@ describe Vagrant::Util::ANSIEscapeCodeRemover do
 
   it "should remove ANSI escape codes" do
     klass.remove_ansi_escape_codes("\e[Hyo").should == "yo"
-    klass.remove_ansi_escape_codes("\e[38myo").should == "yo"
   end
 end
 

data/vagrant.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant"
 
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
-  s.add_dependency "childprocess", "~> 0.3.0"
+  s.add_dependency "childprocess", "~> 0.3.1"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "log4r", "~> 1.1.9"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   name: childprocess
   type: :runtime
   prerelease: false
@@ -395,6 +395,7 @@ files:
 - lib/vagrant/hosts/bsd.rb
 - lib/vagrant/hosts/fedora.rb
 - lib/vagrant/hosts/freebsd.rb
+- lib/vagrant/hosts/gentoo.rb
 - lib/vagrant/hosts/linux.rb
 - lib/vagrant/hosts/windows.rb
 - lib/vagrant/plugin.rb