kitchen-ec2 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04327b0481d7914db71e72ee411cdcab4fd6eb9b
-  data.tar.gz: 6fd0d5a57e11c1866e706616a7a8e61945973f72
+  metadata.gz: f3897a853bbce0fe66db106da6852004cc39e6bc
+  data.tar.gz: 804747d7bf806717e31e4b6ac946497ee3aaf935
 SHA512:
-  metadata.gz: 1ff3b4a368e69d2fc0233b402440e1bdf8f2d39451d22486a895124d86ca84aede65187bdba92f6da1acbf18b85a2c5ecce6b635d9e70b31200368a2f7120bcf
-  data.tar.gz: d5e7123d787c59ae27b54c2ee3f2d0c43ad6d898722c8a55f150fe440e8cfca88efd28fe77631fdeaf86997cd687000b6e8440d3bd5570853cd36005a2252efb
+  metadata.gz: eec29c52770a4d005cf1a2769cc131f25cd351591075108ebe745a954b2e6243d30ebdf9cd87848b03321dcca124f80cae0861cec9aa5e193ee36cabf649cdb5
+  data.tar.gz: b53ed98bc1d2419f90b65114fe0db08db33f036d1e222e4dbbef9e791e396e6704492b58ddf1b9da406703a47e845e88f2efacde5cab3fdf7b3717388e7709f7

data/.cane

@@ -0,0 +1 @@
+--style-measure 100

data/.tailor

@@ -90,7 +90,7 @@ Tailor.config do |config|
     style.indentation_spaces 2, level: :error
     style.max_code_lines_in_class 300, level: :error
     style.max_code_lines_in_method 30, level: :error
-    style.max_line_length 80, level: :error
+    style.max_line_length 100, level: :error
     style.spaces_after_comma 1, level: :off
     style.spaces_after_lbrace 1, level: :error
     style.spaces_after_lbracket 0, level: :error

data/CHANGELOG.md

