vagrant 0.7.2 → 0.7.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.7.3 (April 19, 2011)
+
+  - Retry all SSH on Net::SSH::Disconnect in case SSH is just restarting. [GH-313]
+  - Add NFS shared folder support for Arch linux. [GH-346]
+  - Fix issue with unknown terminal type output for sudo commands.
+  - Forwarded port protocol can now be set as UDP. [GH-311]
+  - Chef server file cache path and file backup path can be configured. [GH-310]
+  - Setting hostname should work on Debian now. [GH-307]
+
 ## 0.7.2 (February 8, 2011)
 
   - Update JSON dependency to 1.5.1, which works with Ruby 1.9 on

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

@@ -125,6 +125,7 @@ module Vagrant
           port.name = name
           port.guestport = options[:guestport]
           port.hostport = options[:hostport]
+          port.protocol = options[:protocol] || :tcp
           @env["vm"].vm.network_adapters[options[:adapter]].nat_driver.forwarded_ports << port
         end
       end

data/lib/vagrant/config/vm.rb

@@ -35,7 +35,7 @@ module Vagrant
         options = {
           :guestport  => guestport,
           :hostport   => hostport,
-          :protocol   => "TCP",
+          :protocol   => :tcp,
           :adapter    => 0,
           :auto       => false
         }.merge(options || {})

data/lib/vagrant/hosts.rb

@@ -3,5 +3,6 @@ module Vagrant
     autoload :Base,  'vagrant/hosts/base'
     autoload :BSD,   'vagrant/hosts/bsd'
     autoload :Linux, 'vagrant/hosts/linux'
+    autoload :Arch,  'vagrant/hosts/arch'
   end
 end

data/lib/vagrant/hosts/arch.rb

@@ -0,0 +1,27 @@
+module Vagrant
+  module Hosts
+    class Arch < Linux
+      def nfs_export(ip, folders)
+        output = TemplateRenderer.render('nfs/exports_linux',
+                                         :uuid => env.vm.uuid,
+                                         :ip => ip,
+                                         :folders => folders)
+
+        env.ui.info I18n.t("vagrant.hosts.arch.nfs_export.prepare")
+        sleep 0.5
+
+        output.split("\n").each do |line|
+          # This should only ask for administrative permission once, even
+          # though its executed in multiple subshells.
+          system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
+        end
+
+        # We run restart here instead of "update" just in case nfsd
+        # is not starting
+        system("sudo /etc/rc.d/rpcbind restart")
+        system("sudo /etc/rc.d/nfs-common restart")
+        system("sudo /etc/rc.d/nfs-server restart")
+      end
+    end
+  end
+end

data/lib/vagrant/hosts/base.rb

@@ -31,6 +31,7 @@ module Vagrant
           classes = {
             :darwin => BSD,
             :bsd => BSD,
+            :arch => Arch,
             :linux => Linux
           }
 

data/lib/vagrant/provisioners/chef_server.rb

@@ -12,12 +12,16 @@ module Vagrant
         attr_accessor :validation_key_path
         attr_accessor :validation_client_name
         attr_accessor :client_key_path
+        attr_accessor :file_cache_path
+        attr_accessor :file_backup_path
 
         def initialize
           super
 
           @validation_client_name = "chef-validator"
           @client_key_path = "/etc/chef/client.pem"
+          @file_cache_path = "/srv/chef/file_store"
+          @file_backup_path = "/srv/chef/cache"
         end
 
         def validate(errors)
@@ -65,7 +69,9 @@ module Vagrant
           :chef_server_url => config.chef_server_url,
           :validation_client_name => config.validation_client_name,
           :validation_key => guest_validation_key_path,
-          :client_key => config.client_key_path
+          :client_key => config.client_key_path,
+          :file_cache_path => config.file_cache_path,
+          :file_backup_path => config.file_backup_path
         })
       end
 

data/lib/vagrant/provisioners/chef_solo.rb

@@ -65,8 +65,11 @@ module Vagrant
         env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
         vm.ssh.execute do |ssh|
           ssh.sudo!(commands) do |channel, type, data|
-            ssh.check_exit_status(data, commands) if type == :exit_status
-            env.ui.info("#{data}: #{type}") if type != :exit_status
+            if type == :exit_status
+              ssh.check_exit_status(data, commands)
+            else
+              env.ui.info("#{data}: #{type}")
+            end
           end
         end
       end

data/lib/vagrant/ssh/session.rb

@@ -35,6 +35,9 @@ module Vagrant
       def sudo!(commands, options=nil, &block)
         channel = session.open_channel do |ch|
           ch.exec("sudo #{env.config.ssh.sudo_shell} -l") do |ch2, success|
+            # Set the terminal
+            ch2.send_data "export TERM=vt100\n"
+
             # Output each command as if they were entered on the command line
             [commands].flatten.each do |command|
               ch2.send_data "#{command}\n"
@@ -58,7 +61,7 @@ module Vagrant
       # the actual `exec!` implementation, except that this
       # implementation also reports `:exit_status` to the block if given.
       def exec!(command, options=nil, &block)
-        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
+        retryable(:tries => 5, :on => [IOError, Net::SSH::Disconnect], :sleep => 1.0) do
           metach = session.open_channel do |channel|
             channel.exec(command) do |ch, success|
               raise "could not execute command: #{command.inspect}" unless success
@@ -85,6 +88,9 @@ module Vagrant
 
         # Output stdout data to the block
         channel.on_data do |ch2, data|
+          # This clears the screen, we want to filter it out.
+          data.gsub!("\e[H", "")
+
           block.call(ch2, :stdout, data)
         end
 

data/lib/vagrant/systems.rb

@@ -8,3 +8,4 @@ require 'vagrant/systems/solaris'
 require 'vagrant/systems/debian'
 require 'vagrant/systems/gentoo'
 require 'vagrant/systems/redhat'
+require 'vagrant/systems/ubuntu'

data/lib/vagrant/systems/debian.rb

@@ -25,9 +25,9 @@ module Vagrant
       def change_host_name(name)
         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")
+            ssh.exec!("sudo sed -i 's/.*$/#{name}/' /etc/hostname")
+            ssh.exec!("sudo hostname -F /etc/hostname")
           end
         end
       end

data/lib/vagrant/systems/linux.rb

@@ -6,7 +6,11 @@ module Vagrant
     class Linux < Base
       def distro_dispatch
         vm.ssh.execute do |ssh|
-          return :debian if ssh.test?("cat /etc/debian_version")
+          if ssh.test?("cat /etc/debian_version")
+            return :debian if ssh.test?("cat /proc/version | grep 'Debian'")
+            return :ubuntu if ssh.test?("cat /proc/version | grep 'Ubuntu'")
+          end
+
           return :gentoo if ssh.test?("cat /etc/gentoo-release")
           return :redhat if ssh.test?("cat /etc/redhat-release")
         end

data/lib/vagrant/systems/ubuntu.rb

@@ -0,0 +1,17 @@
+require 'vagrant/systems/debian'
+
+module Vagrant
+  module Systems
+    class Ubuntu < Debian
+      def change_host_name(name)
+        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
+      end
+    end
+  end
+end

data/lib/vagrant/util/platform.rb

@@ -28,6 +28,13 @@ module Vagrant
           false
         end
 
+        def arch?
+          linux? &&
+            File.exist?('/etc/rc.conf') &&
+            File.exist?('/etc/pacman.conf') &&
+            File.exist?('/etc/rc.d/')
+        end
+
         # Returns boolean noting whether this is a 64-bit CPU. This
         # is not 100% accurate and there could easily be false negatives.
         #

data/lib/vagrant/util/retryable.rb

@@ -12,7 +12,7 @@ module Vagrant
 
         begin
           return yield
-        rescue opts[:on]
+        rescue *opts[:on]
           if (opts[:tries] -= 1) > 0
             sleep opts[:sleep].to_f if opts[:sleep]
             retry

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.2"
+  VERSION = "0.7.3"
 end

data/lib/vagrant/vm.rb

@@ -59,6 +59,7 @@ module Vagrant
         # Hard-coded internal systems
         mapping = {
           :debian  => Systems::Debian,
+          :ubuntu  => Systems::Ubuntu,
           :freebsd => Systems::FreeBSD,
           :gentoo  => Systems::Gentoo,
           :redhat  => Systems::Redhat,

data/templates/chef_server_client.erb

@@ -10,8 +10,8 @@ validation_client_name "<%= validation_client_name %>"
 validation_key         "<%= validation_key %>"
 client_key             "<%= client_key %>"
 
-file_store_path    "/srv/chef/file_store"
-file_cache_path    "/srv/chef/cache"
+file_cache_path    "<%= file_cache_path %>"
+file_backup_path   "<%= file_backup_path %>"
 
 pid_file           "/var/run/chef/chef-client.pid"
 

data/templates/commands/init/Vagrantfile.erb

@@ -26,6 +26,25 @@ Vagrant::Config.run do |config|
   # folder, and the third is the path on the host to the actual folder.
   # config.vm.share_folder "v-data", "/vagrant_data", "../data"
 
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file <%= box_name %>.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "<%= box_name %>.pp"
+  # end
+
   # Enable provisioning with chef solo, specifying a cookbooks path (relative
   # to this Vagrantfile), and adding some recipes and/or roles.
   #
@@ -35,7 +54,7 @@ Vagrant::Config.run do |config|
   #   chef.add_role "web"
   #
   #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
+  #   chef.json.merge!({ :mysql_password => "foo" })
   # end
 
   # Enable provisioning with chef server, specifying the chef server URL,

data/templates/locales/en.yml

@@ -451,6 +451,10 @@ en:
         nfs_export:
           prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
 
+      arch:
+        nfs_export:
+          prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
+
     provisioners:
       chef:
         json: "Generating chef JSON and uploading..."

data/templates/network_entry_gentoo.erb

@@ -3,5 +3,3 @@
 # Please do not modify any of these contents.
 config_eth<%= net_options[:adapter] %>=("<%= net_options[:ip] %> netmask <%= net_options[:netmask] %>")
 #VAGRANT-END
-~            
-

data/test/vagrant/provisioners/chef_server_test.rb

@@ -159,7 +159,9 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
         :chef_server_url => @config.chef_server_url,
         :validation_client_name => @config.validation_client_name,
         :validation_key => @action.guest_validation_key_path,
-        :client_key => @config.client_key_path
+        :client_key => @config.client_key_path,
+        :file_cache_path => @config.file_cache_path,
+        :file_backup_path => @config.file_backup_path
       })
 
       @action.setup_server_config

data/test/vagrant/util/retryable_test.rb

@@ -31,6 +31,18 @@ class RetryableUtilTest < Test::Unit::TestCase
     }
   end
 
+  should "retry on multiple exceptions given" do
+    proc = mock("proc")
+    proc.expects(:call).twice
+
+    assert_raises(StandardError) {
+      @klass.retryable(:tries => 2, :on => [StandardError, RuntimeError]) do
+        proc.call
+        raise StandardError
+      end
+    }
+  end
+
   should "return the value of the block" do
     result = @klass.retryable { 7 }
     assert_equal 7, result

metadata

@@ -2,7 +2,7 @@
 name: vagrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -271,6 +271,7 @@ files:
 - lib/vagrant/environment.rb
 - lib/vagrant/errors.rb
 - lib/vagrant/hosts.rb
+- lib/vagrant/hosts/arch.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
 - lib/vagrant/hosts/linux.rb
@@ -295,6 +296,7 @@ files:
 - lib/vagrant/systems/linux/error.rb
 - lib/vagrant/systems/redhat.rb
 - lib/vagrant/systems/solaris.rb
+- lib/vagrant/systems/ubuntu.rb
 - lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util.rb
@@ -421,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3903323204405395882
+      hash: 1249069631573573223
       segments: 
       - 0
       version: "0"