vagrant 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.7.2 (February 8, 2011)
+
+  - Update JSON dependency to 1.5.1, which works with Ruby 1.9 on
+    Windows.
+  - Fix sudo issues on sudo < 1.7.0 (again).
+  - Fix race condition in SSH, which specifically manifested itself in
+    the chef server provisioner. [GH-295]
+  - Change sudo shell to use `bash` (configurable). [GH-301]
+  - Can now set mac address of host only network. [GH-294]
+  - NFS shared folders with spaces now work properly. [GH-293]
+  - Failed SSH commands now show output in error message. [GH-285]
+
 ## 0.7.1 (January 28, 2011)
 
   - Change error output with references to VirtualBox 3.2 to 4.0.

data/Gemfile

@@ -14,6 +14,8 @@ group :test do
   gem "mocha"
 
   # For documentation
-  gem "yard", "~> 0.6.1"
-  gem "bluecloth"
+  platforms :ruby do
+    gem "yard", "~> 0.6.1"
+    gem "bluecloth"
+  end
 end

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

@@ -8,7 +8,7 @@ module Vagrant
           @app = app
           @env = env
 
-          if enable_network? && Util::Platform.windows?
+          if enable_network? && Util::Platform.windows? && Util::Platform.bit64?
             raise Errors::NetworkNotImplemented
           end
 
@@ -65,6 +65,7 @@ module Vagrant
             adapter.enabled = true
             adapter.attachment_type = :host_only
             adapter.host_interface = network_name(network_options)
+            adapter.mac_address = network_options[:mac].gsub(':', '') if network_options[:mac]
             adapter.save
           end
         end

data/lib/vagrant/config/ssh.rb

@@ -11,6 +11,11 @@ module Vagrant
       attr_writer :private_key_path
       attr_accessor :forward_agent
       attr_accessor :forward_x11
+      attr_accessor :sudo_shell
+
+      def initialize
+        @sudo_shell = "bash"
+      end
 
       def private_key_path
         File.expand_path(@private_key_path, env.root_path)

data/lib/vagrant/config/vm.rb

@@ -55,6 +55,7 @@ module Vagrant
           :ip => ip,
           :netmask => "255.255.255.0",
           :adapter => 1,
+          :mac => nil,
           :name => nil
         }.merge(options || {})
 

data/lib/vagrant/data_store.rb

@@ -19,13 +19,13 @@ module Vagrant
       @file_path = file_path
       return if !file_path
 
-      File.open(file_path, "r") do |f|
-        merge!(JSON.parse(f.read))
+      raise Errors::DotfileIsDirectory if File.directory?(file_path)
+
+      if File.exist?(file_path)
+        File.open(file_path, "r") do |f|
+          merge!(JSON.parse(f.read))
+        end
       end
-    rescue Errno::ENOENT
-      clear
-    rescue Errno::EISDIR
-      raise Errors::DotfileIsDirectory
     end
 
     # Commits any changes to the data to disk. Even if the data

data/lib/vagrant/hosts/bsd.rb

@@ -25,6 +25,7 @@ module Vagrant
         output.split("\n").each do |line|
           # This should only ask for administrative permission once, even
           # though its executed in multiple subshells.
+          line = line.gsub('"', '\"')
           system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
         end
 

data/lib/vagrant/ssh.rb

@@ -79,7 +79,7 @@ module Vagrant
                                    :user_known_hosts_file => [],
                                    :paranoid => false,
                                    :config => false)) do |ssh|
-          yield SSH::Session.new(ssh)
+          yield SSH::Session.new(ssh, env)
         end
       end
     rescue Errno::ECONNREFUSED

data/lib/vagrant/ssh/session.rb

@@ -7,9 +7,11 @@ module Vagrant
       include Util::Retryable
 
       attr_reader :session
+      attr_reader :env
 
-      def initialize(session)
+      def initialize(session, env)
         @session = session
+        @env = env
       end
 
       # Executes a given command and simply returns true/false if the
@@ -31,8 +33,8 @@ module Vagrant
       # this command is tailor-made to be compliant with older versions
       # of `sudo`.
       def sudo!(commands, options=nil, &block)
-        session.open_channel do |ch|
-          ch.exec("sudo -i sh") do |ch2, success|
+        channel = session.open_channel do |ch|
+          ch.exec("sudo #{env.config.ssh.sudo_shell} -l") do |ch2, success|
             # Output each command as if they were entered on the command line
             [commands].flatten.each do |command|
               ch2.send_data "#{command}\n"
@@ -45,9 +47,10 @@ module Vagrant
             # stdout/stderr and error checking goodies
             setup_channel_callbacks(ch2, commands, options, block)
           end
-
-          ch.wait
         end
+
+        channel.wait
+        channel[:result]
       end
 
       # Executes a given command on the SSH session and blocks until
@@ -74,7 +77,7 @@ module Vagrant
         options = { :error_check => true }.merge(options || {})
 
         block ||= Proc.new do |ch, type, data|
-          check_exit_status(data, command, options) if type == :exit_status && options[:error_check]
+          check_exit_status(data, command, options, ch[:result]) if type == :exit_status && options[:error_check]
 
           ch[:result] ||= ""
           ch[:result] << data if [:stdout, :stderr].include?(type)
@@ -98,12 +101,14 @@ module Vagrant
 
       # Checks for an erroroneous exit status and raises an exception
       # if so.
-      def check_exit_status(exit_status, commands, options=nil)
+      def check_exit_status(exit_status, commands, options=nil, output=nil)
         if exit_status != 0
+          output ||= '[no output]'
           options = {
             :_error_class => Errors::VagrantError,
             :_key => :ssh_bad_exit_status,
-            :command => [commands].flatten.join("\n")
+            :command => [commands].flatten.join("\n"),
+            :output => output
           }.merge(options || {})
 
           raise options[:_error_class], options

data/lib/vagrant/systems/debian.rb

@@ -26,6 +26,7 @@ module Vagrant
         vm.ssh.execute do |ssh|
           if !ssh.test?("sudo hostname | grep '#{name}'")
             ssh.exec!("sudo sed -i 's/.*$/#{name}/' /etc/hostname")
+            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
             ssh.exec!("sudo service hostname start")
           end
         end

data/lib/vagrant/systems/linux.rb

@@ -45,7 +45,7 @@ module Vagrant
         folders.each do |name, opts|
           vm.ssh.execute do |ssh|
             ssh.exec!("sudo mkdir -p #{opts[:guestpath]}")
-            ssh.exec!("sudo mount #{ip}:#{opts[:hostpath]} #{opts[:guestpath]}", :error_class => LinuxError, :_key => :mount_nfs_fail)
+            ssh.exec!("sudo mount #{ip}:'#{opts[:hostpath]}' #{opts[:guestpath]}", :_error_class => LinuxError, :_key => :mount_nfs_fail)
           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.7.1"
+  VERSION = "0.7.2"
 end

data/templates/locales/en.yml

@@ -70,6 +70,10 @@ en:
         Vagrant assumes that this means the command failed!
 
         %{command}
+
+        The output of the command prior to failing is outputted below:
+
+        %{output}
       ssh_connection_refused: |-
         SSH connection was refused! This usually happens if the VM failed to
         boot properly. Some steps to try to fix this: First, try reloading your

data/templates/nfs/exports.erb

@@ -1,5 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
 <% folders.each do |name, opts| %>
-<%= opts[:hostpath] %> <%= ip %><% if opts[:map_uid] -%> -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end -%>
+"<%= opts[:hostpath] %>" <%= ip %><% if opts[:map_uid] -%> -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end -%>
 <% end %>
 # VAGRANT-END: <%= uuid %>

data/templates/nfs/exports_linux.erb

@@ -1,5 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
 <% folders.each do |name, opts| %>
-<%= opts[:hostpath] %> <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
+"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
 <% end %>
 # VAGRANT-END: <%= uuid %>

data/test/vagrant/action/vm/network_test.rb

@@ -16,8 +16,9 @@ class NetworkVMActionTest < Test::Unit::TestCase
   end
 
   context "initializing" do
-    should "raise an error if on windows and networking is enabled" do
+    should "raise an error if on windows x64 and networking is enabled" do
       Vagrant::Util::Platform.stubs(:windows?).returns(true)
+      Vagrant::Util::Platform.stubs(:bit64?).returns(true)
       @env.env.config.vm.network("foo")
 
       assert_raises(Vagrant::Errors::NetworkNotImplemented) {
@@ -115,24 +116,44 @@ class NetworkVMActionTest < Test::Unit::TestCase
 
         @network_adapters = []
         @internal_vm.stubs(:network_adapters).returns(@network_adapters)
+      end
 
-        @options = {
+      def expect_adapter_setup(options=nil)
+        options = {
           :ip => "foo",
           :adapter => 7
-        }
+        }.merge(options || {})
 
-        @env.env.config.vm.network(@options[:ip], @options)
-      end
+        @env["config"].vm.network(options[:ip], options)
 
-      should "setup the specified network adapter" do
-        adapter = mock("adapter")
-        @network_adapters[@options[:adapter]] = adapter
+        @env["vm"].vm.network_adapters.clear
+        @env["vm"].vm.network_adapters[options[:adapter]] = adapter = mock("adapter")
 
-        adapter.expects(:enabled=).with(true).once
+        adapter.expects(:enabled=).with(true)
         adapter.expects(:attachment_type=).with(:host_only).once
         adapter.expects(:host_interface=).with(@network_name).once
+
+        if options[:mac]
+          adapter.expects(:mac_address=).with(options[:mac].gsub(':', '')).once
+        else
+          adapter.expects(:mac_address=).never
+        end
+
         adapter.expects(:save).once
+      end
+
+      should "setup the specified network adapter" do
+        expect_adapter_setup
+        @instance.assign_network
+      end
+
+      should "setup the specified network adapter's mac address if specified" do
+        expect_adapter_setup(:mac => "foo")
+        @instance.assign_network
+      end
 
+      should "properly remove : from mac address" do
+        expect_adapter_setup(:mac => "foo:bar")
         @instance.assign_network
       end
     end

data/test/vagrant/ssh/session_test.rb

@@ -3,9 +3,10 @@ require "test_helper"
 class SshSessionTest < Test::Unit::TestCase
   setup do
     @session = mock("session")
+    @env = vagrant_env
 
     @klass = Vagrant::SSH::Session
-    @instance = @klass.new(@session)
+    @instance = @klass.new(@session, @env)
   end
 
   context "exec!" do

data/vagrant.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
   s.add_dependency "erubis", "~> 2.6.6"
-  s.add_dependency "json", "~> 1.4.6"
+  s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "mario", "~> 0.0.6"
   s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "net-scp", "~> 1.0.4"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
         version: 0.5.2
   type: :runtime
   prerelease: false
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 6
         version: 2.6.6
   type: :runtime
   prerelease: false
@@ -55,11 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -70,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 6
         version: 0.0.6
   type: :runtime
   prerelease: false
@@ -85,10 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :runtime
   prerelease: false
@@ -100,10 +76,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
         version: 1.0.4
   type: :runtime
   prerelease: false
@@ -115,10 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
   type: :runtime
   prerelease: false
@@ -130,10 +98,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 6
         version: 0.14.6
   type: :runtime
   prerelease: false
@@ -145,10 +109,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
   type: :runtime
   prerelease: false
@@ -160,8 +120,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -173,10 +131,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   type: :development
   prerelease: false
@@ -188,8 +142,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -201,8 +153,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -471,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1780875607345345301
+      hash: -3903323204405395882
       segments: 
       - 0
       version: "0"
@@ -480,15 +430,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: vagrant
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Build and distribute virtualized development environments.