@@ -1,8 +1,28 @@
+## 0.8.0 / 2014-02-11
+
+### Bug fixes
+
+* Pull request [#29][], pull request [#28][]: Relax Test Kitchen dependency to allow versions 1.0 and up. ([@coderanger][], [@someara][])
+
+## New features
+
+* Pull request [#29][]: Add `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` fallback environment variable support. ([@coderanger][])
+* Pull request [#27][], pull request [#31][]: Make EC2 endpoint configurable for services implementing the AWS APIs. ([@bozinsky][], [@spheromak][])
+* Pull request [#34][]: Support AWS session tokens for use with IAM roles. ([@coderanger][])
+* Pull request [#22][]: Add ebs_optimized attribute. ([@tiwilliam][])
+
+### Improvements
+
+* Pull request [#20][], pull request [#21][], issue [#14][]: Add configurability around whether to use DNS name, public or private IP addresses when connecting to instances. ([@matheeeny][], [@Atalanta][], [@fnichol][])
+* Pull request [#15][]: In VPC groups must be specified by setting :security_group_ids rather than :groups. ([@eherot][])
+* Pull request [#23][]: README updates for badges. ([@sethvargo][], [@arangamani][])
+
+
 ## 0.7.0 / 2013-08-29
 
 ### Bug fixes
 
-* Pull request #13: #wait_for_ssh takes 2 arguments. (@dysinger)
+* Pull request [#13][]: #wait_for_ssh takes 2 arguments. ([@dysinger][])
 
 ### Improvements
 
@@ -46,8 +66,31 @@
 [#7]: https://github.com/opscode/kitchen-ec2/issues/7
 [#8]: https://github.com/opscode/kitchen-ec2/issues/8
 [#9]: https://github.com/opscode/kitchen-ec2/issues/9
+[#13]: https://github.com/opscode/kitchen-ec2/issues/13
+[#14]: https://github.com/opscode/kitchen-ec2/issues/14
+[#15]: https://github.com/opscode/kitchen-ec2/issues/15
+[#20]: https://github.com/opscode/kitchen-ec2/issues/20
+[#21]: https://github.com/opscode/kitchen-ec2/issues/21
+[#22]: https://github.com/opscode/kitchen-ec2/issues/22
+[#23]: https://github.com/opscode/kitchen-ec2/issues/23
+[#27]: https://github.com/opscode/kitchen-ec2/issues/27
+[#28]: https://github.com/opscode/kitchen-ec2/issues/28
+[#29]: https://github.com/opscode/kitchen-ec2/issues/29
+[#31]: https://github.com/opscode/kitchen-ec2/issues/31
+[#34]: https://github.com/opscode/kitchen-ec2/issues/34
+[@Atalanta]: https://github.com/Atalanta
+[@arangamani]: https://github.com/arangamani
+[@bozinsky]: https://github.com/bozinsky
+[@coderanger]: https://github.com/coderanger
 [@dissonanz]: https://github.com/dissonanz
+[@dysinger]: https://github.com/dysinger
+[@eherot]: https://github.com/eherot
 [@fnichol]: https://github.com/fnichol
 [@halcyonCorsair]: https://github.com/halcyonCorsair
 [@juliandunn]: https://github.com/juliandunn
+[@matheeeny]: https://github.com/matheeeny
 [@mattray]: https://github.com/mattray
+[@sethvargo]: https://github.com/sethvargo
+[@someara]: https://github.com/someara
+[@spheromak]: https://github.com/spheromak
+[@tiwilliam]: https://github.com/tiwilliam

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :test do
   gem 'rake'
+  gem 'pry'
 end

data/README.md

@@ -1,10 +1,10 @@
 # <a name="title"></a> Kitchen::Ec2: A Test Kitchen Driver for Amazon EC2
 
 [![Gem Version](https://badge.fury.io/rb/kitchen-ec2.png)](http://badge.fury.io/rb/kitchen-ec2)
-[![Build Status](https://travis-ci.org/opscode/kitchen-ec2.png)](https://travis-ci.org/opscode/kitchen-ec2)
-[![Code Climate](https://codeclimate.com/github/opscode/kitchen-ec2.png)](https://codeclimate.com/github/opscode/kitchen-ec2)
+[![Build Status](https://travis-ci.org/test-kitchen/kitchen-ec2.png)](https://travis-ci.org/test-kitchen/kitchen-ec2)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-ec2.png)](https://codeclimate.com/github/test-kitchen/kitchen-ec2)
 
-A Test Kitchen Driver for Amazon EC2.
+A [Test Kitchen][kitchenci] Driver for Amazon EC2.
 
 This driver uses the [fog gem][fog_gem] to provision and destroy EC2
 instances. Use Amazon's cloud for your infrastructure testing!
@@ -27,12 +27,12 @@ supported:
 ```ruby
 ---
 platforms:
-- name: ubuntu-10.04
-- name: ubuntu-12.04
-- name: ubuntu-12.10
-- name: ubuntu-13.04
-- name: centos-6.4
-- name: debian-7.1.0
+  - name: ubuntu-10.04
+  - name: ubuntu-12.04
+  - name: ubuntu-12.10
+  - name: ubuntu-13.04
+  - name: centos-6.4
+  - name: debian-7.1.0
 ```
 
 This will effectively generate a configuration similar to:
@@ -40,20 +40,20 @@ This will effectively generate a configuration similar to:
 ```ruby
 ---
 platforms:
-- name: ubuntu-10.04
-  driver_config:
-    image_id: ami-1ab3ce73
-    username: ubuntu
-- name: ubuntu-12.04
-  driver_config:
-    image_id: ami-2f115c46
-    username: ubuntu
-# ...
-- name: centos-6.4
-  driver_config:
-    image_id: ami-bf5021d6
-    username: root
-# ...
+  - name: ubuntu-10.04
+    driver:
+      image_id: ami-1ab3ce73
+      username: ubuntu
+  - name: ubuntu-12.04
+    driver:
+      image_id: ami-2f115c46
+      username: ubuntu
+  # ...
+  - name: centos-6.4
+    driver:
+      image_id: ami-bf5021d6
+      username: root
+  # ...
 ```
 
 For specific default values, please consult [amis.json][amis_json].
@@ -87,15 +87,29 @@ or `nil` otherwise.
 The default will be read from the `AWS_SSH_KEY_ID` environment variable if set,
 or `nil` otherwise.
 
+### endpoint
+
+The API endpoint for executing EC2 commands.
+
+The default will be computed from the AWS region name for the instance.
+
 ### <a name="config-flavor-id"></a> flavor\_id
 
 The EC2 [instance type][instance_docs] (also known as size) to use.
 
 The default is `"m1.small"`.
 
-### <a name="config-groups"></a> groups
+### <a name="config-ebs-optimized"></a> ebs\_optimized
 
-An Array of EC [security groups][group_docs] which will be applied to the
+Option to launch EC2 instance with optimized EBS volume. See
+[Amazon EC2 Instance Types](http://aws.amazon.com/ec2/instance-types/) to find
+out more about instance types that can be launched as EBS-optimized instances.
+
+The default is `false`.
+
+### <a name="config-security-group-ids"></a> security_group_ids
+
+An Array of EC2 [security groups][group_docs] which will be applied to the
 instance.
 
 The default is `["default"]`.
@@ -114,27 +128,22 @@ The SSH port number to be used when communicating with the instance.
 
 The default is `22`.
 
-### <a name="config-region"></a> region
+### < name="interface"></a> interface
 
-**Required** The AWS [region][region_docs] to use.
+The place from which to derive the hostname for communicating with the instance.  May be `dns`, `public` or `private`.  If this is unset, the driver will derive the hostname by failing back in the following order:
 
-The default is `"us-east-1"`.
+1. DNS Name
+2. Public IP Address
+3. Private IP Address
 
-### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
+The default is unset.
 
-Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
-installed. There are several different behaviors available:
 
-* `true` - the latest release will be installed. Subsequent converges
-  will skip re-installing if chef is present.
-* `latest` - the latest release will be installed. Subsequent converges
-  will always re-install even if chef is present.
-* `<VERSION_STRING>` (ex: `10.24.0`) - the desired version string will
-  be passed the the install.sh script. Subsequent converges will skip if
-  the installed version and the desired version match.
-* `false` or `nil` - no chef is installed.
+### <a name="config-region"></a> region
 
-The default value is unset, or `nil`.
+**Required** The AWS [region][region_docs] to use.
+
+The default is `"us-east-1"`.
 
 ### <a name="config-ssh-key"></a> ssh\_key
 
@@ -148,13 +157,6 @@ The EC2 [subnet][subnet_docs] to use.
 
 The default is unset, or `nil`.
 
-### <a name="config-sudo"></a> sudo
-
-Whether or not to prefix remote system commands such as installing and
-running Chef with `sudo`.
-
-The default is `true`.
-
 ### <a name="config-tags"></a> tags
 
 The Hash of EC tag name/value pairs which will be applied to the instance.
@@ -176,26 +178,27 @@ to override default configuration.
 
 ```yaml
 ---
-driver_plugin: ec2
-driver_config:
+driver:
+  name: ec2
   aws_access_key_id: KAS...
   aws_secret_access_key: 3UK...
   aws_ssh_key_id: id_rsa-aws
   ssh_key: /path/to/id_rsa-aws
+  security_group_ids: ["sg-1a2b3c4d"]
   region: us-east-1
   availability_zone: us-east-1b
   require_chef_omnibus: true
   subnet_id: subnet-6d6...
 
 platforms:
-- name: ubuntu-12.04
-  driver_config:
-    image_id: ami-fd20ad94
-    username: ubuntu
-- name: centos-6.3
-  driver_config:
-    image_id: ami-ef5ff086
-    username: ec2-user
+  - name: ubuntu-12.04
+    driver:
+      image_id: ami-fd20ad94
+      username: ubuntu
+  - name: centos-6.3
+    driver:
+      image_id: ami-ef5ff086
+      username: ec2-user
 
 suites:
 # ...
@@ -206,25 +209,26 @@ ERB which can help to factor out secrets and credentials. For example:
 
 ```yaml
 ---
-driver_plugin: ec2
-driver_config:
+driver:
+  name: ec2
   aws_access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
   aws_secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
   aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
   ssh_key: <%= File.expand_path('~/.ssh/id_rsa') %>
+  security_group_ids: ["sg-1a2b3c4d"]
   region: us-east-1
   availability_zone: us-east-1b
   require_chef_omnibus: true
 
 platforms:
-- name: ubuntu-12.04
-  driver_config:
-    image_id: ami-fd20ad94
-    username: ubuntu
-- name: centos-6.3
-  driver_config:
-    image_id: ami-ef5ff086
-    username: ec2-user
+  - name: ubuntu-12.04
+    driver:
+      image_id: ami-fd20ad94
+      username: ubuntu
+  - name: centos-6.3
+    driver:
+      image_id: ami-ef5ff086
+      username: ec2-user
 
 suites:
 # ...
@@ -255,13 +259,13 @@ Apache 2.0 (see [LICENSE][license])
 
 
 [author]:           https://github.com/fnichol
-[issues]:           https://github.com/opscode/kitchen-ec2/issues
-[license]:          https://github.com/opscode/kitchen-ec2/blob/master/LICENSE
-[repo]:             https://github.com/opscode/kitchen-ec2
+[issues]:           https://github.com/test-kitchen/kitchen-ec2/issues
+[license]:          https://github.com/test-kitchen/kitchen-ec2/blob/master/LICENSE
+[repo]:             https://github.com/test-kitchen/kitchen-ec2
 [driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
-[chef_omnibus_dl]:  http://www.opscode.com/chef/install/
+[chef_omnibus_dl]:  http://www.getchef.com/chef/install/
 
-[amis_json]:        https://github.com/opscode/kitchen-ec2/blob/master/data/amis.json
+[amis_json]:        https://github.com/test-kitchen/kitchen-ec2/blob/master/data/amis.json
 [ami_docs]:         http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ComponentsAMIs.html
 [aws_site]:         http://aws.amazon.com/
 [credentials_docs]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/SettingUp_CommandLine.html#using-credentials-access-key
@@ -269,5 +273,6 @@ Apache 2.0 (see [LICENSE][license])
 [group_docs]:       http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
 [instance_docs]:    http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
 [key_id_docs]:      http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verifying-your-key-pair.html
+[kitchenci]:        http://kitchen.ci/
 [region_docs]:      http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
 [subnet_docs]:      http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html

data/kitchen-ec2.gemspec

@@ -9,18 +9,19 @@ Gem::Specification.new do |gem|
   gem.license       = 'Apache 2.0'
   gem.authors       = ["Fletcher Nichol"]
   gem.email         = ["fnichol@nichol.ca"]
-  gem.description   = "Kitchen::Driver::Ec2 - A Test Kitchen Driver for Ec2"
+  gem.description   = "A Test Kitchen Driver for Amazon EC2"
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/opscode/kitchen-ec2/"
+  gem.homepage      = "http://kitchen.ci/"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = []
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'test-kitchen', '~> 1.0.0.beta.3'
+  gem.add_dependency 'test-kitchen', '~> 1.0'
   gem.add_dependency 'fog'
 
+  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'
   gem.add_development_dependency 'countloc'

data/lib/kitchen/driver/ec2.rb

@@ -19,7 +19,6 @@
 require 'benchmark'
 require 'json'
 require 'fog'
-
 require 'kitchen'
 
 module Kitchen
@@ -34,13 +33,17 @@ module Kitchen
       default_config :region,             'us-east-1'
       default_config :availability_zone,  'us-east-1b'
       default_config :flavor_id,          'm1.small'
-      default_config :groups,             ['default']
+      default_config :ebs_optimized,      false
+      default_config :security_group_ids, ['default']
       default_config :tags,               { 'created-by' => 'test-kitchen' }
       default_config :aws_access_key_id do |driver|
-        ENV['AWS_ACCESS_KEY']
+        ENV['AWS_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID']
       end
       default_config :aws_secret_access_key do |driver|
-        ENV['AWS_SECRET_KEY']
+        ENV['AWS_SECRET_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
+      end
+      default_config :aws_session_token do |driver|
+        ENV['AWS_SESSION_TOKEN'] || ENV['AWS_TOKEN']
       end
       default_config :aws_ssh_key_id do |driver|
         ENV['AWS_SSH_KEY_ID']
@@ -51,6 +54,11 @@ module Kitchen
       default_config :username do |driver|
         driver.default_username
       end
+      default_config :endpoint do |driver|
+        "https://ec2.#{driver[:region]}.amazonaws.com/"
+      end
+
+      default_config :interface, nil
 
       required_config :aws_access_key_id
       required_config :aws_secret_access_key
@@ -62,9 +70,11 @@ module Kitchen
         state[:server_id] = server.id
 
         info("EC2 instance <#{state[:server_id]}> created.")
-        server.wait_for { print "."; ready? } ; print "(server ready)"
-        state[:hostname] = server.public_ip_address || server.private_ip_address
-        wait_for_sshd(state[:hostname], config[:username]) ; print "(ssh ready)\n"
+        server.wait_for { print '.'; ready? }
+        print '(server ready)'
+        state[:hostname] = hostname(server)
+        wait_for_sshd(state[:hostname], config[:username])
+        print '(ssh ready)\n'
         debug("ec2:create '#{state[:hostname]}'")
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
@@ -81,12 +91,12 @@ module Kitchen
       end
 
       def default_ami
-        region = amis["regions"][config[:region]]
+        region = amis['regions'][config[:region]]
         region && region[instance.platform.name]
       end
 
       def default_username
-        amis["usernames"][instance.platform.name] || "root"
+        amis['usernames'][instance.platform.name] || 'root'
       end
 
       private
@@ -96,7 +106,9 @@ module Kitchen
           :provider               => :aws,
           :aws_access_key_id      => config[:aws_access_key_id],
           :aws_secret_access_key  => config[:aws_secret_access_key],
+          :aws_session_token      => config[:aws_session_token],
           :region                 => config[:region],
+          :endpoint               => config[:endpoint],
         )
       end
 
@@ -105,9 +117,10 @@ module Kitchen
 
         connection.servers.create(
           :availability_zone  => config[:availability_zone],
-          :groups             => config[:groups],
+          :security_group_ids => config[:security_group_ids],
           :tags               => config[:tags],
           :flavor_id          => config[:flavor_id],
+          :ebs_optimized      => config[:ebs_optimized],
           :image_id           => config[:image_id],
           :key_name           => config[:aws_ssh_key_id],
           :subnet_id          => config[:subnet_id],
@@ -118,8 +131,9 @@ module Kitchen
         debug("ec2:region '#{config[:region]}'")
         debug("ec2:availability_zone '#{config[:availability_zone]}'")
         debug("ec2:flavor_id '#{config[:flavor_id]}'")
+        debug("ec2:ebs_optimized '#{config[:ebs_optimized]}'")
         debug("ec2:image_id '#{config[:image_id]}'")
-        debug("ec2:groups '#{config[:groups]}'")
+        debug("ec2:security_group_ids '#{config[:security_group_ids]}'")
         debug("ec2:tags '#{config[:tags]}'")
         debug("ec2:key_name '#{config[:aws_ssh_key_id]}'")
         debug("ec2:subnet_id '#{config[:subnet_id]}'")
@@ -132,6 +146,25 @@ module Kitchen
           JSON.load(IO.read(json_file))
         end
       end
+
+      def interface_types
+        {
+          'dns' => 'dns_name',
+          'public' => 'public_ip_address',
+          'private' => 'private_ip_address'
+        }
+      end
+
+      def hostname(server)
+        if config[:interface]
+          method = interface_types.fetch(config[:interface]) do
+            raise Kitchen::UserError, 'Invalid interface'
+          end
+          server.send(method)
+        else
+          server.dns_name || server.public_ip_address || server.private_ip_address
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "0.7.0"
+    EC2_VERSION = '0.8.0'
   end
 end

data/spec/create_spec.rb

@@ -0,0 +1,106 @@
+require 'kitchen/driver/ec2'
+require 'kitchen/provisioner/dummy'
+
+describe Kitchen::Driver::Ec2 do
+
+    let(:config) do
+      {}
+    end
+
+    let(:state) do
+      {}
+    end
+
+    let(:server) do
+      double(:id => "123",
+             :wait_for => nil,
+             :dns_name => "server.example.com",
+             :private_ip_address => '172.13.16.11',
+             :public_ip_address => '213.225.123.134')
+    end
+
+    let(:instance) do
+      Kitchen::Instance.new(:platform => double(:name => "centos-6.4"),
+                            :suite => double(:name => "default"),
+                            :driver => driver,
+                            :provisioner => Kitchen::Provisioner::Dummy.new({}),
+                            :busser => double("busser"),
+                            :state_file => double("state_file"))
+    end
+
+    let(:driver) do
+      Kitchen::Driver::Ec2.new(config)
+    end
+
+    before do
+      instance
+      allow(driver).to receive(:create_server).and_return(server)
+      allow(driver).to receive(:wait_for_sshd)
+    end
+
+  context 'Interface is set in config' do
+
+    it 'derives hostname from DNS when specified in the .kitchen.yml' do
+      config[:interface] = 'dns'
+      driver.create(state)
+      expect(state[:hostname]).to eql('server.example.com')
+    end
+
+    it 'derives hostname from public interface when specified in the .kitchen.yml' do
+      config[:interface] = 'public'
+      driver.create(state)
+      expect(state[:hostname]).to eql('213.225.123.134')
+    end
+
+    it 'derives hostname from private interface when specified in the .kitchen.yml' do
+      config[:interface] = 'private'
+      driver.create(state)
+      expect(state[:hostname]).to eql('172.13.16.11')
+    end
+
+    it 'throws a nice exception if the config is bogus' do
+      config[:interface] = 'I am an idiot'
+      expect { driver.create(state) }.to raise_error(Kitchen::UserError, 'Invalid interface')
+    end
+
+  end
+
+  context 'Interface is derived automatically' do
+
+    let(:server) do
+      double(:id => "123",
+             :wait_for => nil,
+             :dns_name => nil,
+             :private_ip_address => nil,
+             :public_ip_address => nil)
+    end
+
+    it 'sets hostname to DNS value if DNS value exists' do
+      allow(server).to receive(:dns_name).and_return('server.example.com')
+      driver.create(state)
+      expect(state[:hostname]).to eql('server.example.com')
+    end
+
+    it 'sets hostname to public value if public value exists' do
+      allow(server).to receive(:public_ip_address).and_return('213.225.123.134')
+      driver.create(state)
+
+      expect(state[:hostname]).to eql('213.225.123.134')
+    end
+
+    it 'sets hostname to private value if private value exists' do
+      allow(server).to receive(:private_ip_address).and_return('172.13.16.11')
+      driver.create(state)
+      expect(state[:hostname]).to eql('172.13.16.11')
+    end
+
+    it 'sets hostname to DNS if one or more Public/Private values are set' do
+      allow(server).to receive(:dns_name).and_return('server.example.com')
+      allow(server).to receive(:public_ip_address).and_return('213.225.123.134')
+      allow(server).to receive(:private_ip_address).and_return('172.13.16.11')
+      driver.create(state)
+      expect(state[:hostname]).to eql('server.example.com')
+    end
+
+  end
+end

metadata

@@ -1,96 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Kitchen::Driver::Ec2 - A Test Kitchen Driver for Ec2
+description: A Test Kitchen Driver for Amazon EC2
 email:
 - fnichol@nichol.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .tailor
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -100,7 +114,8 @@ files:
 - kitchen-ec2.gemspec
 - lib/kitchen/driver/ec2.rb
 - lib/kitchen/driver/ec2_version.rb
-homepage: https://github.com/opscode/kitchen-ec2/
+- spec/create_spec.rb
+homepage: http://kitchen.ci/
 licenses:
 - Apache 2.0
 metadata: {}
@@ -110,18 +125,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Kitchen::Driver::Ec2 - A Test Kitchen Driver for Ec2
-test_files: []
+summary: A Test Kitchen Driver for Amazon EC2
+test_files:
+- spec/create_spec.rb