vagrant 0.3.4 → 0.4.0

data/lib/vagrant/commands/ssh_config.rb

@@ -9,12 +9,27 @@ module Vagrant
       def execute(args=[])
         env.require_root_path
 
-        parse_options(args)
+        args = parse_options(args)
+        show_single(args[0])
+      end
+
+      def show_single(name)
+        if name.nil? && env.multivm?
+          error_and_exit(:ssh_config_multivm)
+          return # for tests
+        end
+
+        vm = name.nil? ? env.vms.values.first : env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
         puts TemplateRenderer.render("ssh_config", {
           :host_key => options[:host] || "vagrant",
-          :ssh_user => env.config.ssh.username,
-          :ssh_port => env.ssh.port,
-          :private_key_path => env.config.ssh.private_key_path
+          :ssh_user => vm.env.config.ssh.username,
+          :ssh_port => vm.ssh.port,
+          :private_key_path => vm.env.config.ssh.private_key_path
         })
       end
 
@@ -27,4 +42,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/status.rb

@@ -5,54 +5,121 @@ module Vagrant
     # and if its running, suspended, etc.
     class Status < Base
       Base.subcommand "status", self
-      description "Shows the status of the current environment."
+      description "Shows the status of the Vagrant environment."
 
       def execute(args=[])
-        wrap_output do
-          if !env.root_path
-            puts <<-msg
-No vagrant environment detected. Run `vagrant init` to setup a Vagrantfile
-in the current directory to get started with Vagrant.
-msg
-          elsif !env.vm
-            puts <<-msg
-The environment has not yet been created. Run `vagrant up` to create the
-environment.
-msg
+        args = parse_options(args)
+        if args.length > 1
+          # There should never be more than 1 arg
+          show_help
+          return
+        end
+
+        if !options[:global]
+          show_local_status(*args)
+        else
+          show_global_status
+        end
+      end
+
+      # Shows the status of the CURRENT environment (the current working
+      # directory). If a specific VM was given, it will print out
+      # detailed information regarding that VM. If no single VM was
+      # specified and it is a multi-VM environment, it will simply
+      # show a listing of all the VMs and their short one word
+      # statuses.
+      def show_local_status(vm=nil)
+        if !env.root_path
+          wrap_output { puts Translator.t(:status_no_environment) }
+          return
+        end
+
+        if vm.nil?
+          if env.multivm?
+            # No specific VM was specified in a multi-vm environment,
+            # so show short info for each VM
+            show_list
+            return
           else
-            additional_msg = ""
-            if env.vm.vm.running?
-              additional_msg = <<-msg
-To stop this VM, you can run `vagrant halt` to shut it down forcefully,
-or you can run `vagrant suspend` to simply suspend the virtual machine.
-In either case, to restart it again, simply run a `vagrant up`.
-msg
-            elsif env.vm.vm.saved?
-              additional_msg = <<-msg
-To resume this VM, simply run `vagrant up`.
-msg
-            elsif env.vm.vm.powered_off?
-              additional_msg = <<-msg
-To restart this VM, simply run `vagrant up`.
-msg
-            end
-
-            if !additional_msg.empty?
-              additional_msg.chomp!
-              additional_msg = "\n\n#{additional_msg}"
-            end
-
-            puts <<-msg
-The environment has been created. The status of the current environment's
-virtual machine is: "#{env.vm.vm.state}."#{additional_msg}
-msg
+            # Set the VM to just be the root VM
+            vm = env.vms.values.first
+          end
+        else
+          # Try to get the vm based on the name. If the specified VM
+          # doesn't exist, then error saying so
+          vm = env.vms[vm.to_sym] || error_and_exit(:unknown_vm, :vm => vm)
+        end
+
+        show_single(vm)
+      end
+
+      # Lists the available VMs and brief statuses about each.
+      def show_list
+        wrap_output do
+          puts Translator.t(:status_listing)
+          puts ""
+
+          env.vms.each do |name, vm|
+            state = vm.created? ? vm.vm.state : "not created"
+            puts "#{name.to_s.ljust(30)}#{state}"
           end
         end
       end
 
+      # Shows a paragraph of information based on the current state of
+      # a single, specified VM.
+      def show_single(vm)
+        string_key = nil
+
+        if !vm.created?
+          string_key = :status_not_created
+        else
+          additional_key = nil
+          if vm.vm.running?
+            additional_key = :status_created_running
+          elsif vm.vm.saved?
+            additional_key = :status_created_saved
+          elsif vm.vm.powered_off?
+            additional_key = :status_created_powered_off
+          end
+
+          string_key = [:status_created, {
+            :vm_state => vm.vm.state,
+            :additional_message => additional_key ? Translator.t(additional_key) : ""
+          }]
+        end
+
+        wrap_output { puts Translator.t(*string_key) }
+      end
+
+      # Shows the status of the GLOBAL Vagrant environment. This prints out
+      # a listing of the virtual machines which Vagrant manages (running or
+      # not).
+      def show_global_status
+        entries = []
+
+        env.active_list.list.each do |uuid, data|
+          vm = Vagrant::VM.find(uuid, env)
+          entries << Translator.t(:status_global_entry, {
+            :vm => vm,
+            :data => data
+          })
+        end
+
+        wrap_output { puts Translator.t(:status_global, :entries => entries) }
+      end
+
       def options_spec(opts)
-        opts.banner = "Usage: vagrant status"
+        opts.banner = "Usage: vagrant status [--global]"
+
+        # Defaults
+        options[:global] = false
+        options[:vm] = nil
+
+        opts.on("-g", "--global", "Show global status of Vagrant (running VMs managed by Vagrant)") do |v|
+          options[:global] = true
+        end
       end
     end
   end
-end
+end

data/lib/vagrant/commands/suspend.rb

@@ -11,8 +11,21 @@ module Vagrant
       description "Suspends the currently running vagrant environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.vm.suspend
+        all_or_single(args, :suspend)
+      end
+
+      def suspend_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.suspend
+        else
+          vm.env.logger.info "VM '#{name}' not created. Ignoring."
+        end
       end
 
       def options_spec(opts)
@@ -20,4 +33,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/up.rb

@@ -9,18 +9,37 @@ module Vagrant
       description "Creates the vagrant environment"
 
       def execute(args=[])
-        if env.vm
-          logger.info "VM already created. Starting VM if its not already running..."
-          env.vm.start
+        all_or_single(args, :up)
+      end
+
+      def up_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.env.logger.info "VM '#{name}' already created. Booting if its not already running..."
+          vm.start
         else
-          env.require_box
-          env.create_vm.execute!(Actions::VM::Up)
+          vm.env.require_box
+
+          vm.env.logger.info "Creating VM '#{name}'"
+          vm.up
         end
       end
 
       def options_spec(opts)
-        opts.banner = "Usage: vagrant up"
+        opts.banner = "Usage: vagrant up [--no-provision]"
+
+        # Defaults
+        options[:provision] = true
+
+        opts.on("--no-provision", "Do not provision during this up.") do |v|
+          options[:provision] = false
+        end
       end
     end
   end
-end
+end

data/lib/vagrant/config.rb

@@ -29,10 +29,12 @@ module Vagrant
         push_proc(&block)
       end
 
-      def execute!
-        run_procs!(config)
-        config.loaded!
-        config
+      def execute!(config_object=nil)
+        config_object ||= config
+
+        run_procs!(config_object)
+        config_object.loaded!
+        config_object
       end
     end
   end
@@ -59,13 +61,17 @@ module Vagrant
 
     class SSHConfig < Base
       attr_accessor :username
-      attr_accessor :password
       attr_accessor :host
+      attr_accessor :port
       attr_accessor :forwarded_port_key
       attr_accessor :max_tries
       attr_accessor :timeout
       attr_accessor :private_key_path
 
+      # The attribute(s) below do nothing. They are just kept here to
+      # prevent syntax errors for backwards compat.
+      attr_accessor :password
+
       def private_key_path
         File.expand_path(@private_key_path, env.root_path)
       end
@@ -74,40 +80,80 @@ module Vagrant
     class VMConfig < Base
       include Util::StackedProcRunner
 
+      attr_accessor :auto_port_range
       attr_accessor :box
       attr_accessor :box_ovf
       attr_accessor :base_mac
       attr_accessor :boot_mode
-      attr_accessor :project_directory
+      attr_accessor :sync_opts
+      attr_accessor :sync_script
+      attr_accessor :sync_crontab_entry_file
+      attr_reader :sync_required
       attr_reader :forwarded_ports
       attr_reader :shared_folders
+      attr_reader :network_options
       attr_accessor :hd_location
       attr_accessor :disk_image_format
       attr_accessor :provisioner
       attr_accessor :shared_folder_uid
       attr_accessor :shared_folder_gid
+      attr_accessor :system
+
+      # Represents a SubVM. This class is only used here in the VMs
+      # hash.
+      class SubVM
+        include Util::StackedProcRunner
+
+        def options
+          @options ||= {}
+        end
+      end
 
       def initialize
         @forwarded_ports = {}
         @shared_folders = {}
         @provisioner = nil
+        @network_options = []
       end
 
-      def forward_port(name, guestport, hostport, protocol="TCP")
-        forwarded_ports[name] = {
+      def forward_port(name, guestport, hostport, options=nil)
+        options = {
           :guestport  => guestport,
           :hostport   => hostport,
-          :protocol   => protocol
-        }
+          :protocol   => "TCP",
+          :adapter    => 0,
+          :auto       => false
+        }.merge(options || {})
+
+        forwarded_ports[name] = options
       end
 
-      def share_folder(name, guestpath, hostpath)
+      def share_folder(name, guestpath, hostpath = nil, opts = {})
+        guestpath, opts[:sync] = shift(guestpath, opts[:sync])
+
+        # TODO if both are nil the exception information will be unusable
+        if opts[:sync] == guestpath
+          raise Exception.new("The sync directory #{opts[:sync]} is identical to the shifted shared folder mount point #{guestpath}")
+        end
+
         @shared_folders[name] = {
+          :syncpath => opts[:sync],
           :guestpath => guestpath,
           :hostpath => hostpath
         }
       end
 
+      def network(ip, options=nil)
+        options = {
+          :ip => ip,
+          :netmask => "255.255.255.0",
+          :adapter => 1,
+          :name => nil
+        }.merge(options || {})
+
+        @network_options[options[:adapter]] = options
+      end
+
       def hd_location=(val)
         raise Exception.new("disk_storage must be set to a directory") unless File.directory?(val)
         @hd_location=val
@@ -124,6 +170,30 @@ module Vagrant
       def customize(&block)
         push_proc(&block)
       end
+
+      def has_multi_vms?
+        !defined_vms.empty?
+      end
+
+      def defined_vms
+        @defined_vms ||= {}
+      end
+
+      def define(name, options=nil, &block)
+        options ||= {}
+        defined_vms[name.to_sym] ||= SubVM.new
+        defined_vms[name.to_sym].options.merge!(options)
+        defined_vms[name.to_sym].push_proc(&block)
+      end
+
+      def shift(orig, sync)
+        if sync
+          @sync_required = true
+          [orig + '-sync', sync == true ? orig : sync]
+        else
+          [orig, sync]
+        end
+      end
     end
 
     class PackageConfig < Base
@@ -144,7 +214,7 @@ module Vagrant
     class Top < Base
       @@configures = []
 
-      class <<self
+      class << self
         def configures_list
           @@configures ||= []
         end

data/lib/vagrant/downloaders/base.rb

@@ -5,6 +5,13 @@ module Vagrant
     class Base
       include Vagrant::Util
 
+      # The environment which this downloader is operating.
+      attr_reader :env
+
+      def initialize(env)
+        @env = env
+      end
+
       # Called prior to execution so any error checks can be done
       def prepare(source_url); end
 
@@ -13,4 +20,4 @@ module Vagrant
       def download!(source_url, destination_file); end
     end
   end
-end
+end