aws-keychain-util 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be488246906252df30fbbe24765a7d774f5fb21e
+  data.tar.gz: d5c43506532ff50a3ad86e258d07ab9b90e00c9f
+SHA512:
+  metadata.gz: 0078ffd3bc56738efa38ca033699932b2cd50c068813399441bccdde99a281e097f9d36aea6a8743f6a6255c7a25104181fe96c5d472c3297b96e7cc77badd0b
+  data.tar.gz: 4e0cf6c640e681f9eba0f17415d7ef056fa42808962aa05f25530168409480ea4482d5f42c6cbb71a568336d531c2452f7dbbc2a14ca27119b2d409470430f3e

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.9'
+  gem.version       = '0.0.10'
   gem.authors       = ["Zach Wily"]
   gem.email         = ["zach@zwily.com"]
   gem.description   = %q{Helps manage a keychain of AWS credentials on OS X.}
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('ruby-keychain')
   gem.add_dependency('highline')
-  gem.add_dependency('aws-sdk')
+  gem.add_dependency('aws-sdk-v1')
 end

data/bin/aws-creds

@@ -9,7 +9,7 @@ require 'highline'
 require 'keychain'
 require 'json'
 require 'aws-keychain-util'
-require 'aws'
+require 'aws-sdk-v1'
 
 def ask(question)
   HighLine.new.ask(question)
@@ -83,12 +83,15 @@ when 'init'
   name = ask("Name for AWS keychain (default: 'aws'): ")
   name = "aws" if name == ""
 
+  shell_arguments = ask("Shell arguments (default: '--login'): ")
+  shell_arguments = "--login" if shell_arguments == ""
+
   puts "The OS will now ask you for a password to protect your keychain. Choose wisely."
   keychain = Keychain.create(name)
   keychain.lock_interval = 300
   keychain.lock_on_sleep = true
 
-  $prefs = { 'aws_keychain_name' => name }
+  $prefs = { 'aws_keychain_name' => name, 'shell_arguments' => shell_arguments }
   File.new(AwsKeychainUtil::PREFS_FILE, "w").write JSON.dump($prefs)
 
   puts "Your AWS keychain has been created and configured to auto-lock after"
@@ -185,7 +188,9 @@ when 'shell'
     exit 1
   end
 
+  prefs = AwsKeychainUtil.prefs
   item, token = get_item_from_args_for_command('shell')
+
   aws_env = {}
   aws_env['AWS_ACCESS_KEY_ID'] = aws_env['AWS_ACCESS_KEY'] = item.attributes[:account]
   aws_env['AWS_SECRET_ACCESS_KEY'] = aws_env['AWS_SECRET_KEY'] = item.password
@@ -194,9 +199,16 @@ when 'shell'
     aws_env['AWS_SECURITY_TOKEN'] = token.password
   end
 
-  aws_env['RPROMPT'] = "(aws #{item.attributes[:label]})" # zsh only
-
-  exec(aws_env, ENV['SHELL'])
+  if ARGV.empty?
+    aws_env['RPROMPT'] = "(aws #{item.attributes[:label]})" # zsh only
+    if prefs['shell_arguments']
+      exec(aws_env, ENV['SHELL'], prefs['shell_arguments'])
+    else
+      exec(aws_env)
+    end
+  else
+    exec(aws_env, *ARGV)
+  end
 
 else
   puts "Usage: #{$0} <command> <arguments>"

data/lib/aws-keychain-util.rb

@@ -3,11 +3,15 @@ module AwsKeychainUtil
 
   def self.load_keychain
     keychain = if File.exist? PREFS_FILE
-      prefs = JSON.parse(File.read(PREFS_FILE))
+      prefs = self.prefs
       Keychain.open(prefs['aws_keychain_name'])
     else
       Keychain.default
     end
     keychain
   end
+
+  def self.prefs
+    JSON.parse(File.read(PREFS_FILE))
+  end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: aws-keychain-util
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Zach Wily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-keychain
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Helps manage a keychain of AWS credentials on OS X.
@@ -67,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,27 +71,26 @@ files:
 - lib/aws-keychain-util/credential_provider.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Helps manage a keychain of AWS credentials on OS X.
 test_files: []
 has_rdoc: