aws-keychain-util 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c1cdb1ab0fb62ba46499a92cde5dfd68ec9d86
-  data.tar.gz: 0a42483da6bbdc164552970bfa560b8f805d34a2
+  metadata.gz: 27605c262ccf5d07a36f56918a04d4b9c3f012ad
+  data.tar.gz: 8790d93d8bc976e41cf132fb9724f88a38917181
 SHA512:
-  metadata.gz: eccf9ed4c2453e986d6d2af4bfcedfa27d47c158ac34a75c5451b83543240e6994f32621ec3b60ff338188e321a312e3317e6c1468ae18fecbf8dc06e4cab3b1
-  data.tar.gz: 48e1d5492237026d9ddb3c5554519376cbcfb1128d06e3d90aca5af3b3a5cc86dd4612e071d28ccc7ba20910238a970d4479a84850662473f81fdc6ea0086110
+  metadata.gz: 40cbeceef571c407749c645ee1fb72b748dddee8564a13c58406282da439dd6dbbcf6e5721ab705945ada9b0b59d9f2d5c1380fee7895955fb4b3a5db661cb51
+  data.tar.gz: 523a878f9f686ce5ef81e409957cfc778a40813584d0340f0ecfc12af07c26c20d540b0d0d5817b2e94ba813ffd09f51192a747da7a0413c7084044426a59d02

data/aws-keychain-util.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "aws-keychain-util"
-  gem.version       = '0.0.11'
+  gem.version       = '0.0.12'
   gem.authors       = ["Zach Wily"]
   gem.email         = ["zach@zwily.com"]
   gem.description   = %q{Helps manage a keychain of AWS credentials on OS X.}
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('ruby-keychain')
+  gem.add_dependency('ruby-keychain', '~> 0.2.0')
   gem.add_dependency('highline')
   gem.add_dependency('aws-sdk-v1')
 end

data/bin/aws-creds

@@ -151,18 +151,18 @@ when 'mfa'
     sts_item.delete
     sts_token.delete if sts_token
   end
-  
+
   item, token = get_item(item_name)
   sts = AWS::STS.new(:access_key_id => item.attributes[:account], :secret_access_key => item.password)
   begin
     response = sts.new_session(:duration => (60 * 60 * 12), :serial_number => item.attributes[:comment], :token_code => code)
     temp_item = keychain.generic_passwords.create(:label => "#{item_name} mfa",
-                                                  :account => response.credentials[:access_key_id], 
-                                                  :password=> response.credentials[:secret_access_key], 
+                                                  :account => response.credentials[:access_key_id],
+                                                  :password=> response.credentials[:secret_access_key],
                                                   :comment => response.expires_at.to_i.to_s)
     temp_token = keychain.generic_passwords.create(:label => "#{item_name} token",
-                                                  :account => "#{response.credentials[:access_key_id]}_token", 
-                                                  :password=> response.credentials[:session_token], 
+                                                  :account => "#{response.credentials[:access_key_id]}_token",
+                                                  :password=> response.credentials[:session_token],
                                                   :comment => response.expires_at.to_i.to_s)
 
     puts "MultiFactorAuthentication succeeded, expiration is #{response.expires_at}"
@@ -181,6 +181,7 @@ when 'env'
   puts "export AWS_CREDS_NAME=\"#{item.attributes[:label]}\""
   if token
     puts "export AWS_SECURITY_TOKEN=\"#{token.password}\""
+    puts "export AWS_SESSION_TOKEN=\"#{token.password}\""
   end
 
 when 'shell'
@@ -197,7 +198,7 @@ when 'shell'
   aws_env['AWS_SECRET_ACCESS_KEY'] = aws_env['AWS_SECRET_KEY'] = item.password
   aws_env['AWS_CREDS_NAME'] = item.attributes[:label]
   if token
-    aws_env['AWS_SECURITY_TOKEN'] = token.password
+    aws_env['AWS_SECURITY_TOKEN'] = aws_env['AWS_SESSION_TOKEN'] = token.password
   end
 
   if ARGV.empty?
@@ -215,4 +216,3 @@ else
   puts "Usage: #{$0} <command> <arguments>"
   puts "  Commands: init, ls, add, cat, env, mfa, rm, shell"
 end
-

data/lib/aws-keychain-util.rb

@@ -2,16 +2,15 @@ module AwsKeychainUtil
   PREFS_FILE = File.expand_path "~/.aws-keychain-util"
 
   def self.load_keychain
-    keychain = if File.exist? PREFS_FILE
-      prefs = self.prefs
-      Keychain.open(prefs['aws_keychain_name'])
-    else
-      Keychain.default
-    end
-    keychain
+    name = prefs['aws_keychain_name']
+    name ? Keychain.open(name) : Keychain.default
   end
 
   def self.prefs
-    JSON.parse(File.read(PREFS_FILE))
+    if File.exist? PREFS_FILE
+      JSON.parse(File.read(PREFS_FILE))
+    else
+      {}
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aws-keychain-util
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Zach Wily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-keychain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement