awspec 0.25.3 → 0.26.0

data/lib/awspec/type/iam_group.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class IamGroup < Base
     def initialize(id)
       super
-      @resource = find_iam_group(id)
-      @id = @resource[:group_id] if @resource
+      @resource_via_client = find_iam_group(id)
+      @id = @resource_via_client[:group_id] if @resource_via_client
     end
 
     def has_iam_user?(user_id)
@@ -17,7 +17,7 @@ module Awspec::Type
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_group_name(@resource[:group_name])
+      policies = select_iam_policy_by_group_name(@resource_via_client[:group_name])
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end

data/lib/awspec/type/iam_policy.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class IamPolicy < Base
     def initialize(id)
       super
-      @resource = find_iam_policy(id)
-      @id = @resource[:policy_id] if @resource
+      @resource_via_client = find_iam_policy(id)
+      @id = @resource_via_client[:policy_id] if @resource_via_client
     end
 
     def attachable?
-      @resource.is_attachable
+      @resource_via_client.is_attachable
     end
 
     def attached_to_user?(user_id = nil)

data/lib/awspec/type/iam_role.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class IamRole < Base
     def initialize(id)
       super
-      @resource = find_iam_role(id)
-      @id = @resource[:role_id] if @resource
+      @resource_via_client = find_iam_role(id)
+      @id = @resource_via_client[:role_id] if @resource_via_client
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_role_name(@resource[:role_name])
+      policies = select_iam_policy_by_role_name(@resource_via_client[:role_name])
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end

data/lib/awspec/type/iam_user.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class IamUser < Base
     def initialize(id)
       super
-      @resource = find_iam_user(id)
-      @id = @resource[:user_id] if @resource
+      @resource_via_client = find_iam_user(id)
+      @id = @resource_via_client[:user_id] if @resource_via_client
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_user_name(@resource[:user_name])
+      policies = select_iam_policy_by_user_name(@resource_via_client[:user_name])
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end

data/lib/awspec/type/lambda.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class Lambda < Base
     def initialize(id)
       super
-      @resource = find_lambda(id)
-      @id = @resource[:function_arn] if @resource
+      @resource_via_client = find_lambda(id)
+      @id = @resource_via_client[:function_arn] if @resource_via_client
     end
 
     def timeout
-      @resource[:timeout]
+      @resource_via_client[:timeout]
     end
 
     def has_event_source?(event_source_arn)

data/lib/awspec/type/network_acl.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class NetworkAcl < Base
     def initialize(id)
       super
-      @resource = find_network_acl(id)
-      @id = @resource[:network_acl_id] if @resource
+      @resource_via_client = find_network_acl(id)
+      @id = @resource_via_client[:network_acl_id] if @resource_via_client
     end
 
     def has_subnet?(subnet_id)
-      @resource.associations.find do |a|
+      @resource_via_client.associations.find do |a|
         next true if a.subnet_id == subnet_id
         subnet = find_subnet(subnet_id)
         next false unless subnet
@@ -36,13 +36,13 @@ module Awspec::Type
     end
 
     def inbound_entries_count
-      @resource[:entries].count do |entry|
+      @resource_via_client[:entries].count do |entry|
         entry.egress == false
       end
     end
 
     def outbound_entries_count
-      @resource[:entries].count do |entry|
+      @resource_via_client[:entries].count do |entry|
         entry.egress == true
       end
     end
@@ -68,7 +68,7 @@ module Awspec::Type
     private
 
     def entry?(rule_action, port = nil, protocol = nil, cidr = nil, rule_number = nil)
-      @resource[:entries].find do |entry|
+      @resource_via_client[:entries].find do |entry|
         # egress rule_action
         next false if entry.egress != @egress
         next false if entry.rule_action != rule_action

data/lib/awspec/type/rds.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class Rds < Base
     def initialize(id)
       super
-      @resource = find_rds(id)
-      @id = @resource[:db_instance_identifier] if @resource
+      @resource_via_client = find_rds(id)
+      @id = @resource_via_client[:db_instance_identifier] if @resource_via_client
     end
 
     STATES = %w(
@@ -18,12 +18,12 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource[:db_instance_status] == state
+        @resource_via_client[:db_instance_status] == state
       end
     end
 
     def vpc_id
-      @resource[:db_subnet_group][:vpc_id]
+      @resource_via_client[:db_subnet_group][:vpc_id]
     end
 
     def has_security_group?(sg_id)
@@ -34,14 +34,14 @@ module Awspec::Type
     end
 
     def has_db_parameter_group?(name)
-      pgs = @resource[:db_parameter_groups]
+      pgs = @resource_via_client[:db_parameter_groups]
       pgs.find do |pg|
         pg[:db_parameter_group_name] == name
       end
     end
 
     def has_option_group?(name)
-      ogs = @resource[:option_group_memberships]
+      ogs = @resource_via_client[:option_group_memberships]
       ogs.find do |og|
         og[:option_group_name] == name
       end
@@ -50,14 +50,14 @@ module Awspec::Type
     private
 
     def has_vpc_security_group_id?(sg_id)
-      sgs = @resource[:vpc_security_groups]
+      sgs = @resource_via_client[:vpc_security_groups]
       sgs.find do |sg|
         sg[:vpc_security_group_id] == sg_id
       end
     end
 
     def has_vpc_security_group_name?(sg_id)
-      sgs = @resource[:vpc_security_groups]
+      sgs = @resource_via_client[:vpc_security_groups]
       res = @ec2_client.describe_security_groups({
                                                    filters: [{ name: 'group-name', values: [sg_id] }]
                                                  })
@@ -68,7 +68,7 @@ module Awspec::Type
     end
 
     def has_vpc_security_group_tag_name?(sg_id)
-      sgs = @resource[:vpc_security_groups]
+      sgs = @resource_via_client[:vpc_security_groups]
       res = @ec2_client.describe_security_groups({
                                                    filters: [{ name: 'tag:Name', values: [sg_id] }]
                                                  })
@@ -79,7 +79,7 @@ module Awspec::Type
     end
 
     def has_db_security_group_name?(sg_id)
-      sgs = @resource[:db_security_groups]
+      sgs = @resource_via_client[:db_security_groups]
       sgs.find do |sg|
         sg[:db_security_group_name] == sg_id
       end

data/lib/awspec/type/rds_db_parameter_group.rb

@@ -17,7 +17,7 @@ module Awspec::Type
       end
 
       @id = name unless @parameters.empty?
-      @resource = @parameters
+      @resource_via_client = @parameters
     end
 
     def method_missing(name)

data/lib/awspec/type/route53_hosted_zone.rb

@@ -4,15 +4,15 @@ module Awspec::Type
 
     def initialize(id)
       super
-      @resource = find_hosted_zone(id)
-      @id = @resource[:id] if @resource
+      @resource_via_client = find_hosted_zone(id)
+      @id = @resource_via_client[:id] if @resource_via_client
       return unless @id
-      @resource_record_sets = select_record_sets_by_hosted_zone_id(@id)
+      @resource_via_client_record_sets = select_record_sets_by_hosted_zone_id(@id)
     end
 
     def has_record_set?(name, type, value, options = {})
       name.gsub!(/\*/, '\\\052') # wildcard support
-      ret = @resource_record_sets.find do |record_set|
+      ret = @resource_via_client_record_sets.find do |record_set|
         next if record_set.type != type.upcase
         options[:ttl] = record_set.ttl unless options[:ttl]
         if !record_set.resource_records.empty?

data/lib/awspec/type/route_table.rb

@@ -2,12 +2,12 @@ module Awspec::Type
   class RouteTable < Base
     def initialize(id)
       super
-      @resource = find_route_table(id)
-      @id = @resource[:route_table_id] if @resource
+      @resource_via_client = find_route_table(id)
+      @id = @resource_via_client[:route_table_id] if @resource_via_client
     end
 
     def has_route?(destination, gateway_id = nil, instance_id = nil, vpc_peering_connection_id = nil)
-      @resource.routes.find do |route|
+      @resource_via_client.routes.find do |route|
         if destination
           next false unless route.destination_cidr_block == destination
         end
@@ -20,7 +20,7 @@ module Awspec::Type
     def has_subnet?(subnet_id)
       subnet = find_subnet(subnet_id)
       return false unless subnet
-      @resource.associations.find do |a|
+      @resource_via_client.associations.find do |a|
         a[:subnet_id] == subnet[:subnet_id]
       end
     end

data/lib/awspec/type/s3_bucket.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class S3Bucket < Base
     def initialize(id)
       super
-      @resource = find_bucket(id)
-      @id = id if @resource
+      @resource_via_client = find_bucket(id)
+      @id = id if @resource_via_client
     end
 
     def has_object?(key)
@@ -58,6 +58,10 @@ module Awspec::Type
       bp ? (bp.policy.read == policy.gsub(/(\n|\r|\r\n|\s|\t)/, '')) : false
     end
 
+    def hogehoge
+      @hogehoge ||= Awspec::ResourceReader.new(Aws::S3::Bucket.new(@id))
+    end
+
     private
 
     def cors_rules

data/lib/awspec/type/security_group.rb

@@ -6,8 +6,8 @@ module Awspec::Type
       super
       @client = @ec2_client
       @inbound = true
-      @resource = find_security_group(id)
-      @id = @resource[:group_id] if @resource
+      @resource_via_client = find_security_group(id)
+      @id = @resource_via_client[:group_id] if @resource_via_client
     end
 
     def opened?(port = nil, protocol = nil, cidr = nil)
@@ -19,7 +19,7 @@ module Awspec::Type
     end
 
     def inbound_opened?(port = nil, protocol = nil, cidr = nil)
-      @resource[:ip_permissions].find do |permission|
+      @resource_via_client[:ip_permissions].find do |permission|
         next true unless port
         next true unless permission[:from_port]
         next true unless permission[:to_port]
@@ -43,7 +43,7 @@ module Awspec::Type
     end
 
     def outbound_opened?(port = nil, protocol = nil, cidr = nil)
-      @resource[:ip_permissions_egress].find do |permission|
+      @resource_via_client[:ip_permissions_egress].find do |permission|
         next true unless port
         next true unless permission[:from_port]
         next true unless permission[:to_port]
@@ -77,23 +77,23 @@ module Awspec::Type
     end
 
     def ip_permissions_count
-      @resource[:ip_permissions].count
+      @resource_via_client[:ip_permissions].count
     end
     alias_method :inbound_permissions_count, :ip_permissions_count
 
     def ip_permissions_egress_count
-      @resource[:ip_permissions_egress].count
+      @resource_via_client[:ip_permissions_egress].count
     end
     alias_method :outbound_permissions_count, :ip_permissions_egress_count
 
     def inbound_rule_count
-      @resource[:ip_permissions].reduce(0) do |sum, permission|
+      @resource_via_client[:ip_permissions].reduce(0) do |sum, permission|
         sum += permission.ip_ranges.count + permission.user_id_group_pairs.count
       end
     end
 
     def outbound_rule_count
-      @resource[:ip_permissions_egress].reduce(0) do |sum, permission|
+      @resource_via_client[:ip_permissions_egress].reduce(0) do |sum, permission|
         sum += permission.ip_ranges.count + permission.user_id_group_pairs.count
       end
     end

data/lib/awspec/type/ses_identity.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class SesIdentity < Base
     def initialize(id)
       super
-      @resource = find_ses_identity(id)
-      @id = @resource if @resource
+      @resource_via_client = find_ses_identity(id)
+      @id = @resource_via_client if @resource_via_client
     end
 
     def has_identity_policy?(name)

data/lib/awspec/type/subnet.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class Subnet < Base
     def initialize(id)
       super
-      @resource = find_subnet(id)
-      @id = @resource[:subnet_id] if @resource
+      @resource_via_client = find_subnet(id)
+      @id = @resource_via_client[:subnet_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -12,7 +12,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource[:state] == state
+        @resource_via_client[:state] == state
       end
     end
   end

data/lib/awspec/type/vpc.rb

@@ -5,8 +5,8 @@ module Awspec::Type
     def initialize(id)
       super
       @client = @ec2_client
-      @resource = find_vpc(id)
-      @id = @resource[:vpc_id] if @resource
+      @resource_via_client = find_vpc(id)
+      @id = @resource_via_client[:vpc_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -15,7 +15,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource[:state] == state
+        @resource_via_client[:state] == state
       end
     end
 

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.25.3'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.25.3
+  version: 0.26.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for your AWS resources.
 email:
 - k1lowxb@gmail.com
@@ -290,6 +304,7 @@ files:
 - lib/awspec/matcher/belong_to_vpc.rb
 - lib/awspec/matcher/have_record_set.rb
 - lib/awspec/matcher/have_route.rb
+- lib/awspec/resource_reader.rb
 - lib/awspec/setup.rb
 - lib/awspec/stub.rb
 - lib/awspec/stub/autoscaling_group.rb