add MachineName option to the commands that support it

Author: bmatcuk

README.md

@@ -95,6 +95,8 @@ Options:
   complain that there's no attached TTY.
 * **Parallel** (default: `false`) - Enable or disable parallelism if provider
   supports it (automatically enables Force).
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to destroy.
+  If unspecified (default), all VMs in the current directory will be destroyed.
 
 Response:
 * **Error** - Set if an error occurred.
@@ -127,6 +129,8 @@ func (*VagrantClient) Halt() *HaltCommand
 Options:
 * **Force** (default: `false`) - Force shutdown (equivalent to pulling the
   power of the VM)
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to halt.
+  If unspecified (default), all VMs in the current directory will be halted.
 
 Response:
 * **Error** - Set if an error occurred.
@@ -163,6 +167,9 @@ func (*VagrantClient) Provision() *ProvisionCommand
 Options:
 * **Provisioners** (default: `nil`) - Enable only certain provisioners, by type
   or name as an array of strings.
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to provision.
+  If unspecified (default), all VMs in the current directory will be
+  provisioned.
 
 Response:
 * **Error** - Set if an error occurred.
@@ -182,6 +189,8 @@ Options:
   provisioners will be disabled.
 * **Provisioners** (default: `nil`) - Enable only certain provisioners, by type
   or name as an array of strings. Implies ForceProvisioning.
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to reload.
+  If unspecified (default), all VMs in the current directory will be reloaded.
 
 Response:
 * **Error** - Set if an error occurred.
@@ -201,6 +210,8 @@ Options:
   provisioners will be disabled.
 * **Provisioners** (default: `nil`) - Enable only certain provisioners, by type
   or name as an array of strings. Implies ForceProvisioning.
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to resume.
+  If unspecified (default), all VMs in the current directory will be resumed.
 
 Response:
 * **Error** - Set if an error occurred.
@@ -215,6 +226,9 @@ func (*VagrantClient) SSHConfig() *SSHConfigCommand
 
 Options:
 * **Host** (default: `""`) - Name the host for the config
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to retrieve
+  the configuration for. If unspecified (default), the configuration of all VMs
+  in the current directory will be returned.
 
 Response:
 * **Configs** - a map of vagrant machine names to `SSHConfig` objects. Each
@@ -229,6 +243,11 @@ Get the status of the vagrant machine.
 func (*VagrantClient) Status() *StatusCommand
 ```
 
+Options:
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to retrieve
+  the status for. If unspecified (default), the status of all VMs in the
+  current directory will be returned.
+
 Response:
 * **Status** - a map of vagrant machine names to a string describing the
   status of the VM.
@@ -242,6 +261,10 @@ Suspends the vagrant machine.
 func (*VagrantClient) Suspend() *SuspendCommand
 ```
 
+Options:
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to suspend.
+  If unspecified (default), all VMs in the current directory will be suspended.
+
 Response:
 * **Error** - Set if an error occurred.
 
@@ -267,6 +290,9 @@ Options:
 * **Provider** (default: `""`) - Back the machine with a specific provider.
 * **InstallProvider** (default: `true`) - If possible, install the provider if
   it isn't installed.
+* **MachineName** (default: `""`) - The name or ID of a vagrant VM to bring up.
+  If unspecified (default), all VMs in the current directory will be brought
+  up.
 
 Response:
 * **VMInfo** - a map of vagrant machine names to `VMInfo` objects. Each VMInfo

command_destroy.go

@@ -3,6 +3,7 @@ package vagrant
 // A DestroyCommand specifies the options and output of vagrant destroy.
 type DestroyCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 
 	// Destroy without confirmation (defaults to true because, when false,
@@ -34,7 +35,7 @@ func (cmd *DestroyCommand) buildArguments() []string {
 	if cmd.Parallel {
 		args = append(args, "--parallel")
 	}
-	return args
+	return cmd.appendMachineName(args)
 }
 
 func (cmd *DestroyCommand) init() error {

command_halt.go

@@ -3,6 +3,7 @@ package vagrant
 // A HaltCommand specifies the options and output of vagrant halt.
 type HaltCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 
 	// Force shutdown (equivalent to pulling the power from the machine, default:
@@ -25,7 +26,7 @@ func (cmd *HaltCommand) buildArguments() []string {
 	if cmd.Force {
 		args = append(args, "--force")
 	}
-	return args
+	return cmd.appendMachineName(args)
 }
 
 func (cmd *HaltCommand) init() error {

command_port.go

@@ -1,16 +1,12 @@
 package vagrant
 
-// PortCommand specifies the options and output of vagrant port.
+// PortCommand specifies the options and output of vagrant port. Note that
+// the port command is unique in that the MachineName option is required if
+// your Vagrantfile defines more than one VM!
 type PortCommand struct {
 	BaseCommand
+	MachineNameArgument
 	PortResponse
-
-	// MachineName is the vagrant machine you are interested in. If your
-	// Vagrantfile only brings up a single machine, you do not need to specify
-	// this. However, if your Vagrantfile brings up multiple machines, you MUST
-	// specify this! For some reason, this is the only vagrant command that
-	// cannot handle multiple machines.
-	MachineName string
 }
 
 // Port will return information about ports forwarded from the host to the

command_provision.go

@@ -3,6 +3,7 @@ package vagrant
 // ProvisionCommand specifies the options and output of vagrant provision
 type ProvisionCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 	ProvisionersArgument
 }
@@ -18,7 +19,7 @@ func (client *VagrantClient) Provision() *ProvisionCommand {
 }
 
 func (cmd *ProvisionCommand) init() error {
-	args := cmd.buildArguments()
+	args := cmd.appendMachineName(cmd.buildArguments())
 	return cmd.BaseCommand.init(&cmd.ErrorResponse, "provision", args...)
 }
 

command_reload.go

@@ -3,6 +3,7 @@ package vagrant
 // ReloadCommand specifies the options and output of vagrant reload
 type ReloadCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 	ProvisioningArgument
 }
