awskeyring 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e245afbb0324eea304fcc2c010617ebc3b78c53f
-  data.tar.gz: 7be3de5bff9b16373021863d33a5aaa677046f60
+  metadata.gz: 1643974c4cbfea33a3a2388ee0a26ca035561b69
+  data.tar.gz: f2c4c855e383f24bbeac967b19b6c47880638ab1
 SHA512:
-  metadata.gz: 04610b85c96d2da14c5d7874790fd9b33425aea0c0d1e1b087c8e17534daa2c6238bb1dee84830890f4b13256d55dd0c37521f33c90bd97f171d50c5fd488fc8
-  data.tar.gz: fde8d5db0fc622b19423a171e3027c222ee9f54e5263533248eaaf10e27c05ab613404cf07656c58ec427069f8e660114fc1614ee0a252f435827b426ba486a2
+  metadata.gz: 9bc85b2fae258fdc80f0b5466caf8bfff34fcaa9d6b8440744812177feb0c35381b84be69bb53f38019518168b937eadcc53a3197c12e42cbdbd2972ee3a8751
+  data.tar.gz: 96c1704c005c2c304c76cb8613b6a0982e6a508482b22e792149abcd8780c8d76ff01a49581ccc0a70b8e251103e39729161d7a9319cfb8a805f98d2b86b3888

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v0.1.1](https://github.com/vibrato/awskeyring/tree/v0.1.1) (2018-03-26)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.1.0...v0.1.1)
+
+**Merged pull requests:**
+
+- More coverage with tests. [\#15](https://github.com/vibrato/awskeyring/pull/15) ([tristanmorgan](https://github.com/tristanmorgan))
+- Validate MFA code and tweak Autocomplete [\#14](https://github.com/vibrato/awskeyring/pull/14) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.1.0](https://github.com/vibrato/awskeyring/tree/v0.1.0) (2018-03-14)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.0.6...v0.1.0)
 

data/README.md

@@ -5,6 +5,7 @@
 * [![license MIT](http://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 * [![All Downloads](http://ruby-gem-downloads-badge.herokuapp.com/awskeyring?type=total)](https://rubygems.org/gems/awskeyring)
 * [![Version Downloads](http://ruby-gem-downloads-badge.herokuapp.com/awskeyring?label=downloads-current-version)](https://rubygems.org/gems/awskeyring)
+* [![Documentation](http://img.shields.io/badge/yard-docs-brightgreen.svg)](http://www.rubydoc.info/gems/awskeyring)
 
 Awskeyring is a small tool to manage AWS account keys in the macOS Keychain.
 
@@ -12,7 +13,8 @@ Awskeyring is a small tool to manage AWS account keys in the macOS Keychain.
 
 The motivation of this application is to provide a local secure store of AWS
 credentials using specifically in the macOS Keychain, to have them easily accessed
-from the Terminal, and to provide useful functions like assuming roles.
+from the Terminal, and to provide useful functions like assuming roles and opening
+the AWS Console from the cli.
 For Enterprise environments there are better suited tools to use
 like [HashiCorp Vault](https://vaultproject.io/).
 

data/Rakefile

@@ -15,16 +15,18 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Check filemode bits'
 task :filemode do
-  files = Dir.glob('**/*')
+  files = `git ls-files -z`.split("\x0")
   failure = false
   files.each do |file|
     mode = File.stat(file).mode
+    print '.'
     if (mode & 0x7) != (mode >> 3 & 0x7)
       puts file
       failure = true
     end
   end
   abort 'Error: Incorrect file mode found' if failure
+  print "\n"
 end
 
 task default: %i[filemode rubocop spec]

data/lib/awskeyring.rb

@@ -47,23 +47,23 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
 
     keychain = Keychain.open(prefs['awskeyring'])
     if keychain && keychain.lock_interval > 300
-      warn 'It is STRONGLY reccomended to set your keychain to lock in 5 minutes or less.'
+      warn 'It is STRONGLY recommended to set your keychain to lock in 5 minutes or less.'
     end
     keychain
   end
 
   # Return a list of all acount items
   private_class_method def self.list_items
-    items = all_items.all.sort do |a, b|
-      a.attributes[:label] <=> b.attributes[:label]
+    items = all_items.all.sort do |elem_a, elem_b|
+      elem_a.attributes[:label] <=> elem_b.attributes[:label]
     end
     items.select { |elem| elem.attributes[:label].start_with?(ACCOUNT_PREFIX) }
   end
 
   # Return a list of all role items
   private_class_method def self.list_roles
-    items = all_items.all.sort do |a, b|
-      a.attributes[:label] <=> b.attributes[:label]
+    items = all_items.all.sort do |elem_a, elem_b|
+      elem_a.attributes[:label] <=> elem_b.attributes[:label]
     end
     items.select { |elem| elem.attributes[:label].start_with?(ROLE_PREFIX) }
   end

data/lib/awskeyring/awsapi.rb

@@ -48,8 +48,8 @@ module Awskeyring
               token_code: params[:code]
             )
           end
-      rescue Aws::STS::Errors::AccessDenied => e
-        puts e.to_s
+      rescue Aws::STS::Errors::AccessDenied => err
+        puts err.to_s
         exit 1
       end
 
@@ -153,13 +153,13 @@ module Awskeyring
       retries ||= 1
       begin
         yield block
-      rescue Aws::IAM::Errors::InvalidClientTokenId => e
+      rescue Aws::IAM::Errors::InvalidClientTokenId => err
         if retries < 4
           sleep 2**retries
           retries += 1
           retry
         end
-        warn e.message
+        warn err.message
         exit 1
       end
     end

data/lib/awskeyring/validate.rb

@@ -50,5 +50,13 @@ module Awskeyring
       raise 'Invalid Role ARN' unless role_arn =~ %r(\Aarn:aws:iam::[0-9]{12}:role\/\S*\z)
       role_arn
     end
+
+    # Validate an MFA CODE
+    #
+    # @param [String] mfa_code The mfa code
+    def self.mfa_code(mfa_code)
+      raise 'Invalid MFA CODE' unless mfa_code =~ /\A\d{6}\z/
+      mfa_code
+    end
   end
 end

data/lib/awskeyring/version.rb

@@ -1,4 +1,4 @@
 module Awskeyring
   # The Gems version number
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/awskeyring_command.rb

@@ -10,11 +10,13 @@ require 'awskeyring/version'
 class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   map %w[--version -v] => :__version
   map ['init'] => :initialise
+  map ['con'] => :console
   map ['ls'] => :list
   map ['lsr'] => :list_role
   map ['rm'] => :remove
   map ['rmr'] => :remove_role
   map ['rmt'] => :remove_token
+  map ['rot'] => :rotate
 
   desc '--version, -v', 'Prints the version'
   # print the version number
@@ -189,7 +191,17 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: account, message: 'account name', validator: Awskeyring::Validate.method(:account_name)
     )
     role ||= options[:role]
+    if role
+      role = ask_check(
+        existing: role, message: 'role name', validator: Awskeyring::Validate.method(:role_name)
+      )
+    end
     code ||= options[:code]
+    if code
+      code = ask_check(
+        existing: code, message: 'current mfa code', validator: Awskeyring::Validate.method(:mfa_code)
+      )
+    end
     duration = options[:duration]
     duration ||= (60 * 60 * 1).to_s if role
     duration ||= (60 * 60 * 12).to_s if code
@@ -258,11 +270,15 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       warn "enable autocomplete with 'complete -C /path-to-command/#{exec_name} #{exec_name}'"
       exit 1
     end
-    comp_len = comp_line.split.length
-    comp_len += 1 if curr == ''
+    comp_len = comp_line.split.index(prev)
+
+    case prev
+    when 'help'
+      comp_len = 0
+    when 'remove-role', '-r', 'rmr'
+      comp_len = 2
+    end
 
-    comp_len = 2 if prev == 'help'
-    comp_len = 4 if prev == 'remove-role'
     print_auto_resp(curr, comp_len)
   end
 
@@ -270,11 +286,11 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   def print_auto_resp(curr, len)
     case len
-    when 2
+    when 0
       puts list_commands.select { |elem| elem.start_with?(curr) }.join("\n")
-    when 3
+    when 1
       puts Awskeyring.list_account_names.select { |elem| elem.start_with?(curr) }.join("\n")
-    when 4
+    when 2
       puts Awskeyring.list_role_names.select { |elem| elem.start_with?(curr) }.join("\n")
     else
       exit 1
@@ -315,6 +331,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       value = validator.call(value) unless value.empty? && optional
     rescue RuntimeError => e
       warn e.message
+      existing = nil
       retry unless (retries -= 1).zero?
       exit 1
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam