Fix-up issues with multi-vms and name arguments

Author: mlinderm

README.md

@@ -57,9 +57,11 @@ with AWS. Note that AMI creation is only supported for EBS-backed instances.
 
 ## Caveats
 
-`vagrant-aws` is "pre-alpha" and currently only supports creation, suspension, resumption
-and descruction of the Vagrant environment. Provisioning should be supported for shell,
-chef-server and chef-solo, but has only been tested with chef-solo and on an Ubuntu guest. 
-Only a subset of Vagrant features are supported. Currently port forwarding and shared 
-directories are not implemented, nor is host networking (although that is less relevant for AWS). 
-`vagrant-aws` in general has only been tested for a single VM, on OSX 10.6, with chef-solo.	
+`vagrant-aws` is "pre-alpha" and currently supports creation, suspension,
+resumption and descruction of the Vagrant environment along with basic box
+operations. Provisioning should be supported for shell, chef-server and
+chef-solo, but has only been tested with chef-solo and on an Ubuntu guest.
+Only a subset of Vagrant features are supported. Currently port forwarding and
+shared directories are not implemented, nor is host networking (although that
+is less relevant for AWS).  `vagrant-aws` in general has only been tested with
+ruby 1.9.2 on OSX 10.6, with chef-solo.	

lib/vagrant-aws/command.rb

@@ -36,14 +36,14 @@ def destroy(name=nil)
 		end
 
 
-		desc "status", "Show the status of the current Vagrant AWS environment." 
-		def status
+		desc "status [NAME]", "Show the status of the current Vagrant AWS environment." 
+		def status(name=nil)
 			state = nil
-			results = target_vms.collect do |vm|
+			results = target_vms(name).collect do |vm|
 				state = vm.created? ? vm.vm.state.to_s : 'not_created'
 				"#{vm.name.to_s.ljust(25)}#{state.gsub("_", " ")}"	
 			end
-			state = target_vms.length == 1 ? state : "listing"
+			state = target_vms(name).length == 1 ? state : "listing"
 			@env.ui.info(I18n.t("vagrant.commands.status.output",
                     :states  => results.join("\n"),
                     :message => I18n.t("vagrant.plugins.aws.commands.status.#{state}")),
@@ -54,9 +54,9 @@ def status
 		desc "ssh [NAME]", "SSH into the currently running Vagrant AWS environment."
 		method_options %w( execute -e ) => :string
 		def ssh(name=nil)
-			raise Vagrant::Errors::MultiVMTargetRequired, :command => "ssh" if target_vms.length > 1
+			raise Vagrant::Errors::MultiVMTargetRequired, :command => "ssh" if target_vms(name).length > 1
 
-			ssh_vm = target_vms.first
+			ssh_vm = target_vms(name).first
 			ssh_vm.env.actions.run(VagrantAWS::Action::PopulateSSH)
 
 			if options[:execute]
@@ -113,9 +113,9 @@ def resume(name=nil)
 		desc "ssh_config [NAME]", "outputs .ssh/config valid syntax for connecting to this environment via ssh"
 		method_options %w{ host_name -h } => :string
 		def ssh_config(name=nil)
-			raise Vagrant::Errors::MultiVMTargetRequired, :command => "ssh_config" if target_vms.length > 1
+			raise Vagrant::Errors::MultiVMTargetRequired, :command => "ssh_config" if target_vms(name).length > 1
 
-			ssh_vm = target_vms.first
+			ssh_vm = target_vms(name).first
 			raise Vagrant::Errors::VMNotCreatedError if !ssh_vm.created?
 			ssh_vm.env.actions.run(VagrantAWS::Action::PopulateSSH)
 
@@ -134,9 +134,9 @@ def ssh_config(name=nil)
 		method_option :image_name, :aliases => '-f', :type => :string, :banner => "name of created image"
 		method_option :image_desc, :aliases => '-d', :type => :string, :banner => "description of created image" 
 		def box_create(name=nil)
-			raise Vagrant::Errors::MultiVMTargetRequired, :command => "box_create" if target_vms.length > 1
+			raise Vagrant::Errors::MultiVMTargetRequired, :command => "box_create" if target_vms(name).length > 1
 
-			ami_vm = target_vms.first		
+			ami_vm = target_vms(name).first		
 			ami_vm.env.actions.run(:aws_create_image, {
 				'package.output' => options[:image_name] || env.config.package.name,
 				'image.register' => options[:register],

locales/en.yml

@@ -7,56 +7,56 @@ en:
         errors:
           not_yet_supported: This feature is not yet supported in Vagrant AWS.      
           key_name_not_specified: An AWS key name was not specified. Set `aws.key_name` in Vagrantfile. 
-          private_key_file_not_specified: |-
+          private_key_file_not_specified: |
             Private key file was not specified. Set `aws.private_key_file` to
             point to key file associated with the specified AWS key name.
-          ebs_device_required: |-
+          ebs_device_required: |
             %{command} requires an EBS-backed instance. Please Amazon AWS documentation for
             more information about EBS vs. instance store backed instances.
           vm_create_failure: VM creation failed.
         commands:
           status:
-            running: |-
+            running: |
               The VM is running. To stop this VM, you can run `vagrant aws suspend` to
               stop but not destroy this VM (you only pay for the backing EBS volume,
               not the hourly EC2 server cost) or `vagrant aws destroy` to destroy
               the VM entirely.
-            stopping: |-
+            stopping: |
               The VM is in the process of stopping (suspending). To resume this VM
               after it has completely stopped, simply run `vagrant aws resume`.
             stopped: To resume this VM, simply run `vagrant resume`.
             pending: The VM is in the process of resuming.
-            not_created: |-
+            not_created: |
               The environment has not yet been created. Run `vagrant aws resume` to
               create the environment.
-            listing: |-
+            listing: |
               This environment represents multiple VMs. The VMs are all listed
               above with their current state. For more information about a specific
               VM, run `vagrant aws status NAME`.
         actions:
           create:
             creating: "Creating VM ..."
-            created: |-
+            created: |
               Created EC2 server %{id}. Waiting for server to become ready 
               (this may take a few minutes).
-            available: |-
+            available: |
               Server available at %{dns}. 
               Waiting for SSH to become available. When ready run `vagrant aws ssh_config`
               for more detailed connection information.
           prepare_provisioners:
-            chef_not_detected: |-
+            chef_not_detected: |
               %{binary} not detected. Bootstrapping %{binary} installation. This may
               take a few minutes.
             uploading_chef_resources: Uploading chef resources to VM.
           create_image:
-            creating: |- 
+            creating: | 
               Creating AWS AMI. This make take a few minutes. The VM will not be available 
               during this period.
           deregister_image:
             deregistering:
               Deregistering image %{image} with AWS.
           create_ssh_key:
-            created: |-
+            created: |
               No key pairs specified. Created AWS key pair named %{name}.