kumogata 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f66a07b454ab92e7351753a201b112702efcc7
-  data.tar.gz: 189130373b0ba7b733acf56ddb4cafc296ccd907
+  metadata.gz: 737dc652de39e3d5aeeddda9e7c173aab549a4a7
+  data.tar.gz: 39afb226eeabe86714367d84eb14dc7316acd8e5
 SHA512:
-  metadata.gz: 66df3ba400dcbb14e5888e3dd125406c594e514633cb6fb3329d02bd85c08c4aa4c5dcfe659392a6b3753a261326272e227a3a241beba68a6df12d6b8a5f2946
-  data.tar.gz: 1aa6c374292cf938e5cd2e7d29044dcdc34c0fe444c9ce3a70df1044680a902cd3c1738602eacd43b0f9794cfb6614a2b2ea4987557aa4ac699be94c3e5188e2
+  metadata.gz: 03e90e8b9266662df9bcb11158c2a60950fe0c1e3f81046bdbb30ae4c5d322e57d7fe1748bee8d4f90bd8b00134b9eb79692a42ec7489d20f61a8a9d98e7134b
+  data.tar.gz: d128303f7165458dd6a149551d0226abc0c29929ea894ad30e637eb1d654e5c23a3f22366a0f9a999759f04740e5521f8d208103a2c32122761f5bd668c27eac

data/README.md

@@ -91,8 +91,8 @@ Options:
     -k, --access-key ACCESS_KEY
     -s, --secret-key SECRET_KEY
     -r, --region REGION
-        --config PATH
         --profile CONFIG_PROFILE
+        --credentials-path PATH
         --format TMPLATE_FORMAT
         --output-format FORMAT
         --skip-replace-underscore

data/bin/kumogata

@@ -22,12 +22,16 @@ begin
 
   aws_opts = {}
 
-  if options.config_profile
-    provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(
-      :profile_name => options.config_profile
-    )
+  if options.config_profile or options.credentials_path
+    credentials_opts = {}
+    credentials_opts[:profile_name] = options.config_profile if options.config_profile
+    credentials_opts[:path] = options.credentials_path if options.credentials_path
 
+    provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(credentials_opts)
     aws_opts[:credential_provider] = provider
+
+    region = provider.send(:load_profile)['region']
+    aws_opts[:region] = region if region
   end
 
   [:access_key_id, :secret_access_key, :region].each do |key|

data/lib/kumogata/argument_parser.rb

@@ -84,8 +84,8 @@ class Kumogata::ArgumentParser
         opt.on('-k', '--access-key ACCESS_KEY')                    {|v| options[:access_key_id]           = v     }
         opt.on('-s', '--secret-key SECRET_KEY')                    {|v| options[:secret_access_key]       = v     }
         opt.on('-r', '--region REGION')                            {|v| options[:region]                  = v     }
-        opt.on(''  , '--config PATH')                              {|v| options[:config_path]             = v     }
         opt.on(''  , '--profile CONFIG_PROFILE')                   {|v| options[:config_profile]          = v     }
+        opt.on(''  , '--credentials-path PATH')                    {|v| options[:credentials_path]        = v     }
         opt.on(''  , '--format TMPLATE_FORMAT', supported_formats) {|v| options[:format]                  = v     }
         opt.on(''  , '--output-format FORMAT', supported_formats)  {|v| options[:output_format]           = v     }
         opt.on(''  , '--skip-replace-underscore')                  {    options[:skip_replace_underscore] = false }

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk