cap-ec2 0.0.14 → 0.0.15

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Cap-EC2 changelog
 
+## 0.0.15
+
+* Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK` 
+  for their EC2 status checks. [@tomconroy](https://github.com/tomconroy)
+
 ## 0.0.14
 
 * Fix issue when tag was present in EC2 but had no value. [@tomconroy](https://github.com/tomconroy)

data/README.md

@@ -52,6 +52,8 @@ set :ec2_access_key_id, nil
 set :ec2_secret_access_key, nil
 set :ec2_region, %w{}
 set :ec2_contact_point, nil
+
+set :ec2_filter_by_status_ok?, nil
 ```
 
 #### Order of inheritance
@@ -84,6 +86,11 @@ If running on EC2 the IAM instance profile credentials will be used if credentia
   If this is defined, Cap-EC2 will look for a tag with this name to determine which instances belong to
   a given role. The tag name defaults to "Roles".
 
+* filter_by_status_ok?
+
+  If this is set to `true`, then Cap-EC2 will not return instances which do not have both EC2 status
+  checks as `OK`. By default this is set to `nil`, so Cap-EC2 can return you instances which don't have
+  `OK` status checks. Be warned that just-launched instances take a while to start returning `OK`.
 
 ### YAML Configuration
 

data/lib/cap-ec2/ec2-handler.rb

@@ -67,7 +67,8 @@ module CapEC2
         servers << instances.select do |i|
           instance_has_tag?(i, roles_tag, role) &&
             instance_has_tag?(i, stages_tag, stage) &&
-            instance_has_tag?(i, project_tag, application)
+            instance_has_tag?(i, project_tag, application) &&
+            (fetch(:ec2_filter_by_status_ok?) ? instance_status_ok?(i) : true)
         end
       end
       servers.flatten.sort_by {|s| s.tags["Name"]}
@@ -78,5 +79,15 @@ module CapEC2
     def instance_has_tag?(instance, key, value)
       (instance.tags[key] || '').split(',').map(&:strip).include?(value.to_s)
     end
+
+    def instance_status_ok?(instance)
+      @ec2.any? do |_, ec2|
+        response = ec2.client.describe_instance_status(
+          instance_ids: [instance.id],
+          filters: [{ name: 'instance-status.status', values: %w(ok) }]
+        )
+        response.data.has_key?(:instance_status_set) && response.data[:instance_status_set].any?
+      end
+    end
   end
 end

data/lib/cap-ec2/utils.rb

@@ -40,6 +40,8 @@ module CapEC2
           set :ec2_access_key_id, config['access_key_id'] if config['access_key_id']
           set :ec2_secret_access_key, config['secret_access_key'] if config['secret_access_key']
           set :ec2_region, config['regions'] if config['regions']
+
+          set :ec2_filter_by_status_ok?, config['filter_by_status_ok?'] if config['filter_by_status_ok?']
         end
       end
     end

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
+  prerelease: 
 platform: ruby
 authors:
 - Andy Sykes
@@ -9,90 +10,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon
@@ -104,7 +117,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -120,26 +133,33 @@ files:
 homepage: https://github.com/forward3d/cap-ec2
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -187489000278530207
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -187489000278530207
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2
   instance tags, dynamically building the list of servers to be deployed to.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5b1a3bd6ad23645ae15eabc5f7f1bf641a921240
-  data.tar.gz: 2458e03a181dcafbe535e1885a54c04715a14a95
-SHA512:
-  metadata.gz: 6817287d6bcbc0a2e7faec15638e2b09d867040dd963f652157182f77e7eef1c1f078e007a2e95eb1e0fd276d4ad75214e73b661e47a85328d492397241ef931
-  data.tar.gz: 6dd0b888bb606536668971f9d715576e42d2eeaacb3a4f18188a39a8292961d6f9b0b36d7e56bd5c3bccf02307dad711d78743c970f388820197baac2e206aef