vagrantup 0.6.9 → 0.7.0

data/lib/vagrant/ssh.rb

@@ -3,6 +3,8 @@ require 'net/ssh'
 require 'net/scp'
 require 'mario'
 
+require 'vagrant/ssh/session'
+
 module Vagrant
   # Manages SSH access to a specific environment. Allows an environment to
   # replace the process with SSH itself, run a specific set of commands,
@@ -42,6 +44,7 @@ module Vagrant
                          "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
                          "-i #{options[:private_key_path]}"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
+      command_options << "-o ForwardX11=yes" if env.config.ssh.forward_x11
 
       # Some hackery going on here. On Mac OS X Leopard (10.5), exec fails
       # (GH-51). As a workaround, we fork and wait. On all other platforms,
@@ -139,8 +142,7 @@ module Vagrant
 
     # Returns the port which is either given in the options hash or taken from
     # the config by finding it in the forwarded ports hash based on the
-    # `config.ssh.forwarded_port_key` or use the default port given by `config.ssh.port`
-    # when port forwarding isn't used.
+    # `config.ssh.forwarded_port_key`.
     def port(opts={})
       # Check if port was specified in options hash
       pnum = opts[:port]
@@ -158,80 +160,8 @@ module Vagrant
 
       return pnum.hostport if pnum
 
-      # Fall back to the default
-      return env.config.ssh.port
-    end
-  end
-
-  class SSH
-    # A helper class which wraps around `Net::SSH::Connection::Session`
-    # in order to provide basic command error checking while still
-    # providing access to the actual session object.
-    class Session
-      include Util::Retryable
-
-      attr_reader :session
-
-      def initialize(session)
-        @session = session
-      end
-
-      # Executes a given command on the SSH session and blocks until
-      # the command completes. This is an almost line for line copy of
-      # the actual `exec!` implementation, except that this
-      # implementation also reports `:exit_status` to the block if given.
-      def exec!(command, options=nil, &block)
-        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]
-
-          ch[:result] ||= ""
-          ch[:result] << data if [:stdout, :stderr].include?(type)
-        end
-
-        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
-          metach = session.open_channel do |channel|
-            channel.exec(command) do |ch, success|
-              raise "could not execute command: #{command.inspect}" unless success
-
-              # Output stdout data to the block
-              channel.on_data do |ch2, data|
-                block.call(ch2, :stdout, data)
-              end
-
-              # Output stderr data to the block
-              channel.on_extended_data do |ch2, type, data|
-                block.call(ch2, :stderr, data)
-              end
-
-              # Output exit status information to the block
-              channel.on_request("exit-status") do |ch2, data|
-                block.call(ch2, :exit_status, data.read_long)
-              end
-            end
-          end
-
-          metach.wait
-          metach[:result]
-        end
-      end
-
-      # Checks for an erroroneous exit status and raises an exception
-      # if so.
-      def check_exit_status(exit_status, command, options=nil)
-        if exit_status != 0
-          options = {
-            :_error_class => Errors::VagrantError,
-            :_key => :ssh_bad_exit_status,
-            :command => command
-          }.merge(options || {})
-
-          raise options[:_error_class], options
-        end
-      end
+      # This should NEVER happen.
+      raise Errors::SSHPortNotDetected
     end
   end
 end

data/lib/vagrant/systems/base.rb

@@ -15,6 +15,10 @@ module Vagrant
     # required by systems can and will change at any time. Any
     # changes will be noted on release notes.**
     class Base
+      class BaseError < Errors::VagrantError
+        error_namespace("vagrant.systems.base")
+      end
+
       include Vagrant::Util
 
       # The VM which this system is tied to.
@@ -27,6 +31,15 @@ module Vagrant
         @vm = vm
       end
 
+      # This method is automatically called when the system is available (when
+      # Vagrant can successfully SSH into the machine) to give the system a chance
+      # to determine the distro and return a distro-specific system.
+      #
+      # **Warning:** If a return value which subclasses from {Base} is
+      # returned, Vagrant will use it as the new system instance for the
+      # class.
+      def distro_dispatch; end
+
       # Halt the machine. This method should gracefully shut down the
       # operating system. This method will cause `vagrant halt` and associated
       # commands to _block_, meaning that if the machine doesn't halt
@@ -55,7 +68,9 @@ module Vagrant
 
       # Prepares the system for host only networks. This is called
       # once prior to any `enable_host_only_network` calls.
-      def prepare_host_only_network; end
+      def prepare_host_only_network(net_options=nil)
+        raise BaseError, :_key => :unsupported_host_only
+      end
 
       # Setup the system by adding a new host only network. This
       # method should configure and bring up the interface for the

data/lib/vagrant/systems/debian.rb

@@ -0,0 +1,26 @@
+module Vagrant
+  module Systems
+    class Debian < Linux
+      def prepare_host_only_network(net_options=nil)
+        # Remove any previous host only network additions to the
+        # interface file.
+        vm.ssh.execute do |ssh|
+          # Clear out any previous entries
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_debian', :net_options => net_options)
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/network/interfaces'")
+          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/gentoo.rb

@@ -0,0 +1,27 @@
+module Vagrant
+  module Systems
+    class Gentoo < Linux
+      def prepare_host_only_network(net_options=nil)
+        # Remove any previous host only network additions to the
+        # interface file.
+        vm.ssh.execute do |ssh|
+          # Clear out any previous entries
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/conf.d/net > /tmp/vagrant-network-interfaces")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/conf.d/net'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_gentoo', :net_options => net_options)
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo ln -s /etc/init.d/net.lo /etc/init.d/net.eth#{net_options[:adapter]}")
+          ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} stop 2> /dev/null")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/conf.d/net'")
+          ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} start")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/linux/config.rb

@@ -0,0 +1,21 @@
+module Vagrant
+  module Systems
+    class Linux < Vagrant::Systems::Base
+      # A custom config class which will be made accessible via `config.linux`
+      # This is not necessary for all system implementers, of course. However,
+      # generally, Vagrant tries to make almost every aspect of its execution
+      # configurable, and this assists that goal.
+      class LinuxConfig < Vagrant::Config::Base
+        configures :linux
+
+        attr_accessor :halt_timeout
+        attr_accessor :halt_check_interval
+
+        def initialize
+          @halt_timeout = 30
+          @halt_check_interval = 1
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/linux/error.rb

@@ -0,0 +1,9 @@
+module Vagrant
+  module Systems
+    class Linux < Vagrant::Systems::Base
+      class LinuxError < Errors::VagrantError
+        error_namespace("vagrant.systems.linux")
+      end
+    end
+  end
+end

data/lib/vagrant/systems/linux.rb

@@ -1,32 +1,20 @@
+require 'vagrant/systems/linux/error'
+require 'vagrant/systems/linux/config'
+
 module Vagrant
   module Systems
-    # A general Vagrant system implementation for "linux." In general,
-    # any linux-based OS will work fine with this system, although its
-    # not tested exhaustively. BSD or other based systems may work as
-    # well, but that hasn't been tested at all.
-    #
-    # At any rate, this system implementation should server as an
-    # example of how to implement any custom systems necessary.
     class Linux < Base
-      # A custom config class which will be made accessible via `config.linux`
-      # This is not necessary for all system implementers, of course. However,
-      # generally, Vagrant tries to make almost every aspect of its execution
-      # configurable, and this assists that goal.
-      class LinuxConfig < Vagrant::Config::Base
-        configures :linux
-
-        attr_accessor :halt_timeout
-        attr_accessor :halt_check_interval
-
-        def initialize
-          @halt_timeout = 30
-          @halt_check_interval = 1
+      def distro_dispatch
+        vm.ssh.execute do |ssh|
+          return :debian if ssh.test?("cat /etc/debian_version")
+          return :gentoo if ssh.test?("cat /etc/gentoo-release")
+          return :redhat if ssh.test?("cat /etc/redhat-release")
         end
+
+        # Can't detect the distro, assume vanilla linux
+        nil
       end
 
-      #-------------------------------------------------------------------
-      # Overridden methods
-      #-------------------------------------------------------------------
       def halt
         vm.env.ui.info I18n.t("vagrant.systems.linux.attempting_halt")
         vm.ssh.execute do |ssh|
@@ -57,43 +45,19 @@ 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]}")
+            ssh.exec!("sudo mount #{ip}:#{opts[:hostpath]} #{opts[:guestpath]}", :error_class => LinuxError, :_key => :mount_nfs_fail)
           end
         end
       end
 
-      def prepare_host_only_network
-        # Remove any previous host only network additions to the
-        # interface file.
-        vm.ssh.execute do |ssh|
-          # Verify debian/ubuntu
-          ssh.exec!("cat /etc/debian_version", :error_class => LinuxError, :_key => :network_not_debian)
-
-          # Clear out any previous entries
-          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
-        end
-      end
-
-      def enable_host_only_network(net_options)
-        entry = TemplateRenderer.render('network_entry', :net_options => net_options)
-        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
-
-        vm.ssh.execute do |ssh|
-          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/network/interfaces'")
-          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
-        end
-      end
-
       #-------------------------------------------------------------------
       # "Private" methods which assist above methods
       #-------------------------------------------------------------------
       def mount_folder(ssh, name, guestpath, sleeptime=5)
         # Determine the permission string to attach to the mount command
         perms = []
-        perms << "uid=#{vm.env.config.vm.shared_folder_uid}"
-        perms << "gid=#{vm.env.config.vm.shared_folder_gid}"
+        perms << "uid=`id -u #{vm.env.config.vm.shared_folder_uid}`"
+        perms << "gid=`id -g #{vm.env.config.vm.shared_folder_gid}`"
         perms = " -o #{perms.join(",")}" if !perms.empty?
 
         attempts = 0
@@ -111,11 +75,5 @@ module Vagrant
         end
       end
     end
-
-    class Linux < Base
-      class LinuxError < Errors::VagrantError
-        error_namespace("vagrant.systems.linux")
-      end
-    end
   end
 end

data/lib/vagrant/systems/redhat.rb

@@ -0,0 +1,31 @@
+module Vagrant
+  module Systems
+    class Redhat < Linux
+      def prepare_host_only_network(net_options)
+        # Remove any previous host only network additions to the
+        # interface file.
+        vm.ssh.execute do |ssh|
+          # Clear out any previous entries
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]} > /tmp/vagrant-ifcfg-eth#{net_options[:adapter]}")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-ifcfg-eth#{net_options[:adapter]} > /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_redhat', :net_options => net_options)
+
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          interface_up = ssh.test?("/sbin/ifconfig eth#{net_options[:adapter]} | grep 'inet addr:'")
+          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null") if interface_up
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}'")
+          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/vagrant/systems.rb

@@ -0,0 +1,9 @@
+# These can't be autoloaded because they have to register functionality
+# with Vagrant core.
+require 'vagrant/systems/base'
+require 'vagrant/systems/linux'
+require 'vagrant/systems/solaris'
+
+require 'vagrant/systems/debian'
+require 'vagrant/systems/gentoo'
+require 'vagrant/systems/redhat'

data/lib/vagrant/test_helpers.rb

@@ -31,8 +31,8 @@ module Vagrant
 
       str  = args.shift || ""
       File.open(path.to_s, "w") do |f|
+        f.puts "ENV['VAGRANT_HOME'] = '#{home_path}'"
         f.puts "Vagrant::Config.run do |config|"
-        f.puts "config.vagrant.home = '#{home_path}'"
         f.puts "config.vm.base_mac = 'foo' if !config.vm.base_mac"
         f.puts "config.vm.box = 'base'"
         f.puts str

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.6.9"
+  VERSION = "0.7.0"
 end

data/lib/vagrant/vm.rb

@@ -3,7 +3,6 @@ module Vagrant
     include Vagrant::Util
 
     attr_reader :env
-    attr_reader :system
     attr_reader :name
     attr_reader :vm
 
@@ -41,6 +40,8 @@ module Vagrant
         # Load the associated system.
         load_system!
       end
+
+      @loaded_system_distro = false
     end
 
     # Loads the system associated with the VM. The system class is
@@ -48,15 +49,21 @@ module Vagrant
     # can be found by reading the documentation on {Vagrant::Systems::Base}.
     #
     # **This method should never be called manually.**
-    def load_system!
-      system = env.config.vm.system
+    def load_system!(system=nil)
+      system ||= env.config.vm.system
 
       if system.is_a?(Class)
+        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !(system <= Systems::Base)
         @system = system.new(self)
-        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !@system.is_a?(Systems::Base)
       elsif system.is_a?(Symbol)
         # Hard-coded internal systems
-        mapping = { :linux => Systems::Linux, :solaris => Systems::Solaris }
+        mapping = {
+          :debian => Systems::Debian,
+          :gentoo => Systems::Gentoo,
+          :redhat => Systems::Redhat,
+          :linux => Systems::Linux,
+          :solaris => Systems::Solaris
+        }
 
         raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)
         @system = mapping[system].new(self)
@@ -65,6 +72,19 @@ module Vagrant
       end
     end
 
+    # Returns the system for this VM, loading the distro of the system if
+    # we can.
+    def system
+      if !@loaded_system_distro && created? && vm.running?
+        # Load the system distro for the first time
+        result = @system.distro_dispatch
+        load_system!(result)
+        @loaded_system_distro = true
+      end
+
+      @system
+    end
+
     # Access the {Vagrant::SSH} object associated with this VM.
     # On the initial call, this will initialize the object. On
     # subsequent calls it will reuse the existing object.

data/lib/vagrant.rb

@@ -4,25 +4,21 @@ require 'i18n'
 require 'virtualbox'
 
 module Vagrant
-  # TODO: Move more classes over to the autoload model. We'll
-  # start small, but slowly move everything over.
-
+  autoload :Action,        'vagrant/action'
   autoload :Box,           'vagrant/box'
   autoload :BoxCollection, 'vagrant/box_collection'
   autoload :CLI,           'vagrant/cli'
   autoload :Config,        'vagrant/config'
   autoload :DataStore,     'vagrant/data_store'
+  autoload :Downloaders,   'vagrant/downloaders'
+  autoload :Environment,   'vagrant/environment'
   autoload :Errors,        'vagrant/errors'
+  autoload :Hosts,         'vagrant/hosts'
   autoload :Plugin,        'vagrant/plugin'
   autoload :TestHelpers,   'vagrant/test_helpers'
+  autoload :UI,            'vagrant/ui'
   autoload :Util,          'vagrant/util'
-
-  module Command
-    autoload :Base,      'vagrant/command/base'
-    autoload :GroupBase, 'vagrant/command/group_base'
-    autoload :Helpers,   'vagrant/command/helpers'
-    autoload :NamedBase, 'vagrant/command/named_base'
-  end
+  autoload :VM,            'vagrant/vm'
 
   # The source root is the path to the root directory of
   # the Vagrant gem.
@@ -34,13 +30,13 @@ end
 # Default I18n to load the en locale
 I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
 
-# Load them up. One day we'll convert this to autoloads. Today
-# is not that day. Low hanging fruit for anyone wishing to do it.
-libdir = File.expand_path("lib/vagrant", Vagrant.source_root)
-Vagrant::Util::GlobLoader.glob_require(libdir, %w{
-  downloaders/base provisioners/base provisioners/chef systems/base
-  hosts/base})
-
-# Initialize the built-in actions and load the plugins.
+# Load the things which must be loaded before anything else. Note that
+# I'm not sure why 'vagrant/ssh' must be loaded. But if I don't, I get
+# a very scary "unsupported cipher" error from net-ssh for no apparent reason.
+require 'vagrant/command'
+require 'vagrant/provisioners'
+require 'vagrant/systems'
+require 'vagrant/ssh'
+require 'vagrant/version'
 Vagrant::Action.builtin!
 Vagrant::Plugin.load!

data/templates/chef_solo_solo.erb

@@ -4,8 +4,16 @@ node_name "<%= node_name %>"
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>
-log_level          <%= log_level.inspect %>
+log_level <%= log_level.inspect %>
 
-<% if recipe_url %>
+<% if recipe_url -%>
 recipe_url "<%= recipe_url %>"
-<% end %>
+<% end -%>
+
+http_proxy <%= http_proxy.inspect %>
+http_proxy_user <%= http_proxy_user.inspect %>
+http_proxy_pass <%= http_proxy_pass.inspect %>
+https_proxy <%= https_proxy.inspect %>
+https_proxy_user <%= https_proxy_user.inspect %>
+https_proxy_pass <%= https_proxy_pass.inspect %>
+no_proxy <%= no_proxy.inspect %>

data/templates/commands/init/Vagrantfile.erb

@@ -24,18 +24,19 @@ Vagrant::Config.run do |config|
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
   # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder("v-data", "/vagrant_data", "../data")
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
 
   # Enable provisioning with chef solo, specifying a cookbooks path (relative
   # to this Vagrantfile), and adding some recipes and/or roles.
   #
-  # config.vm.provisioner = :chef_solo
-  # config.chef.cookbooks_path = "cookbooks"
-  # config.chef.add_recipe "mysql"
-  # config.chef.add_role "web"
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "cookbooks"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
   #
-  # You may also specify custom JSON attributes:
-  # config.chef.json = { :mysql_password => "foo" }
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
 
   # Enable provisioning with chef server, specifying the chef server URL,
   # and the path to the validation key (relative to this Vagrantfile).
@@ -47,9 +48,10 @@ Vagrant::Config.run do |config|
   # HTTP instead of HTTPS depending on your configuration. Also change the
   # validation key to validation.pem.
   #
-  # config.vm.provisioner = :chef_server
-  # config.chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  # config.chef.validation_key_path = "ORGNAME-validator.pem"
+  # config.vm.provision :chef_server do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
   #
   # If you're using the Opscode platform, your validator client is
   # ORGNAME-validator, replacing ORGNAME with your organization name.
@@ -57,5 +59,5 @@ Vagrant::Config.run do |config|
   # IF you have your own Chef Server, the default validation client name is
   # chef-validator, unless you changed the configuration.
   #
-  # config.chef.validation_client_name = "ORGNAME-validator"
+  #   chef.validation_client_name = "ORGNAME-validator"
 end