vagrant-aws 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4875beff54192a4db1f2764ba37769f408a16c7c
-  data.tar.gz: 8ccf174be6eb9fdc3994021f9ae6e85ce8d0a34c
+  metadata.gz: 3803f0158a41d9318f946ad121e223c1253bbb7e
+  data.tar.gz: 5b6bb91685fd27f06ea79c5a12ab6d35af62fdb1
 SHA512:
-  metadata.gz: 00cc521c0d0cc6d04c3c13502c232b008fe06998de2847cd29c36db89611c4415e001f300cc99bd9bbac0bbf9d8af03fa13e8e410863e275200c998a14826c91
-  data.tar.gz: 87d486bf65db0820f1d74cf9b1ac0108336a97ff3166d15b1fb156fce80d98eb7473597305fc91f9ad993de2b09d2bc8f7f56a4054ca79f406714f145c0b1ebf
+  metadata.gz: 9c44a7050a142a5c25a185d7589d8a391309a070eefabc53a1e609d78cfbd15edf510a1362268d762aac21af6d529ad95d33bfa43a23d4a9217b60ce92c23db1
+  data.tar.gz: cc06535af0698ac157ccf043e27561aa4e196807b5c392abd46eaddf72df887431b6171edf3b01ea8e024069478807d01eec6a6a715e4c691c90f23e5d84da4c

data/.gitignore

@@ -1,6 +1,9 @@
 # OS-specific
 .DS_Store
 
+# editors
+*.swp
+
 # Bundler/Rubygems
 *.gem
 .bundle

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.4.0 (October 11, 2013)
+
+* Handle EIP allocation error (GH #134)
+* Implement halt and reload (GH #31)
+* rsync ignores Vagrantfile
+* warn if none of the security groups allows incoming SSH
+* bump fog.io to 0.15.0
+* Fix rsync on windows (GH #77)
+* Add `ssh_host_attribute` config (GH #143)
+
 # 0.3.0 (September 2, 2013)
 
 * Parallelize multi-machine up on Vagrant 1.2+

data/README.md

@@ -1,5 +1,13 @@
 # Vagrant AWS Provider
 
+<span class="badges">
+[![Gem Version](https://badge.fury.io/rb/vagrant-aws.png)][gem]
+[![Dependency Status](https://gemnasium.com/mitchellh/vagrant-aws.png)][gemnasium]
+</span>
+
+[gem]: https://rubygems.org/gems/vagrant-aws
+[gemnasium]: https://gemnasium.com/mitchellh/vagrant-aws
+
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [AWS](http://aws.amazon.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in
 EC2 and VPC.

data/lib/vagrant-aws/action.rb

@@ -8,12 +8,34 @@ module VagrantPlugins
       # Include the built-in modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
 
+      # This action is called to halt the remote machine.
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use ConnectAWS
+            b2.use StopInstance
+          end
+        end
+      end
+
       # This action is called to terminate the remote machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, DestroyConfirm do |env, b2|
             if env[:result]
               b2.use ConfigValidate
+              b.use Call, IsCreated do |env2, b3|
+                if !env2[:result]
+                  b3.use MessageNotCreated
+                  next
+                end
+              end
               b2.use ConnectAWS
               b2.use TerminateInstance
             else
@@ -90,22 +112,56 @@ module VagrantPlugins
         end
       end
 
+      def self.action_prepare_boot
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Provision
+          b.use SyncFolders
+          b.use WarnNetworks
+        end
+      end
+
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use HandleBoxUrl
+          b.use ConfigValidate
+          b.use ConnectAWS
+          b.use Call, IsCreated do |env1, b1|
+            if env1[:result]
+              b1.use Call, IsStopped do |env2, b2|
+                if env2[:result]
+                  b2.use action_prepare_boot
+                  b2.use StartInstance # restart this instance
+                else
+                  b2.use MessageAlreadyCreated # TODO write a better message
+                end
+              end
+            else
+              b1.use action_prepare_boot
+              b1.use RunInstance # launch a new instance
+            end
+          end
+        end
+      end
+
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectAWS
           b.use Call, IsCreated do |env, b2|
-            if env[:result]
-              b2.use MessageAlreadyCreated
+            if !env[:result]
+              b2.use MessageNotCreated
               next
             end
 
-            b2.use TimedProvision
-            b2.use SyncFolders
-            b2.use WarnNetworks
-            b2.use RunInstance
+            b2.use action_halt
+            b2.use Call, WaitForState, :stopped, 120 do |env2, b3|
+              if env2[:result]
+                b3.use action_up
+              else
+                # TODO we couldn't reach :stopped, what now?
+              end
+            end
           end
         end
       end
@@ -114,16 +170,20 @@ module VagrantPlugins
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectAWS, action_root.join("connect_aws")
       autoload :IsCreated, action_root.join("is_created")
+      autoload :IsStopped, action_root.join("is_stopped")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageNotCreated, action_root.join("message_not_created")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
       autoload :RunInstance, action_root.join("run_instance")
+      autoload :StartInstance, action_root.join("start_instance")
+      autoload :StopInstance, action_root.join("stop_instance")
       autoload :SyncFolders, action_root.join("sync_folders")
-      autoload :TimedProvision, action_root.join("timed_provision")
-      autoload :WarnNetworks, action_root.join("warn_networks")
       autoload :TerminateInstance, action_root.join("terminate_instance")
+      autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
+      autoload :WaitForState, action_root.join("wait_for_state")
+      autoload :WarnNetworks, action_root.join("warn_networks")
     end
   end
 end

data/lib/vagrant-aws/action/connect_aws.rb

@@ -18,12 +18,12 @@ module VagrantPlugins
           region = env[:machine].provider_config.region
 
           # Get the configs
-          region_config     = env[:machine].provider_config.get_region_config(region)
+          region_config = env[:machine].provider_config.get_region_config(region)
 
           # Build the fog config
           fog_config = {
-            :provider              => :aws,
-            :region                => region
+            :provider => :aws,
+            :region   => region
           }
           if region_config.use_iam_profile
             fog_config[:use_iam_profile] = true

data/lib/vagrant-aws/action/is_stopped.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module AWS
+    module Action
+      # This can be used with "Call" built-in to check if the machine
+      # is stopped and branch in the middleware.
+      class IsStopped
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id == :stopped
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws/action/message_already_created.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_aws.already_created"))
+          env[:ui].info(I18n.t("vagrant_aws.already_status", :status => "created"))
           @app.call(env)
         end
       end

data/lib/vagrant-aws/action/read_ssh_info.rb

@@ -29,11 +29,23 @@ module VagrantPlugins
             return nil
           end
 
-          # Read the DNS info
-          return {
-            :host => server.public_ip_address || server.dns_name || server.private_ip_address,
-            :port => 22
-          }
+          # read attribute override
+          ssh_host_attribute = machine.provider_config.
+              get_region_config(machine.provider_config.region).ssh_host_attribute
+          # default host attributes to try. NOTE: Order matters!
+          ssh_attrs = [:public_ip_address, :dns_name, :private_ip_address]
+          ssh_attrs = (Array(ssh_host_attribute) + ssh_attrs).uniq if ssh_host_attribute
+          # try each attribute, get out on first value
+          host_value = nil
+          while !host_value and attr_name = ssh_attrs.shift
+            begin
+              host_value = server.send(attr_name)
+            rescue NoMethodError
+              @logger.info("SSH host attribute not found #{attr_name}")
+            end
+          end
+
+          return { :host => host_value, :port => 22 }
         end
       end
     end

data/lib/vagrant-aws/action/run_instance.rb

@@ -69,25 +69,27 @@ module VagrantPlugins
           env[:ui].info(" -- Block Device Mapping: #{block_device_mapping}") if block_device_mapping
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
 
+          options = {
+            :availability_zone         => availability_zone,
+            :flavor_id                 => instance_type,
+            :image_id                  => ami,
+            :key_name                  => keypair,
+            :private_ip_address        => private_ip_address,
+            :subnet_id                 => subnet_id,
+            :iam_instance_profile_arn  => iam_instance_profile_arn,
+            :iam_instance_profile_name => iam_instance_profile_name,
+            :tags                      => tags,
+            :user_data                 => user_data,
+            :block_device_mapping      => block_device_mapping,
+            :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil
+          }
+          if !security_groups.empty?
+            security_group_key = options[:subnet_id].nil? ? :groups : :security_group_ids
+            options[security_group_key] = security_groups
+          end
+
           begin
-            options = {
-              :availability_zone  => availability_zone,
-              :flavor_id          => instance_type,
-              :image_id           => ami,
-              :key_name           => keypair,
-              :private_ip_address => private_ip_address,
-              :subnet_id          => subnet_id,
-              :iam_instance_profile_arn   => iam_instance_profile_arn,
-              :iam_instance_profile_name  => iam_instance_profile_name,
-              :tags               => tags,
-              :user_data          => user_data,
-              :block_device_mapping => block_device_mapping,
-              :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil
-            }
-            if !security_groups.empty?
-              security_group_key = options[:subnet_id].nil? ? :groups : :security_group_ids
-              options[security_group_key] = security_groups
-            end
+            env[:ui].warn(I18n.t("vagrant_aws.warn_ssh_access")) unless allows_ssh_port?(env, security_groups, subnet_id)
 
             server = env[:aws_compute].servers.create(options)
           rescue Fog::Compute::AWS::NotFound => e
@@ -174,35 +176,53 @@ module VagrantPlugins
           end
         end
 
+        def allows_ssh_port?(env, test_sec_groups, is_vpc)
+          port = 22 # TODO get ssh_info port
+          test_sec_groups = [ "default" ] if test_sec_groups.empty? # AWS default security group
+          # filter groups by name or group_id (vpc)
+          groups = test_sec_groups.map do |tsg|
+            env[:aws_compute].security_groups.all.select { |sg| tsg == (is_vpc ? sg.group_id : sg.name) }
+          end.flatten
+          # filter TCP rules
+          rules = groups.map { |sg| sg.ip_permissions.select { |r| r["ipProtocol"] == "tcp" } }.flatten
+          # test if any range includes port
+          !rules.select { |r| (r["fromPort"]..r["toPort"]).include?(port) }.empty?
+        end
+
         def do_elastic_ip(env, domain, server)
+          begin
             allocation = env[:aws_compute].allocate_address(domain)
-            if allocation.body['publicIp'].nil?
-              @logger.debug("Could not allocate Elastic IP.")
-              return nil
-            end
-            @logger.debug("Public IP #{allocation.body['publicIp']}")
-
-            # Associate the address and save the metadata to a hash
-            if domain == 'vpc'
-              # VPC requires an allocation ID to assign an IP
-              association = env[:aws_compute].associate_address(server.id, nil, nil, allocation.body['allocationId'])
-              h = { :allocation_id => allocation.body['allocationId'], :association_id => association.body['associationId'], :public_ip => allocation.body['publicIp'] }
-            else
-              # Standard EC2 instances only need the allocated IP address
-              association = env[:aws_compute].associate_address(server.id, allocation.body['publicIp'])
-              h = { :public_ip => allocation.body['publicIp'] }
-            end
+          rescue
+            @logger.debug("Could not allocate Elastic IP.")
+            terminate(env)
+            raise Errors::FogError,
+                            :message => "Could not allocate Elastic IP."
+          end
+          @logger.debug("Public IP #{allocation.body['publicIp']}")
+
+          # Associate the address and save the metadata to a hash
+          if domain == 'vpc'
+            # VPC requires an allocation ID to assign an IP
+            association = env[:aws_compute].associate_address(server.id, nil, nil, allocation.body['allocationId'])
+            h = { :allocation_id => allocation.body['allocationId'], :association_id => association.body['associationId'], :public_ip => allocation.body['publicIp'] }
+          else
+            # Standard EC2 instances only need the allocated IP address
+            association = env[:aws_compute].associate_address(server.id, allocation.body['publicIp'])
+            h = { :public_ip => allocation.body['publicIp'] }
+          end
 
-            if !association.body['return']
-              @logger.debug("Could not associate Elastic IP.")
-              return nil
-            end
+          unless association.body['return']
+            @logger.debug("Could not associate Elastic IP.")
+            terminate(env)
+            raise Errors::FogError,
+                            :message => "Could not allocate Elastic IP."
+          end
 
-            # Save this IP to the data dir so it can be released when the instance is destroyed
-            ip_file = env[:machine].data_dir.join('elastic_ip')
-            ip_file.open('w+') do |f|
-              f.write(h.to_json)
-            end
+          # Save this IP to the data dir so it can be released when the instance is destroyed
+          ip_file = env[:machine].data_dir.join('elastic_ip')
+          ip_file.open('w+') do |f|
+            f.write(h.to_json)
+          end
         end
 
         def terminate(env)

data/lib/vagrant-aws/action/start_instance.rb

@@ -0,0 +1,81 @@
+require "log4r"
+
+require 'vagrant/util/retryable'
+
+require 'vagrant-aws/util/timer'
+
+module VagrantPlugins
+  module AWS
+    module Action
+      # This starts a stopped instance.
+      class StartInstance
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_aws::action::start_instance")
+        end
+
+        def call(env)
+          # Initialize metrics if they haven't been
+          env[:metrics] ||= {}
+
+          server = env[:aws_compute].servers.get(env[:machine].id)
+
+          env[:ui].info(I18n.t("vagrant_aws.starting"))
+
+          begin
+            server.start
+
+            region = env[:machine].provider_config.region
+            region_config = env[:machine].provider_config.get_region_config(region)
+
+            # Wait for the instance to be ready first
+            env[:metrics]["instance_ready_time"] = Util::Timer.time do
+              tries = region_config.instance_ready_timeout / 2
+
+              env[:ui].info(I18n.t("vagrant_aws.waiting_for_ready"))
+              begin
+                retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
+                  # If we're interrupted don't worry about waiting
+                  next if env[:interrupted]
+
+                  # Wait for the server to be ready
+                  server.wait_for(2) { ready? }
+                end
+              rescue Fog::Errors::TimeoutError
+                # Notify the user
+                raise Errors::InstanceReadyTimeout,
+                  timeout: region_config.instance_ready_timeout
+              end
+            end
+          rescue Fog::Compute::AWS::Error => e
+            raise Errors::FogError, :message => e.message
+          end
+
+          @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
+
+          if !env[:interrupted]
+            env[:metrics]["instance_ssh_time"] = Util::Timer.time do
+              # Wait for SSH to be ready.
+              env[:ui].info(I18n.t("vagrant_aws.waiting_for_ssh"))
+              while true
+                # If we're interrupted then just back out
+                break if env[:interrupted]
+                break if env[:machine].communicate.ready?
+                sleep 2
+              end
+            end
+
+            @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
+
+            # Ready and booted!
+            env[:ui].info(I18n.t("vagrant_aws.ready"))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws/action/stop_instance.rb

@@ -0,0 +1,28 @@
+require "log4r"
+
+module VagrantPlugins
+  module AWS
+    module Action
+      # This stops the running instance.
+      class StopInstance
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_aws::action::stop_instance")
+        end
+
+        def call(env)
+          server = env[:aws_compute].servers.get(env[:machine].id)
+
+          if env[:machine].state.id == :stopped
+            env[:ui].info(I18n.t("vagrant_aws.already_status", :status => env[:machine].state.id))
+          else
+            env[:ui].info(I18n.t("vagrant_aws.stopping"))
+            server.stop(!!env[:force_halt])
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws/action/sync_folders.rb

@@ -4,6 +4,8 @@ require "vagrant/util/subprocess"
 
 require "vagrant/util/scoped_hash_override"
 
+require "vagrant/util/which"
+
 module VagrantPlugins
   module AWS
     module Action
@@ -28,6 +30,11 @@ module VagrantPlugins
             # Ignore disabled shared folders
             next if data[:disabled]
 
+            unless Vagrant::Util::Which.which('rsync')
+              env[:ui].warn(I18n.t('vagrant_aws.rsync_not_found_warning'))
+              break
+            end
+
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
@@ -35,6 +42,11 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
+
             env[:ui].info(I18n.t("vagrant_aws.rsync_folder",
                                 :hostpath => hostpath,
                                 :guestpath => guestpath))
@@ -58,11 +70,17 @@ module VagrantPlugins
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
+              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
+
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,

data/lib/vagrant-aws/action/terminate_instance.rb

@@ -18,12 +18,12 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_aws.terminating"))
           server.destroy
           env[:machine].id = nil
-  
+
           # Release the elastic IP
           ip_file = env[:machine].data_dir.join('elastic_ip')
           if ip_file.file?
             release_address(env,ip_file.read)
-            ip_file.delete 
+            ip_file.delete
           end
 
           @app.call(env)

data/lib/vagrant-aws/action/wait_for_state.rb

@@ -0,0 +1,41 @@
+require "log4r"
+require "timeout"
+
+module VagrantPlugins
+  module AWS
+    module Action
+      # This action will wait for a machine to reach a specific state or quit by timeout
+      class WaitForState
+        # env[:result] will be false in case of timeout.
+        # @param [Symbol] state Target machine state.
+        # @param [Number] timeout Timeout in seconds.
+        def initialize(app, env, state, timeout)
+          @app     = app
+          @logger  = Log4r::Logger.new("vagrant_aws::action::wait_for_state")
+          @state   = state
+          @timeout = timeout
+        end
+
+        def call(env)
+          env[:result] = true
+          if env[:machine].state.id == @state
+            @logger.info(I18n.t("vagrant_aws.already_status", :status => @state))
+          else
+            @logger.info("Waiting for machine to reach state #{@state}")
+            begin
+              Timeout.timeout(@timeout) do
+                until env[:machine].state.id == @state
+                  sleep 2
+                end
+              end
+            rescue Timeout::Error
+              env[:result] = false # couldn't reach state in time
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws/config.rb

@@ -113,6 +113,16 @@ module VagrantPlugins
       # @return [bool]
       attr_accessor :terminate_on_shutdown
 
+      # Specifies which address to connect to with ssh
+      # Must be one of:
+      #  - :public_ip_address
+      #  - :dns_name
+      #  - :private_ip_address
+      # This attribute also accepts an array of symbols
+      #
+      # @return [Symbol]
+      attr_accessor :ssh_host_attribute
+
       def initialize(region_specific=false)
         @access_key_id          = UNSET_VALUE
         @ami                    = UNSET_VALUE
@@ -135,6 +145,7 @@ module VagrantPlugins
         @iam_instance_profile_arn  = UNSET_VALUE
         @iam_instance_profile_name = UNSET_VALUE
         @terminate_on_shutdown  = UNSET_VALUE
+        @ssh_host_attribute     = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -258,6 +269,9 @@ module VagrantPlugins
         # default false
         @terminate_on_shutdown = false if @terminate_on_shutdown == UNSET_VALUE
 
+        # default to nil
+        @ssh_host_attribute = nil if @ssh_host_attribute == UNSET_VALUE
+
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   vagrant_aws:
-    already_created: |-
-      The machine is already created.
+    already_status: |-
+      The machine is already %{status}.
     launching_instance: |-
       Launching an instance with the following settings...
     launch_no_keypair: |-
@@ -16,8 +16,15 @@ en:
       Instance is not created. Please run `vagrant up` first.
     ready: |-
       Machine is booted and ready for use!
+    rsync_not_found_warning: |-
+      Warning! Folder sync disabled because the rsync binary is missing.
+      Make sure rsync is installed and the binary can be found in the PATH.
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
+    starting: |-
+      Starting the instance...
+    stopping: |-
+      Stopping the instance...
     terminating: |-
       Terminating the instance...
     waiting_for_ready: |-
@@ -28,6 +35,9 @@ en:
       Warning! The AWS provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They
       will be silently ignored.
+    warn_ssh_access: |-
+      Warning! Vagrant might not be able to SSH into the instance.
+      Please check your security groups settings.
     will_not_destroy: |-
       The instance '%{name}' will not be destroyed, since the confirmation
       was declined.
@@ -81,6 +91,22 @@ en:
       long_not_created: |-
         The EC2 instance is not created. Run `vagrant up` to create it.
 
+      short_stopped: |-
+        stopped
+      long_stopped: |-
+        The EC2 instance is stopped. Run `vagrant up` to start it.
+
+      short_stopping: |-
+        stopping
+      long_stopping: |-
+        The EC2 instance is stopping. Wait until is completely stopped to 
+        run `vagrant up` and start it.
+
+      short_pending: |-
+        pending
+      long_pending: |-
+        The EC2 instance is pending a start (i.e. this is a transition state).
+
       short_running: |-
         running
       long_running: |-

data/spec/vagrant-aws/config_spec.rb

@@ -34,6 +34,7 @@ describe VagrantPlugins::AWS::Config do
     its("block_device_mapping")  {should == [] }
     its("elastic_ip")        { should be_nil }
     its("terminate_on_shutdown") { should == false }
+    its("ssh_host_attribute") { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -42,7 +43,7 @@ describe VagrantPlugins::AWS::Config do
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
-      :instance_type, :keypair_name,
+      :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :secret_access_key, :security_groups,
       :subnet_id, :tags, :elastic_ip, :terminate_on_shutdown,
       :iam_instance_profile_arn, :iam_instance_profile_name,

data/vagrant-aws.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |s|
   s.name          = "vagrant-aws"
   s.version       = VagrantPlugins::AWS::VERSION
   s.platform      = Gem::Platform::RUBY
+  s.license       = "MIT"
   s.authors       = "Mitchell Hashimoto"
   s.email         = "mitchell@hashicorp.com"
   s.homepage      = "http://www.vagrantup.com"
@@ -14,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-aws"
 
-  s.add_runtime_dependency "fog", "~> 1.10.0"
+  s.add_runtime_dependency "fog", "~> 1.15.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.12.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,45 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- vagrant-aws.sublime-project
-- LICENSE
+- vagrant-aws.gemspec
+- Gemfile
+- spec/vagrant-aws/config_spec.rb
 - dummy.box
-- lib/vagrant-aws/action.rb
+- CHANGELOG.md
+- LICENSE
+- lib/vagrant-aws.rb
+- lib/vagrant-aws/config.rb
 - lib/vagrant-aws/plugin.rb
+- lib/vagrant-aws/errors.rb
+- lib/vagrant-aws/action.rb
+- lib/vagrant-aws/version.rb
+- lib/vagrant-aws/provider.rb
 - lib/vagrant-aws/util/timer.rb
-- lib/vagrant-aws/action/run_instance.rb
-- lib/vagrant-aws/action/is_created.rb
-- lib/vagrant-aws/action/message_will_not_destroy.rb
-- lib/vagrant-aws/action/terminate_instance.rb
+- lib/vagrant-aws/action/start_instance.rb
+- lib/vagrant-aws/action/timed_provision.rb
+- lib/vagrant-aws/action/message_already_created.rb
+- lib/vagrant-aws/action/sync_folders.rb
+- lib/vagrant-aws/action/is_stopped.rb
 - lib/vagrant-aws/action/read_ssh_info.rb
+- lib/vagrant-aws/action/run_instance.rb
 - lib/vagrant-aws/action/read_state.rb
+- lib/vagrant-aws/action/terminate_instance.rb
+- lib/vagrant-aws/action/warn_networks.rb
 - lib/vagrant-aws/action/connect_aws.rb
-- lib/vagrant-aws/action/sync_folders.rb
+- lib/vagrant-aws/action/wait_for_state.rb
+- lib/vagrant-aws/action/is_created.rb
+- lib/vagrant-aws/action/stop_instance.rb
 - lib/vagrant-aws/action/message_not_created.rb
-- lib/vagrant-aws/action/message_already_created.rb
-- lib/vagrant-aws/action/timed_provision.rb
-- lib/vagrant-aws/action/warn_networks.rb
-- lib/vagrant-aws/provider.rb
-- lib/vagrant-aws/config.rb
-- lib/vagrant-aws/errors.rb
-- lib/vagrant-aws/version.rb
-- lib/vagrant-aws.rb
-- Gemfile
-- CHANGELOG.md
-- spec/vagrant-aws/config_spec.rb
-- locales/en.yml
-- README.md
+- lib/vagrant-aws/action/message_will_not_destroy.rb
 - Rakefile
 - example_box/metadata.json
 - example_box/README.md
-- vagrant-aws.gemspec
-- vagrant-aws.sublime-workspace
+- locales/en.yml
+- README.md
 - .gitignore
 homepage: http://www.vagrantup.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-aws
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in EC2 and VPC.

data/vagrant-aws.sublime-project

@@ -1,9 +0,0 @@
-{
-	"folders":
-	[
-		{
-			"follow_symlinks": true,
-			"path": "/home/tralamazza/projects/vagrant-aws"
-		}
-	]
-}

data/vagrant-aws.sublime-workspace

@@ -1,305 +0,0 @@
-{
-	"auto_complete":
-	{
-		"selected_items":
-		[
-		]
-	},
-	"buffers":
-	[
-		{
-			"file": "lib/vagrant-aws/action/run_instance.rb",
-			"settings":
-			{
-				"buffer_size": 8942,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "README.md",
-			"settings":
-			{
-				"buffer_size": 7450,
-				"line_ending": "Unix"
-			}
-		}
-	],
-	"build_system": "",
-	"command_palette":
-	{
-		"height": 92.0,
-		"selected_items":
-		[
-			[
-				"instal",
-				"Package Control: Install Package"
-			],
-			[
-				"pul",
-				"Git: Pull"
-			],
-			[
-				"pull",
-				"Git: Pull"
-			],
-			[
-				"git pull",
-				"Git: Pull"
-			],
-			[
-				"statu",
-				"Git: Status"
-			],
-			[
-				"sssh",
-				"Set Syntax: Shell Script (Bash)"
-			],
-			[
-				"ssruby",
-				"Set Syntax: Ruby"
-			],
-			[
-				"space",
-				"Indentation: Convert to Spaces"
-			],
-			[
-				"install",
-				"Package Control: Install Package"
-			],
-			[
-				"upda",
-				"Package Control: Upgrade Package"
-			],
-			[
-				"insta",
-				"Package Control: Install Package"
-			]
-		],
-		"width": 647.0
-	},
-	"console":
-	{
-		"height": 325.0,
-		"history":
-		[
-			"import urllib.request,os; pf = 'Package Control.sublime-package'; ipp = sublime.installed_packages_path(); urllib.request.install_opener( urllib.request.build_opener( urllib.request.ProxyHandler()) ); open(os.path.join(ipp, pf), 'wb').write(urllib.request.urlopen( 'http://sublime.wbond.net/' + pf.replace(' ','%20')).read()) "
-		]
-	},
-	"distraction_free":
-	{
-		"menu_visible": true,
-		"show_minimap": false,
-		"show_open_files": false,
-		"show_tabs": false,
-		"side_bar_visible": false,
-		"status_bar_visible": false
-	},
-	"file_history":
-	[
-		"/home/tralamazza/.config/sublime-text-3/Packages/GoSublime/CHANGELOG.md",
-		"/home/tralamazza/.config/sublime-text-3/Packages/GoSublime/USAGE.md",
-		"/home/tralamazza/.xinitrc",
-		"/home/tralamazza/projects/vagrant-aws/Vagrantfile",
-		"/home/tralamazza/.bash_profile",
-		"/home/tralamazza/.Xresources",
-		"/home/tralamazza/projects/vagrant-aws/README.md",
-		"/home/tralamazza/.zshrc",
-		"/home/tralamazza/.xmonad/xmonad.hs",
-		"/home/tralamazza/projects/vagrant-aws/Gemfile",
-		"/home/tralamazza/projects/vagrant-aws/lib/vagrant-aws/config.rb",
-		"/home/tralamazza/.zprofile",
-		"/home/tralamazza/projects/vagrant-aws/Rakefile",
-		"/home/tralamazza/.xmobarrc",
-		"/home/tralamazza/.vimrc",
-		"/home/tralamazza/projects/vagrant-aws/CHANGELOG.md",
-		"/home/tralamazza/projects/vagrant-aws/vagrant-aws.gemspec",
-		"/home/tralamazza/projects/vagrant-aws/.gitignore"
-	],
-	"find":
-	{
-		"height": 34.0
-	},
-	"find_in_files":
-	{
-		"height": 90.0,
-		"where_history":
-		[
-			""
-		]
-	},
-	"find_state":
-	{
-		"case_sensitive": false,
-		"find_history":
-		[
-			"instance_ready_timeout",
-			"backgroun",
-			"back",
-			"backgroun"
-		],
-		"highlight": true,
-		"in_selection": false,
-		"preserve_case": false,
-		"regex": false,
-		"replace_history":
-		[
-		],
-		"reverse": false,
-		"show_context": true,
-		"use_buffer2": true,
-		"whole_word": false,
-		"wrap": true
-	},
-	"groups":
-	[
-		{
-			"selected": 0,
-			"sheets":
-			[
-				{
-					"buffer": 0,
-					"file": "lib/vagrant-aws/action/run_instance.rb",
-					"semi_transient": false,
-					"settings":
-					{
-						"buffer_size": 8942,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								1633,
-								1633
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0.0,
-						"translation.y": 0.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 1,
-					"file": "README.md",
-					"semi_transient": false,
-					"settings":
-					{
-						"buffer_size": 7450,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								888,
-								888
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Markdown/Markdown.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0.0,
-						"translation.y": 0.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				}
-			]
-		}
-	],
-	"incremental_find":
-	{
-		"height": 23.0
-	},
-	"input":
-	{
-		"height": 0.0
-	},
-	"layout":
-	{
-		"cells":
-		[
-			[
-				0,
-				0,
-				1,
-				1
-			]
-		],
-		"cols":
-		[
-			0.0,
-			1.0
-		],
-		"rows":
-		[
-			0.0,
-			1.0
-		]
-	},
-	"menu_visible": true,
-	"output.GoSublime-output":
-	{
-		"height": 100.0
-	},
-	"output.MarGo-output":
-	{
-		"height": 100.0
-	},
-	"output.git":
-	{
-		"height": 185.0
-	},
-	"project": "vagrant-aws.sublime-project",
-	"replace":
-	{
-		"height": 42.0
-	},
-	"save_all_on_build": true,
-	"select_file":
-	{
-		"height": 0.0,
-		"selected_items":
-		[
-		],
-		"width": 0.0
-	},
-	"select_project":
-	{
-		"height": 0.0,
-		"selected_items":
-		[
-		],
-		"width": 0.0
-	},
-	"select_symbol":
-	{
-		"height": 0.0,
-		"selected_items":
-		[
-		],
-		"width": 0.0
-	},
-	"settings":
-	{
-	},
-	"show_minimap": false,
-	"show_open_files": false,
-	"show_tabs": true,
-	"side_bar_visible": true,
-	"side_bar_width": 172.0,
-	"status_bar_visible": true,
-	"template_settings":
-	{
-	}
-}