ami_spec 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4504c60fd0ce24f40be03e192159fcc9c8509cddbc2642cb0c8c50e351a7c7fa
-  data.tar.gz: 8fc38e659fb6436b8ad37467564445de49c92940991d3f8b820d1b2f6927355a
+  metadata.gz: 6bf865c78d589bc86d5e434dcb49d3ae8dcf301b1c07181d6a9d2f569ccd284e
+  data.tar.gz: ace2b925ce79810075177b8e90113b84fc15f574be9c0cd782aa0ec90536c643
 SHA512:
-  metadata.gz: 1a86bbfccdfbbe323eea7cea45bc9450d41626d3a40ed456a41b4228ef4eb1b211e23268a024dbecd81ebb768a06f00ac19e99f31387ce14e6b32635c99886cf
-  data.tar.gz: 65effb5f2d0a7053c645c79b9ffa0c42ca93c4ee4183cdfbc7ab909263affb431d54ba0ea7f0dcb339bc5f3b81466ed765393d644886910b499e6a8df501c673
+  metadata.gz: 4263f8621665309d2de4859291b286a9bd3b5d5545ac47df20a1bbb56c589ae93585b55418121545afffdbf592c45a7594d171d403d1e94adde1bb0fe7357e73
+  data.tar.gz: 8327271a25293d9cb08f1b9ae0e56983a39ac8d673acb1e7186183faf99d561c827a372251ba70e10100f80c287a6bf2a2578604e829611842bd76bbffaeec45

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p551
+2.5.1

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
- - 1.9.3
- - 2.1.8
- - 2.2.4
+ - 2.2.6
+ - 2.4.4
+ - 2.5.1
+ - 2.6.1
 script: bundle exec rake spec

data/ami_spec.gemspec

@@ -17,11 +17,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'aws-sdk', '~> 2'
-  gem.add_dependency 'rake'
-  gem.add_dependency 'serverspec'
+  gem.add_dependency 'aws-sdk-ec2', '~> 1'
+  gem.add_development_dependency 'rake'
+  gem.add_dependency 'serverspec', '~> 2'
   gem.add_dependency 'specinfra', '>= 2.45'
-  gem.add_dependency 'trollop'
+  gem.add_dependency 'optimist', '~> 3'
   gem.add_dependency 'hashie'
-  gem.add_dependency 'net-ssh', '< 3.0'
+  gem.add_dependency 'net-ssh', '~> 5'
+
+  gem.required_ruby_version = '>= 2.2.6'
 end

data/bin/ami_spec

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
 require 'ami_spec'
 
 AmiSpec.invoke

data/lib/ami_spec.rb

@@ -4,7 +4,7 @@ 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'
+require 'optimist'
 
 module AmiSpec
   class InstanceConnectionTimeout < StandardError; end
@@ -83,7 +83,7 @@ module AmiSpec
   private_class_method :stop_instances
 
   def self.invoke
-    options = Trollop::options do
+    options = Optimist::options do
       opt :role, "The role to test, this should map to a directory in the spec folder", type: :string
       opt :ami, "The ami ID to run tests against", type: :string
       opt :role_ami_file, "A file containing comma separated roles and amis. i.e.\nweb_server,ami-id.",
@@ -96,7 +96,7 @@ module AmiSpec
       opt :aws_region, "The AWS region, defaults to AWS_DEFAULT_REGION environment variable", type: :string
       opt :aws_instance_type, "The ec2 instance type, defaults to t2.micro", type: :string, default: 't2.micro'
       opt :aws_security_groups, "Security groups to associate to the launched instances. May be specified multiple times",
-          type: :strings, default: nil
+          type: :string, default: nil, multi: true
       opt :aws_public_ip, "Launch instances with a public IP"
       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

data/lib/ami_spec/aws_instance.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-ec2'
 require 'forwardable'
 require 'base64'
 

data/lib/ami_spec/server_spec.rb

@@ -28,7 +28,11 @@ module AmiSpec
       end
 
       $LOAD_PATH.unshift(@spec) unless $LOAD_PATH.include?(@spec)
-      require File.join(@spec, 'spec_helper')
+      begin
+        require File.join(@spec, 'spec_helper')
+      rescue LoadError
+        puts 'Spec Helper does not exist. Skipping!'
+      end
 
       set :backend, :ssh
       set :host, @ip

data/lib/ami_spec/version.rb

@@ -1,3 +1,3 @@
 module AmiSpec
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Patrick Robinson
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -43,16 +43,16 @@ dependencies:
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
 description: Acceptance testing your AMIs
 email: []
 executables:
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="