awskeyring 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea94b3d72f37d363e05a9d5cbcb7833a4039368b4ebe8f32a0d24b29bdb0e7b
-  data.tar.gz: 358d4bab4128a8e0defa2a1736c4e05820f2ec11e58e4c0c4d29489da94d892e
+  metadata.gz: 1d6214486cc6877ca62ed23c40f01636f0f5bd726f7d7fdd9dd7f310ec87da84
+  data.tar.gz: fede3a531c42bab12951bb316e8f4c0f9c3d383f60121c4993359013422fb6b4
 SHA512:
-  metadata.gz: 402911d7d34d2f496c245dab3629ed55da0c21d4bd821829258db7221b54aac69fdaee8871984aae308cbe25576e2e6de493b362c8ef22bfc75987e8b0129ec0
-  data.tar.gz: 8dd73f4b26dfcf6173b1d8e8b3db16747110cc49a2bc120df425c789ff7025a93959becb526467393bd33eb832febb66c5fb86f00b1d61eebcd7091b126fbde0
+  metadata.gz: f23bed2643e3ab8f288ff690f20f540b8486a9aca792ff362696bf867009d36d874391f13b936cc1808a9908f1f16617d2fe81073e08c6620f0997835e653cb3
+  data.tar.gz: a9732e12755c7465545bdcd59a982f446a33e42988de10158a4db977c4d8fc5a8a391d6c55c67b835fb6af749dd3e77dfef1d335b04fa6683a6df1ce0a36d227

data/README.md

@@ -91,7 +91,7 @@ There are also short forms of most commands if you prefer:
 
 To set your environment easily the following bash function helps:
 
-    awsenv() { eval "$(awskeyring env $@)"; }
+    awsenv() { eval "$(awskeyring env ${@:-$AWS_ACCOUNT_NAME})"; }
 
 ## Development
 

data/Rakefile

@@ -55,7 +55,7 @@ task :ronn do
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.options = ['--fail-on-warning', '--no-progress']
+  t.options = ['--fail-on-warning', '--no-progress', '--files', '*.md']
   t.stats_options = ['--list-undoc']
 end
 

data/i18n/en.yml

@@ -33,7 +33,6 @@ en:
     noremote: 'Do not validate with remote api.'
     path: 'The service PATH to open.'
     browser: 'Specify an alternative browser.'
-    role: 'The ROLE to assume.'
     secret: 'AWS account secret.'
     unset: 'Unset environment variables.'
   message:

data/lib/awskeyring/version.rb

@@ -6,7 +6,7 @@ require 'json'
 # Version const and query of latest.
 module Awskeyring
   # The Gem's version number
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
   # The Gem's homepage
   HOMEPAGE = 'https://github.com/servian/awskeyring'
 

data/lib/awskeyring_command.rb

@@ -17,17 +17,13 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   map %w[--version -v] => :__version
   map %w[--help -h] => :help
-  map 'init' => :initialise
   map 'adr' => :add_role
-  map 'con' => :console
+  map 'assume-role' => :token
   map 'ls' => :list
   map 'lsr' => :list_role
   map 'rm' => :remove
   map 'rmr' => :remove_role
   map 'rmt' => :remove_token
-  map 'rot' => :rotate
-  map 'tok' => :token
-  map 'up' => :update
   default_command :default
 
   # default to returning an error on failure.
@@ -91,9 +87,8 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     puts Awskeyring.list_account_names.join("\n")
   end
 
-  map 'list-role' => :list_role
   desc 'list-role', I18n.t('list_role_desc')
-  method_option 'detail', type: :boolean, aliases: '-d', desc: I18n.t('method_option.detail'), default: false
+  method_option :detail, type: :boolean, aliases: '-d', desc: I18n.t('method_option.detail'), default: false
   # List roles
   def list_role
     if Awskeyring.list_role_names.empty?
@@ -109,7 +104,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   desc 'env ACCOUNT', I18n.t('env_desc')
   method_option 'no-token', type: :boolean, aliases: '-n', desc: I18n.t('method_option.notoken'), default: false
-  method_option 'unset', type: :boolean, aliases: '-u', desc: I18n.t('method_option.unset'), default: false
+  method_option :unset, type: :boolean, aliases: '-u', desc: I18n.t('method_option.unset'), default: false
   # Print Env vars
   def env(account = nil)
     if options[:unset]
@@ -258,7 +253,6 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     puts I18n.t('message.upaccount', account: account)
   end
 
-  map 'add-role' => :add_role
   desc 'add-role ROLE', I18n.t('add_role_desc')
   method_option :arn, type: :string, aliases: '-a', desc: I18n.t('method_option.arn')
   # Add a role
@@ -291,15 +285,14 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   desc 'remove-token ACCOUNT', I18n.t('remove_token_desc')
   # remove a session token
-  def remove_token(account = nil)
-    account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:token_exists),
+  def remove_token(token = nil)
+    token = ask_check(
+      existing: token, message: I18n.t('message.account'), validator: Awskeyring.method(:token_exists),
       limited_to: Awskeyring.list_token_names
     )
-    Awskeyring.delete_token(account: account, message: I18n.t('message.deltoken', account: account))
+    Awskeyring.delete_token(account: token, message: I18n.t('message.deltoken', account: token))
   end
 
-  map 'remove-role' => :remove_role
   desc 'remove-role ROLE', I18n.t('remove_role_desc')
   # remove a role
   def remove_role(role = nil)
@@ -343,7 +336,6 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   end
 
   desc 'token ACCOUNT [ROLE] [MFA]', I18n.t('token_desc')
-  method_option :role, type: :string, aliases: '-r', desc: I18n.t('method_option.role')
   method_option :code, type: :string, aliases: '-c', desc: I18n.t('method_option.code')
   method_option :duration, type: :string, aliases: '-d', desc: I18n.t('method_option.duration')
   # generate a sessiopn token
@@ -354,7 +346,6 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       validator: Awskeyring.method(:account_exists),
       limited_to: Awskeyring.list_account_names
     )
-    role ||= options[:role]
     if role
       role = ask_check(
         existing: role, message: I18n.t('message.role'), validator: Awskeyring.method(:role_exists),
@@ -441,14 +432,18 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # autocomplete
   def autocomplete(curr, prev)
     comp_line = ENV['COMP_LINE']
-    unless comp_line
+    comp_point_str = ENV['COMP_POINT']
+    unless comp_line && comp_point_str
       exec_name = File.basename($PROGRAM_NAME)
       warn I18n.t('message.awskeyring', path: $PROGRAM_NAME, bin: exec_name)
       exit 1
     end
 
-    curr, comp_len, sub_cmd = comp_type(comp_line: comp_line, curr: curr, prev: prev)
-    print_auto_resp(curr, comp_len, sub_cmd)
+    comp_lines = comp_line[0..(comp_point_str.to_i)].split
+
+    comp_type, sub_cmd = comp_type(comp_lines: comp_lines, prev: prev)
+    list = fetch_auto_resp(comp_type, sub_cmd)
+    puts list.select { |elem| elem.start_with?(curr) }.sort!.join("\n")
   end
 
   private
@@ -463,59 +458,63 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     cred
   end
 
-  def comp_type(comp_line:, curr:, prev:)
-    comp_len = comp_line.split.index(prev)
-    sub_cmd = sub_command(comp_line.split)
-
-    comp_len = 3 if curr.start_with?('-')
+  def comp_type(comp_lines:, prev:)
+    sub_cmd = sub_command(comp_lines)
+    comp_idx = comp_lines.rindex(prev)
 
     case prev
-    when 'help', File.basename($PROGRAM_NAME)
-      comp_len = 0
-    when 'remove-role', '-r', 'rmr'
-      comp_len = 2
     when '--path', '-p'
-      comp_len = 40
-    when 'remove-token', 'rmt'
-      comp_len = 50
+      comp_type = :path_type
     when '--browser', '-b'
-      comp_len = 60
+      comp_type = :browser_type
+    else
+      comp_type = :command
+      comp_type = param_type(comp_idx, sub_cmd) unless sub_cmd.empty?
     end
 
-    [curr, comp_len, sub_cmd]
+    [comp_type, sub_cmd]
+  end
+
+  def param_type(comp_idx, sub_cmd)
+    param_list = method(sub_cmd).parameters
+    if comp_idx.zero?
+      :command
+    elsif comp_idx > param_list.length
+      :flag
+    else
+      param_list[comp_idx - 1][1]
+    end
   end
 
   def sub_command(comp_lines)
-    return nil if comp_lines.nil? || comp_lines.length < 2
+    return '' if comp_lines.nil? || comp_lines.length < 2
+
+    sub_cmd = comp_lines[1].tr('-', '_')
 
-    sub_cmd = comp_lines[1]
+    sub_cmds = self.class.all_commands.keys.select { |elem| elem.start_with?(sub_cmd) }
 
-    return sub_cmd if self.class.all_commands.keys.index(sub_cmd)
+    return sub_cmds.first if sub_cmds.length == 1
 
     self.class.map[sub_cmd].to_s
   end
 
-  def print_auto_resp(curr, len, sub_cmd) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
-    list = []
-    case len
-    when 0
-      list = list_commands
-    when 1
-      list = Awskeyring.list_account_names
-    when 2
-      list = Awskeyring.list_role_names
-    when 3..10
-      list = list_arguments(command: sub_cmd)
-    when 40
-      list = Awskeyring.list_console_path
-    when 50
-      list = Awskeyring.list_token_names
-    when 60
-      list = Awskeyring.list_browsers
+  def fetch_auto_resp(comp_type, sub_cmd)
+    case comp_type
+    when :command
+      list_commands
+    when :account
+      Awskeyring.list_account_names
+    when :role
+      Awskeyring.list_role_names
+    when :path_type
+      Awskeyring.list_console_path
+    when :token
+      Awskeyring.list_token_names
+    when :browser_type
+      Awskeyring.list_browsers
     else
-      exit 1
+      list_arguments(command: sub_cmd)
     end
-    puts list.select { |elem| elem.start_with?(curr) }.sort!.join("\n")
   end
 
   def list_commands
@@ -524,9 +523,11 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   end
 
   def list_arguments(command:)
-    exit 1 if command.empty?
-    self.class.all_commands[command].options.values.map(&:aliases).flatten! +
-      self.class.all_commands[command].options.values.map(&:switch_name)
+    options = self.class.all_commands[command].options.values
+    exit 1 if options.empty?
+
+    options.map(&:aliases).flatten! +
+      options.map(&:switch_name)
   end
 
   def put_env_string(cred)

data/man/awskeyring.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AWSKEYRING" "5" "April 2021" "" ""
+.TH "AWSKEYRING" "5" "May 2021" "" ""
 .
 .SH "NAME"
 \fBAwskeyring\fR \- is a small tool to manage AWS account keys in the macOS Keychain
@@ -197,9 +197,6 @@ Create an STS Token from a ROLE or an MFA code
 .br
 .
 .IP
-\-r, \-\-role=ROLE: The ROLE to assume\.
-.
-.br
 \-c, \-\-code=CODE: Virtual mfa CODE\.
 .
 .br

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -93,8 +93,8 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/servian/awskeyring/issues
   changelog_uri: https://github.com/servian/awskeyring/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/awskeyring/1.8.3
-  source_code_uri: https://github.com/servian/awskeyring/tree/v1.8.3
+  documentation_uri: https://rubydoc.info/gems/awskeyring/1.8.4
+  source_code_uri: https://github.com/servian/awskeyring/tree/v1.8.4
   wiki_uri: https://github.com/servian/awskeyring/wiki
 post_install_message: 
 rdoc_options: []