soror 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f072542dc9b84afd4eede7cf1158d08d4ea836
-  data.tar.gz: ce567efc8b2d9479f3faf5f47b1b2b2a27827c6f
+  metadata.gz: 4e3d60cc5af136386d68b720f81b4646daa38bcb
+  data.tar.gz: c6f95bb345ce5ed90d7374b0e22929c8209b9ee0
 SHA512:
-  metadata.gz: 70d8dd59d7afdfe35b492559d0a8cc9bf557d09db0bb2e63634532bd0d42b2270627ef12a7ae64e4facce766c3f6033855230f40eefeef8548bc34759a044232
-  data.tar.gz: 0a4686593e3f45ad15b42bf3afee001afd6d46a78047e6475a716a51626df7cdd105da51ea01dad5c68c2c8f5cf377eeb3c1cf647ba18596804b9adf33197233
+  metadata.gz: 03c0040dc4ebf8460ff34c0b1ff397bf3ccd3a52f2ceb040cd662dddbad8fa8893bb6df3aed02d8a7b79ee82023d3cb2d71ea4a7a043e1355e15223d6091513f
+  data.tar.gz: ccdb481f89052bd992d7a4786ed9a8b4d9c3a8ceebd5bf2af3224c43e4717f4a9bd0f94c86620b65c305b85ef36040cfa23e5e57bf027d2ac43f256437372b8d

data/README.md

@@ -33,15 +33,7 @@ Soror::EC2::Instance.search_by(name: 'soror') #=> [<Aws::EC2::Instance>, ...]
 Soror.config.update(access_key_id: 'xxxxx', secret_access_key: 'xxxxx', region: 'ap-northeast-1')
 ```
 
-Or put the configuration file on your home directory as:
-
-```sh
-$ cat <<EOS >$HOME/.soror
-access_key_id: 'xxxxx'
-secret_access_key: 'xxxxx'
-region: 'ap-northeast-1'
-EOS
-```
+In addition, Soror supports [a new and standardized way to manage credentials](http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs)
 
 ## CLI
 
@@ -51,9 +43,16 @@ Usage: soror [options]
     -t, --tag='KEY=VALUE'
     -a, --attributes=ATTR,ATTR,...
         --[no-]header
+        --profile-name=NAME
+        --credentials-path=PATH
         --access-key=KEY
         --secret-key=KEY
         --region=REGION
+
+$ soror --profile-name 'kirikiriyamama' --region 'ap-northeast-1' --tag 'name=soror' --attributes 'instance_id,public_ip_address'
+instance_id public_ip_address
+i-xxxxx     xxx.xxx.xxx.xxx
+i-xxxxx     xxx.xxx.xxx.xxx
 ```
 
 ## Required permissions

data/bin/soror

@@ -5,23 +5,27 @@ require 'soror'
 
 Version = Soror::VERSION
 
-options = { header: true, tag: {}, config: {} }
+options = { header: true, attributes: [], config: {}, credentials: {}, tag: {} }
 OptionParser.new do |opt|
   opt.on('-t', '--tag=\'KEY=VALUE\'', /\A[^=]+=[^=]+\z/) do |v|
     key, val = v.split('=')
     options[:tag][key] = val
   end
-  opt.on('-a', '--attributes=ATTR,ATTR,...', Array) { |v| options[:attributes] = v }
+  opt.on('-a', '--attributes=ATTR,ATTR,...', Array) { |a| options[:attributes] = a }
   opt.on('--[no-]header') { |v| options[:header] = v }
+  opt.on('--profile-name=NAME') { |v| options[:credentials][:profile_name] = v }
+  opt.on('--credentials-path=PATH') { |v| options[:credentials][:path] = v }
   opt.on('--access-key=KEY') { |v| options[:config][:access_key_id] = v }
   opt.on('--secret-key=KEY') { |v| options[:config][:secret_access_key] = v }
   opt.on('--region=REGION') { |v| options[:config][:region] = v }
   opt.parse!(ARGV)
 end
 fail OptionParser::MissingArgument, '--tag'        if options[:tag].empty?
-fail OptionParser::MissingArgument, '--attributes' if options[:attributes].nil?
 fail OptionParser::InvalidArgument, '--attributes' if options[:attributes].empty?
 
+unless options[:credentials].empty?
+  options[:config][:credentials] = Aws::SharedCredentials.new(options[:credentials])
+end
 Soror.config.update(options[:config])
 
 instances = Soror::EC2::Instance.search_by(options[:tag])

data/lib/soror/version.rb

@@ -1,3 +1,3 @@
 module Soror
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/soror.rb

@@ -28,5 +28,8 @@ module Soror
 end
 
 File.expand_path('~/.soror').tap do |path|
-  Soror.config.update(YAML.load_file(path).symbolize_keys) if File.exists?(path)
+  if File.exists?(path)
+    warn '[DEPRECATION] Support of `~/.soror` will be removed. Please use such as `~/.aws/credentials` instead.'
+    Soror.config.update(YAML.load_file(path).symbolize_keys)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soror
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kirikiriyamama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Search for EC2 instances by tags