@@ -18,7 +19,7 @@ func (client *VagrantClient) Reload() *ReloadCommand {
 }
 
 func (cmd *ReloadCommand) init() error {
-	args := cmd.buildArguments()
+	args := cmd.appendMachineName(cmd.buildArguments())
 	return cmd.BaseCommand.init(&cmd.ErrorResponse, "reload", args...)
 }
 

command_resume.go

@@ -3,6 +3,7 @@ package vagrant
 // A ResumeCommand specifies the options and output of vagrant resume.
 type ResumeCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 	ProvisioningArgument
 }
@@ -18,7 +19,7 @@ func (client *VagrantClient) Resume() *ResumeCommand {
 }
 
 func (cmd *ResumeCommand) init() error {
-	args := cmd.buildArguments()
+	args := cmd.appendMachineName(cmd.buildArguments())
 	return cmd.BaseCommand.init(&cmd.ErrorResponse, "resume", args...)
 }
 

command_sshconfig.go

@@ -3,6 +3,7 @@ package vagrant
 // SSHConfigCommand specifies options and output from vagrant ssh-config
 type SSHConfigCommand struct {
 	BaseCommand
+	MachineNameArgument
 	SSHConfigResponse
 
 	// Name of a specific host to get SSH config info for. If not set, info for
@@ -26,7 +27,7 @@ func (cmd *SSHConfigCommand) buildArguments() []string {
 	if cmd.Host != "" {
 		args = append(args, "--host", cmd.Host)
 	}
-	return args
+	return cmd.appendMachineName(args)
 }
 
 func (cmd *SSHConfigCommand) init() error {

command_status.go

@@ -3,6 +3,7 @@ package vagrant
 // StatusCommand specifies options and output from vagrant status
 type StatusCommand struct {
 	BaseCommand
+	MachineNameArgument
 	StatusResponse
 }
 
@@ -17,6 +18,9 @@ func (client *VagrantClient) Status() *StatusCommand {
 }
 
 func (cmd *StatusCommand) init() error {
+	if cmd.MachineName != "" {
+		return cmd.BaseCommand.init(&cmd.StatusResponse, "status", cmd.MachineName)
+	}
 	return cmd.BaseCommand.init(&cmd.StatusResponse, "status")
 }
 

command_suspend.go

@@ -3,6 +3,7 @@ package vagrant
 // SuspendCommand specifies options and output from vagrant suspend
 type SuspendCommand struct {
 	BaseCommand
+	MachineNameArgument
 	ErrorResponse
 }
 
@@ -17,6 +18,9 @@ func (client *VagrantClient) Suspend() *SuspendCommand {
 }
 
 func (cmd *SuspendCommand) init() error {
+	if cmd.MachineName != "" {
+		return cmd.BaseCommand.init(&cmd.ErrorResponse, "suspend", cmd.MachineName)
+	}
 	return cmd.BaseCommand.init(&cmd.ErrorResponse, "suspend")
 }
 

command_up.go

@@ -3,6 +3,7 @@ package vagrant
 // UpCommand specifies options and output from vagrant up.
 type UpCommand struct {
 	BaseCommand
+	MachineNameArgument
 	UpResponse
 	ProvisioningArgument
 
@@ -47,7 +48,7 @@ func (cmd *UpCommand) buildArguments() []string {
 	if !cmd.InstallProvider {
 		args = append(args, "--no-install-provider")
 	}
-	return args
+	return cmd.appendMachineName(args)
 }
 
 func (cmd *UpCommand) init() error {

machine_name_argument.go

@@ -0,0 +1,14 @@
+package vagrant
+
+type MachineNameArgument struct {
+	// MachineName is the name or ID of a vagrant VM to act on. If unspecified
+	// (the default), vagrant will act upon all VMs in the current directory.
+	MachineName string
+}
+
+func (cmd *MachineNameArgument) appendMachineName(args []string) []string {
+	if cmd.MachineName == "" {
+		return args
+	}
+	return append(args, cmd.MachineName)
+}

machine_name_argument_test.go

@@ -0,0 +1,11 @@
+package vagrant
+
+import (
+	"testing"
+)
+
+func TestMachineNameCommand_buildArguments(t *testing.T) {
+	cmd := MachineNameArgument{MachineName: "test"}
+	args := cmd.appendMachineName([]string{})
+	assertArguments(t, args, "test")
+}