aws-keychain-util 0.0.5 → 0.0.6

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.5'
+  gem.version       = '0.0.6'
   gem.authors       = ["Zach Wily"]
   gem.email         = ["zach@zwily.com"]
   gem.description   = %q{Helps manage a keychain of AWS credentials on OS X.}

data/bin/aws-creds

@@ -13,18 +13,11 @@ def ask_secure(question)
   HighLine.new.ask(question) { |q| q.echo = '*' }
 end
 
-PREFS_FILE = File.expand_path "~/.aws-keychain-util"
-
 def load_keychain
-  keychain = if File.exist? PREFS_FILE
-    prefs = JSON.parse(File.read(PREFS_FILE))
-    Keychain.open(prefs['aws_keychain_name'])
-  else
-    Keychain.default
-  end
-  if keychain.lock_interval > 300
+  keychain = AwsKeychainUtil.load_keychain
+  if keychain && keychain.lock_interval > 300
     $stderr.puts "Your keychain is *not* set to lock automatically in under five minutes. This could be dangerous."
-    if !File.exist? PREFS_FILE
+    if !File.exist? AwsKeychainUtil::PREFS_FILE
       $stderr.puts "You should probably run `#{$0} init` to create a new, secure keychain."
     end
   end
@@ -57,8 +50,8 @@ command = ARGV.shift
 
 case command
 when 'init'
-  if File.exist? PREFS_FILE
-    puts "#{PREFS_FILE} already exists. Please remove it to run init again."
+  if File.exist? AwsKeychainUtil::PREFS_FILE
+    puts "#{AwsKeychainUtil::PREFS_FILE} already exists. Please remove it to run init again."
     exit 1
   end
 
@@ -71,7 +64,7 @@ when 'init'
   keychain.lock_on_sleep = true
 
   $prefs = { 'aws_keychain_name' => name }
-  File.new(PREFS_FILE, "w").write JSON.dump($prefs)
+  File.new(AwsKeychainUtil::PREFS_FILE, "w").write JSON.dump($prefs)
 
   puts "Your AWS keychain has been created and configured to auto-lock after"
   puts "5 minutes, and when sleeping. You can change those options in"

data/lib/aws-keychain-util.rb

@@ -0,0 +1,15 @@
+require 'aws-keychain-util/credential_provider'
+
+module AwsKeychainUtil
+  PREFS_FILE = File.expand_path "~/.aws-keychain-util"
+
+  def self.load_keychain
+    keychain = if File.exist? PREFS_FILE
+      prefs = JSON.parse(File.read(PREFS_FILE))
+      Keychain.open(prefs['aws_keychain_name'])
+    else
+      Keychain.default
+    end
+    keychain
+  end
+end

data/lib/aws-keychain-util/credential_provider.rb

@@ -11,7 +11,7 @@ module AwsKeychainUtil
     end
 
     def get_credentials
-      keychain = @keychain ? Keychain.open(@keychain) : Keychain.default
+      keychain = @keychain ? Keychain.open(@keychain) : AwsKeychainUtil.load_keychain
       item = keychain.generic_passwords.where(:label => @item).first
       return {} unless item
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-keychain-util
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-keychain
@@ -58,6 +58,7 @@ files:
 - Rakefile
 - aws-keychain-util.gemspec
 - bin/aws-creds
+- lib/aws-keychain-util.rb
 - lib/aws-keychain-util/credential_provider.rb
 homepage: ''
 licenses: []