awspec 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1909c7febd232e63f4f01933058887c972a174e
-  data.tar.gz: cb3d860018b22a635823a714d05b86ae23db32b6
+  metadata.gz: 1708fe037ed85b50638c71a0f1120c13f4042384
+  data.tar.gz: b424d9466944bac4274b874d8b3199b381a6d1fd
 SHA512:
-  metadata.gz: 9f71aa2801687ba6a5d85329fd7613e4d64ac27477daa109df26fd604b18def3103129f5f2576188665a0db7dfba1dc6412e905b58b3fd33deb89e233474959e
-  data.tar.gz: d16c5744e51f88335da74c058c90b4fb6f55563f3766d5b27d6b1ec8f6138222875f496336dea431a53d10facca6f91b8b790a1298061a8f5120370174c2e100
+  metadata.gz: f977aeec94bb0afc4f0de92b06f43f57984a49f2a4558d39a8a4e7b237cda1e7e9ffb08393d0b31bc28fa71b19f15183d00964fea13032e871e712bb677ac73a
+  data.tar.gz: cf6ec02eb6a9b75ed66b0c24d88f4803a57eebadb15cb9e7a83a913cd98bf84b1af54e136d5410d255e900d8842498ff335945d47809d7ce3d682eb2b0a3c286

data/doc/_resource_types/ec2.md

@@ -39,6 +39,22 @@ describe ec2('my-ec2') do
 end
 ```
 
+### have_event
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_event('system-reboot') }
+end
+```
+
+### have_events
+
+```ruby
+describe ec2('my-ec2') do
+  it { should_not have_events }
+end
+```
+
 ### have_security_group
 
 ```ruby

data/doc/resource_types.md

@@ -270,6 +270,24 @@ end
 ```
 
 
+### have_event
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_event('system-reboot') }
+end
+```
+
+
+### have_events
+
+```ruby
+describe ec2('my-ec2') do
+  it { should_not have_events }
+end
+```
+
+
 ### have_security_group
 
 ```ruby

data/lib/awspec/command/generate.rb

@@ -4,6 +4,8 @@ require 'awspec/setup'
 module Awspec
   class Generate < Thor
     class_option :profile
+    class_option :region
+    class_option :secrets_path, default: 'secrets.yml'
 
     types = %w(
       vpc ec2 rds security_group elb network_acl route_table subnet nat_gateway
@@ -12,20 +14,20 @@ module Awspec
     types.each do |type|
       desc type + ' [vpc_id]', "Generate #{type} spec from VPC ID (or VPC \"Name\" tag)"
       define_method type do |_vpc_id|
-        Awsecrets.load(profile: options[:profile])
+        Awsecrets.load(profile: options[:profile], region: options[:region], secrets_path: options[:secrets_path])
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_vpc_id(_vpc_id)"
       end
     end
 
     desc 'route53_hosted_zone [example.com.]', 'Generate route53_hosted_zone spec from Domain name'
     def route53_hosted_zone(hosted_zone)
-      Awsecrets.load(profile: options[:profile])
+      Awsecrets.load(profile: options[:profile], region: options[:region], secrets_path: options[:secrets_path])
       puts Awspec::Generator::Spec::Route53HostedZone.new.generate_by_domain_name(hosted_zone)
     end
 
     desc 's3_bucket [backet_name]', 'Generate s3_bucket spec from S3 bucket name. if NO args, Generate all.'
     def s3_bucket(bucket_name = nil)
-      Awsecrets.load(profile: options[:profile])
+      Awsecrets.load(profile: options[:profile], region: options[:region], secrets_path: options[:secrets_path])
       if bucket_name
         puts Awspec::Generator::Spec::S3Bucket.new.generate(bucket_name)
       else
@@ -44,7 +46,7 @@ module Awspec
         desc type, "Generate #{type} spec"
       end
       define_method type do
-        Awsecrets.load(profile: options[:profile])
+        Awsecrets.load(profile: options[:profile], region: options[:region], secrets_path: options[:secrets_path])
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_all"
       end
     end

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

@@ -24,6 +24,13 @@ module Awspec::Helper
                                                      })
       end
 
+      def find_ec2_status(id)
+        res = ec2_client.describe_instance_status({
+                                                    instance_ids: [id]
+                                                  })
+        res.instance_statuses.first if res.instance_statuses.count == 1
+      end
+
       # find_internet_gateway find_vpn_gateway find_customer_gateway
       gateway_types = %w(internet vpn customer)
       gateway_types.each do |type|

data/lib/awspec/stub/ec2.rb

@@ -46,6 +46,29 @@ Aws.config[:ec2] = {
         value: true
       }
     },
+    describe_instance_status: {
+      instance_statuses: [
+        {
+          instance_id: 'i-ec12345a',
+          availability_zone: 'ap-northeast-1c',
+          events: [
+            {
+              code: 'system-reboot',
+              description: 'scheduled reboot'
+            }
+          ],
+          instance_state: {
+            name: 'running'
+          },
+          system_status: {
+            status: 'ok'
+          },
+          instance_status: {
+            status: 'ok'
+          }
+        }
+      ]
+    },
     describe_vpcs: {
       vpcs: [
         {

data/lib/awspec/type/ec2.rb

@@ -60,5 +60,17 @@ module Awspec::Type
         attachment.instance_id == @id
       end
     end
+
+    def has_event?(event_code)
+      status = find_ec2_status(@id)
+      ret = status.events.find do |event|
+        event.code == event_code
+      end
+    end
+
+    def has_events?
+      status = find_ec2_status(@id)
+      status.events.count > 0
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.34.0'
+  VERSION = '0.35.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec