ec2-host 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a203a17576914b64c580faffb3176c5c9b10f0
-  data.tar.gz: 6b1ebbdc7be878c17b227900e1a1192c21206d1b
+  metadata.gz: 0dc25b078ef99bec51f8d6d3d34c847c12482dab
+  data.tar.gz: 942cbde8877b6f20681cd3d098bf0ae04133ea3e
 SHA512:
-  metadata.gz: 420df457c6431cfe2f50992f8d541e80d6e4b20a32614917b5ce2f582b13c7e255d3f7f08c9fe74e6bae3c17fd7b5d735da72de3d97d2e1e72fcddedd8b5ac99
-  data.tar.gz: 84b5ae13c7cec35dfb04b59858722252f261afe58a36b8b743092385109ba4197051066d762a1dabc089b735329e42e9b89f7d2f544372a5409df2f840fb2719
+  metadata.gz: 0c5e37497cbc0b41c888ed077542a1b5659631152f0de62678ad2ed5db6df45cfd77d7ab54efa093d603ab3fb638ed2cbacb626e60753d0af3c077e66b11135e
+  data.tar.gz: 8bb986e56f4508a652942a16e28ee0ba9f0f110d40e6640d064d866e76c0d983873b9336f4a2d581a81b156849e446e0056aafc2d2f561cee544618b04fa1529

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.0.9 (2015/08/10)
+
+Enhancements:
+
+* Add --state and --monitoring option
+* Remove terminated instances from list as default
+* Support nested key such as instance.instance_id (as library)
+
 # 0.0.8 (2015/08/10)
 
 Enhancements:

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.0.8'
+  gem.version       = '0.0.9'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'

data/lib/ec2/host/cli.rb

@@ -30,6 +30,12 @@ class EC2
       option :instance_id,
         :type => :array,
         :desc => "instance_id"
+      option :state,
+        :type => :array,
+        :desc => "state"
+      option :monitoring,
+        :type => :array,
+        :desc => "monitoring"
       Config.optional_options.each do |opt, tag|
         option opt, :type => :array, :desc => opt
       end

data/lib/ec2/host/host_data.rb

@@ -18,9 +18,9 @@ class EC2
         :instance_id,
         :private_ip_address,
         :public_ip_address,
-        :launch_time,
-        :state,
-        :monitoring
+        :launch_time
+      def state; instance.state.name; end
+      def monitoring; instance.monitoring.state; end
 
       alias_method :ip, :private_ip_address
       alias_method :start_date, :launch_time
@@ -41,16 +41,18 @@ class EC2
       #
       # @param [Hash] condition search parameters
       def match?(condition)
+        return false if !condition[:state] and terminated? # remove terminated host from lists as default
         return false unless role_match?(condition)
         condition = HashUtil.except(condition,
           :role, :role1, :role2, :role3,
           :usage, :usage1, :usage2, :usage3
         )
         condition.each do |key, values|
-          if self.send(key).is_a?(Array)
-            return false unless self.send(key).find {|v| values.include?(v) }
+          v = get_value(key)
+          if v.is_a?(Array)
+            return false unless v.find {|_| values.include?(_) }
           else
-            return false unless values.include?(self.send(key))
+            return false unless values.include?(v)
           end
         end
         true
@@ -79,13 +81,24 @@ class EC2
           private_ip_address: private_ip_address,
           public_ip_address: public_ip_address,
           launch_time: launch_time,
-          state: state.name,
-          monitoring: monitoring.state,
+          state: state,
+          monitoring: monitoring,
         ).to_json
       end
 
       # private
 
+      # "instance.instance_id" => self.send("instance").send("instance_id")
+      def get_value(key)
+        v = self
+        key.to_s.split('.').each {|k| v = v.send(k) }
+        v
+      end
+
+      def terminated?
+        state == "terminated"
+      end
+
       def role_match?(condition)
         # usage is an alias of role
         if role = (condition[:role] || condition[:usage])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Naotoshi Seo