awspec 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e682344fa05836f1d42f59d65a6a132ddf6a6f8
-  data.tar.gz: 7086aee13f6c51947d163389e0be7947dc1bb9cd
+  metadata.gz: 88afd19a09bdcdf08ab582088100317268ae0862
+  data.tar.gz: 725e4006d459deed7e815b1b5cdbf3537c631ec7
 SHA512:
-  metadata.gz: 7824001fe5bad247e42685b3d2dc8ebbd528cf7f16137363e3556b8496e3c3615208779fb0d2fbf68e5eba34f029c95d50a067c4794a4d2daaf561f9254192d9
-  data.tar.gz: 3d732503a6c12d92ba29c03d59e0a474cdcce104f6476e37ac0f99a8aa7e7dd184f1809caf1bbfd4611bc30359e5effdccd21eddad9056519bc50439787a2277
+  metadata.gz: 877f327dd10941729185d7f936d5e0196baa02367a70e4d510d7c6dc835d6b2da0f24225b14fd7103867d3013864c7870dfa7dd2862a208f1748359602fd24a4
+  data.tar.gz: 9b4487deaee273642d839cb76a7938327cb9386c6fb204fe296ab90cec1cb44a130c4862c3345d984479efe0e494264b0fa1e808fcf60173caa22f16a3212f9c

data/README.md

@@ -68,7 +68,7 @@ end
 
     $ bundle exec rake spec
 
-### Advanced Usage: Spec generate command
+### Advanced Tips: Spec generate command
 
 Generate spec from AWS resources already exists.
 
@@ -76,6 +76,16 @@ Generate spec from AWS resources already exists.
 $ awspec generate ec2 vpc-ab123cde >> spec/ec2_spec.rb
 ```
 
+### Advanced Tips: Use Shared credentials (~/.aws/config ~/.aws/credentials)
+
+```sh
+$ awspec generate ec2 vpc-ab123cde --profile mycreds
+```
+
+```sh
+$ export AWS_PROFILE=mycreds; bundle exec rake spec
+```
+
 ## Support AWS Resources
 
 - [x] EC2 (`ec2`)

data/awspec.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rspec', '~> 3.0'
   spec.add_runtime_dependency 'rspec-its'
   spec.add_runtime_dependency 'aws-sdk', '~> 2.1.20'
+  spec.add_runtime_dependency 'aws_config'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
   spec.add_development_dependency 'bundler', '~> 1.9'

data/lib/awspec/command/generate.rb

@@ -1,8 +1,11 @@
 require 'thor'
 require 'awspec/setup'
+require 'awspec/helper/credentials_loader'
 
 module Awspec
   class Generate < Thor
+    class_option :profile
+
     types = %w(
       vpc ec2 rds security_group elb
     )
@@ -10,7 +13,7 @@ module Awspec
     types.each do |type|
       desc type + ' [vpc_id]', "Generate #{type} spec from VPC ID (or VPC \"Name\" tag)"
       define_method type do |*args|
-        load_secrets
+        Awspec::Helper::CredentialsLoader.load(options[:profile])
         vpc_id = args.first
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_vpc_id(vpc_id)"
       end
@@ -22,7 +25,7 @@ module Awspec
 
     desc 'route53_hosted_zone [example.com.]', 'Generate route53_hosted_zone spec from Domain name'
     def route53_hosted_zone(hosted_zone)
-      load_secrets
+      Awspec::Helper::CredentialsLoader.load(options[:profile])
       puts Awspec::Generator::Spec::Route53HostedZone.new.generate_by_domain_name(hosted_zone)
     end
 
@@ -37,22 +40,9 @@ module Awspec
         desc type, "Generate #{type} spec"
       end
       define_method type do
-        load_secrets
+        Awspec::Helper::CredentialsLoader.load(options[:profile])
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_all"
       end
     end
-
-    no_commands do
-      def load_secrets
-        creds = YAML.load_file('spec/secrets.yml') if File.exist?('spec/secrets.yml')
-        creds = YAML.load_file('secrets.yml') if File.exist?('secrets.yml')
-        Aws.config.update({
-                            region: creds['region'],
-                            credentials: Aws::Credentials.new(
-                              creds['aws_access_key_id'],
-                              creds['aws_secret_access_key'])
-                          }) if creds
-      end
-    end
   end
 end

data/lib/awspec/helper.rb

@@ -1,5 +1,6 @@
 require 'awspec/helper/type'
 require 'awspec/helper/finder'
+require 'awspec/helper/credentials_loader'
 extend Awspec::Helper::Type
 class RSpec::Core::ExampleGroup
   extend Awspec::Helper::Type

data/lib/awspec/helper/credentials_loader.rb

@@ -0,0 +1,27 @@
+require 'aws-sdk'
+require 'aws_config'
+
+module Awspec::Helper
+  module CredentialsLoader
+    def self.load(profile = nil)
+      profile = ENV['AWS_PROFILE'] if profile.nil? && ENV.key?('AWS_PROFILE')
+      if profile
+        # SharedCredentials
+        aws_config = AWSConfig.profiles[profile]
+        aws_config = AWSConfig.profiles['default'] unless aws_config
+        Aws.config[:region] = aws_config.config_hash[:region] if aws_config
+        Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: profile)
+      else
+        # secrets.yml
+        creds = YAML.load_file('spec/secrets.yml') if File.exist?('spec/secrets.yml')
+        creds = YAML.load_file('secrets.yml') if File.exist?('secrets.yml')
+        Aws.config.update({
+                            region: creds['region'],
+                            credentials: Aws::Credentials.new(
+                              creds['aws_access_key_id'],
+                              creds['aws_secret_access_key'])
+                          }) if creds
+      end
+    end
+  end
+end

data/lib/awspec/setup.rb

@@ -13,15 +13,7 @@ module Awspec
     def self.generate_spec_helper
       content = <<-'EOF'
 require 'awspec'
-if File.exist?('spec/secrets.yml')
-  creds = YAML.load_file('spec/secrets.yml')
-  Aws.config.update({
-                      region: creds['region'],
-                      credentials: Aws::Credentials.new(
-                        creds['aws_access_key_id'],
-                        creds['aws_secret_access_key'])
-                    })
-end
+Awspec::Helper::CredentialsLoader.load
 EOF
       dir = 'spec'
       if File.exist? dir

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.18.2'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.20
+- !ruby/object:Gem::Dependency
+  name: aws_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,7 @@ files:
 - lib/awspec/generator/spec/vpc.rb
 - lib/awspec/generator/template.rb
 - lib/awspec/helper.rb
+- lib/awspec/helper/credentials_loader.rb
 - lib/awspec/helper/finder.rb
 - lib/awspec/helper/finder/auto_scaling.rb
 - lib/awspec/helper/finder/cloudwatch.rb