ami_spec 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+ - 1.9.3
+ - 2.1.8
+ - 2.2.4

data/README.md

@@ -17,11 +17,11 @@ The problem with this approach is:
 
 ## Installation
 
-System-wide: gem install ami-spec
+System-wide: gem install ami\_spec
 
 With bundler:
 
-Add `gem 'ami-spec'` to your Gemfile.
+Add `gem 'ami_spec'` to your Gemfile.
 Run `bundle install`
 
 ## CLI Usage
@@ -61,7 +61,39 @@ AmiSpec will launch an EC2 instance from the given AMI (`--ami`), in a subnet (`
 and try to SSH to it (`--ssh-user` and `--key-file`).
 When the instances becomes reachable it will run all Specs inside the role spec directory (`--role` i.e. `my_project/spec/web_server`).
 
-Alternative to the `--ami` and `--role` variables, a file of comma separated roles and AMIs (`ROLE,AMI\n`) can be supplied to `--role-ami-file`. 
+Alternative to the `--ami` and `--role` variables, a file of comma separated roles and AMIs (`ROLE,AMI\n`) can be supplied to `--role-ami-file`.
+
+## Known caveats
+
+### RSpec conditions in examples
+
+[ServerSpecs advanced tips](http://serverspec.org/advanced_tips.html) provides a mechanism to conditionally apply tests based on server information.
+
+```ruby
+describe file('/usr/lib64'), :if => os[:arch] == 'x86_64' do
+  it { should be_directory }
+end
+```
+
+If these are used in shared examples, say loaded via a rspec helper, this doesn't work with AmiSpec, because the evaluation of `os[:arch] == 'x86_64'` is done when the spec is loaded not at run time.
+
+Working around this is tricky. We need to move the evaluation of `os[:arch]` to runtime not load time. Since RSpec example metadata can only be a bool, string or symbol we set a metadata key of `:os_arch` to the value we expect:
+
+```ruby
+describe file('/usr/lib64'), :os_arch => 'x86_64' do
+  it { should be_directory }
+end
+```
+
+We then have to set an RSpec exclusion of examples where the architecture does not match the host under test's architecture. This can be done in the `spec_helper` with a lambda function that tests this:
+
+```ruby
+RSpec.configure do |c|
+  c.filter_run_excluding :os_arch => lambda { |arch| arch if os[:arch] != arch }
+end
+```
+
+We are exluding any example with the metadata key :os_arch where the value does not match our architecture. Similar examples can be included for os family etc.
 
 ## Development Status
 

data/lib/ami_spec/aws_instance.rb

@@ -28,7 +28,7 @@ module AmiSpec
       client = Aws::EC2::Client.new(client_options)
       placeholder_instance = client.run_instances(instances_options).instances.first
 
-      @instance = Aws::EC2::Instance.new(placeholder_instance.instance_id)
+      @instance = Aws::EC2::Instance.new(placeholder_instance.instance_id, client_options)
       @instance.wait_until_running
       tag_instance
     end

data/lib/ami_spec/server_spec.rb

@@ -18,6 +18,8 @@ module AmiSpec
     end
 
     def run
+      puts "Running tests for #{@role}"
+
       $LOAD_PATH.unshift(@spec) unless $LOAD_PATH.include?(@spec)
       require File.join(@spec, 'spec_helper')
 

data/lib/ami_spec/version.rb

@@ -1,3 +1,3 @@
 module AmiSpec
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/ami_spec/wait_for_rc.rb

@@ -0,0 +1,16 @@
+require 'net/ssh'
+
+module AmiSpec
+  class WaitForRC
+    def self.wait(ip_address, user, key)
+      Net::SSH.start(ip_address, user, keys: [key], paranoid: false) do |ssh|
+        # Wait for SystemV to start
+        # This only works for Ubuntu with upstart.
+        # Detecting OS and Release will need something like this
+        # https://github.com/mizzy/specinfra/blob/master/lib/specinfra/helper/detect_os/debian.rb
+        ssh.exec 'while /usr/sbin/service rc status | grep -q "^rc start/running, process"; do sleep 1; done'
+      end
+    end
+  end
+end
+

data/lib/ami_spec.rb

@@ -3,6 +3,7 @@ require 'ami_spec/aws_instance_options'
 require 'ami_spec/server_spec'
 require 'ami_spec/server_spec_options'
 require 'ami_spec/wait_for_ssh'
+require 'ami_spec/wait_for_rc'
 require 'trollop'
 
 module AmiSpec
@@ -50,6 +51,7 @@ module AmiSpec
     instances.each do |instance|
       ip_address = options[:aws_public_ip] ? instance.public_ip_address : instance.private_ip_address
       WaitForSSH.wait(ip_address, options[:ssh_user], options[:key_file], options[:ssh_retries])
+      WaitForRC.wait(ip_address, options[:ssh_user], options[:key_file]) if options[:wait_for_rc]
 
       server_spec_options = ServerSpecOptions.new(options.merge(instance: instance))
       results << ServerSpec.new(server_spec_options).run
@@ -95,6 +97,7 @@ module AmiSpec
       opt :ssh_retries, "The number of times we should try sshing to the ec2 instance before giving up. Defaults to 30",
           type: :int, default: 30
       opt :debug, "Don't terminate instances on exit"
+      opt :wait_for_rc, "Wait for oldschool SystemV scripts to run before conducting tests. Currently only supports Ubuntu with upstart"
     end
 
     if options[:role] && options[:ami]

data/spec/aws_instance_spec.rb

@@ -62,12 +62,20 @@ describe AmiSpec::AwsInstance do
     context 'with region' do
       let(:region) { 'us-east-1' }
 
-      it 'does include the region' do
+      it 'does include the region in the intial connection' do
         expect(Aws::EC2::Client).to receive(:new).with(
                                       hash_including(:region => region)
                                     )
         start
       end
+
+      it 'does include the region in the subsequent connection' do
+        expect(Aws::EC2::Instance).to receive(:new).with(
+                                        anything,
+                                        hash_including(:region => region)
+                                      )
+        start
+      end
     end
 
     it 'tags the instance with a role' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -145,6 +146,7 @@ files:
 - lib/ami_spec/server_spec.rb
 - lib/ami_spec/server_spec_options.rb
 - lib/ami_spec/version.rb
+- lib/ami_spec/wait_for_rc.rb
 - lib/ami_spec/wait_for_ssh.rb
 - spec/ami_spec_spec.rb
 - spec/aws_instance_spec.rb