awspec 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9899a6c41db7288dc6098840b36cffe8cd9c6836
-  data.tar.gz: 0ff3377d77778182c0b0e4288617c61461ac749c
+  metadata.gz: 0aceb416d92d43a4e663f5ce3013c8ac09da82e7
+  data.tar.gz: 8f922eaad68c274aab3619c66db708be73e3e751
 SHA512:
-  metadata.gz: ef5ff136b8790b96f4a9675343bc89316eda0b2f6eb9e2cbac188c1a7432b976b2d46ff0a64f8f6ca1db2ffde508f9e2094cd509e73ae645ee743d9b91c32917
-  data.tar.gz: 3921163912753ffc4dc078b8a4ded4194f1332925d39b21fad7a6d29b7258610fa25881db423a0984a3d9ffb27cba6686021bfdfe27bbbd0bf2953216e189ce5
+  metadata.gz: 018073b48b54e5d9e5211938b6073121e62069feb03bd0fd6e0c3823f0cf643c9793c7bd1538705834badb2e302d4a9bce6f7922f10828f14080a98b0bb59b5e
+  data.tar.gz: 481becdd71747950e2d09f136f1ad15fa3c05f1d4dac229c87ef15ee6baca3e291f4a57370aec3d02fb42b2a0ad045f7d8d777dcee5e7cefe29d178bdb5b86a3

data/README.md

@@ -1,4 +1,4 @@
-# awspec [![Gem](https://img.shields.io/gem/v/awspec.svg)](https://rubygems.org/gems/awspec) [![Travis](https://img.shields.io/travis/k1LoW/awspec.svg)](https://travis-ci.org/k1LoW/awspec)
+# awspec [![Gem](https://img.shields.io/gem/v/awspec.svg)](https://rubygems.org/gems/awspec) [![Travis](https://img.shields.io/travis/k1LoW/awspec.svg)](https://travis-ci.org/k1LoW/awspec) [![Scrutinizer](https://img.shields.io/scrutinizer/g/k1LoW/awspec.svg)](https://scrutinizer-ci.com/g/k1LoW/awspec/) [![Gemnasium](https://img.shields.io/gemnasium/k1LoW/awspec.svg)](https://gemnasium.com/k1LoW/awspec)
 
 RSpec tests for your AWS resources.
 

data/lib/awspec/helper/finder/ec2.rb

@@ -45,17 +45,6 @@ module Awspec::Helper
         return res[:subnets][0] if res[:subnets].count == 1
       end
 
-      def find_route_table(route_table_id)
-        res = @ec2_client.describe_route_tables({
-                                                  filters: [{ name: 'route-table-id', values: [route_table_id] }]
-                                                })
-        return res[:route_tables][0] if res[:route_tables].count == 1
-        res = @ec2_client.describe_route_tables({
-                                                  filters: [{ name: 'tag:Name', values: [route_table_id] }]
-                                                })
-        return res[:route_tables][0] if res[:route_tables].count == 1
-      end
-
       def find_internet_gateway(gateway_id)
         res = @ec2_client.describe_internet_gateways({
                                                        filters: [{ name: 'internet-gateway-id', values: [gateway_id] }]
@@ -82,6 +71,17 @@ module Awspec::Helper
         return res[:security_groups][0] if res[:security_groups].count == 1
       end
 
+      def find_ebs(volume_id)
+        res = @ec2_client.describe_volumes({
+                                             filters: [{ name: 'volume-id', values: [volume_id] }]
+                                           })
+        return res[:volumes][0] if res[:volumes].count == 1
+        res = @ec2_client.describe_volumes({
+                                             filters: [{ name: 'tag:Name', values: [volume_id] }]
+                                           })
+        return res[:volumes][0] if res[:volumes].count == 1
+      end
+
       def select_ec2_by_vpc_id(vpc_id)
         res = @ec2_client.describe_instances({
                                                filters: [{ name: 'vpc-id', values: [vpc_id] }]

data/lib/awspec/helper/finder/vpc.rb

@@ -12,13 +12,13 @@ module Awspec::Helper
         return res[:vpcs][0] if res[:vpcs].count == 1
       end
 
-      def find_route_table(id)
+      def find_route_table(route_table_id)
         res = @ec2_client.describe_route_tables({
-                                                  filters: [{ name: 'route-table-id', values: [id] }]
+                                                  filters: [{ name: 'route-table-id', values: [route_table_id] }]
                                                 })
         return res[:route_tables][0] if res[:route_tables].count == 1
         res = @ec2_client.describe_route_tables({
-                                                  filters: [{ name: 'tag:Name', values: [id] }]
+                                                  filters: [{ name: 'tag:Name', values: [route_table_id] }]
                                                 })
         return res[:route_tables][0] if res[:route_tables].count == 1
       end

data/lib/awspec/type/ec2.rb

@@ -46,8 +46,22 @@ module Awspec::Type
       end
       return true if ret
       sg2 = find_security_group(sg_id)
-      sg2[:tags].find do |tag|
-        tag[:key] == 'Name' && tag[:value] == sg_id
+      return false unless sg2.tag_name == sg_id
+      sgs.find do |sg|
+        sg[:group_id] == sg2[:group_id]
+      end
+    end
+
+    def has_ebs?(volume_id)
+      blocks = @instance[:block_device_mappings]
+      ret = blocks.find do |block|
+        next false unless block[:ebs]
+        block[:ebs][:volume_id] == volume_id
+      end
+      return true if ret
+      blocks2 = find_ebs(volume_id)
+      blocks2[:attachments].find do |attachment|
+        attachment.instance_id == @id
       end
     end
   end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec