oneaws 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5cdbbf6859ec90de78c5452beeb47d7b7f55bbaaabfdedcd17db81e2c9f47b
-  data.tar.gz: a05a3d7470c4fe913c52568a820f0acffa551609c77f336d0194c7e2e788e325
+  metadata.gz: 206db80babfc5a4ec457c5f4f6a3a5d39c27d80651174f23a527b93601c16f39
+  data.tar.gz: 0daa2f9d03f81cd2a43b0e5474b2987346b2fbf21b6824b8a7f7dc7c7642b096
 SHA512:
-  metadata.gz: 854fad5d4bd924fb013aace3d1ed0efeac8a225cde6210851f0abebee2eda0dfb643fb6570af33c5de53a694de9f848488d838d6fe29b5c0c540516475f6551c
-  data.tar.gz: b430d35a80808e8fba8ae98e87192bc2aa170dafbe27753df4343ca9f05ee3c784053770f922e7ed9b5f26e4b9ad010dde4caa10fa7aaa5f488243d050feb6d4
+  metadata.gz: 8a43e2ccf892638a0565e1b81998c08367298f017e09bfb8c9013b8a9f71746e84607b95899fd09a96edeaec73cac4b7805a973e1119bc14a7ff3b21142fdfef
+  data.tar.gz: 8eb123cd6ad1130c70bdb8d085668a4b66f1fc4030d88861e722d1294a0f48a8d72fb51ff8029ee6150c90dc33a9067ce5fb65cec7c2b3f206374b551d5b3573

data/lib/oneaws/cli.rb

@@ -22,7 +22,7 @@ module Oneaws
       credential = client.issue_credential(params)
 
       if options["update_aws_credentials"]
-        credential_file = File.expand_path("~/.aws/credentials")
+        credential_file = File.expand_path(find_credentials)
         unless inifile = IniFile.load(credential_file)
           FileUtils.mkdir_p(File.dirname(credential_file))
           inifile = IniFile.new
@@ -51,5 +51,21 @@ module Oneaws
         EOS
       end
     end
+
+    private
+
+    # AWS の credential を以下の順番で存在チェックをする
+    # 1. ~/.aws/credentials
+    # 2. ~/.config/aws/credentials
+    # 存在しない場合は順番1つ目のものを用いる
+    def find_credentials
+      credentials = ["~/.aws/credentials", "~/.config/aws/credentials"]
+      credential = credentials.find{|c| File.exists? File.expand_path(c) }
+      if credential
+        credential
+      else
+        credentials.first
+      end
+    end
   end
 end

data/lib/oneaws/version.rb

@@ -1,3 +1,3 @@
 module Oneaws
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneaws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuki Koya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor