awskeyring 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b18067d6aad4daed7c723e3b67cdd3983d66ae67
-  data.tar.gz: 4975855826aadafe2631abcd7fa98658f15b0e18
+  metadata.gz: 2cc56e9c03339dd2516abf62a94d07dcccef3b50
+  data.tar.gz: d568b27b9b8648cfc5e72bc2aa033397d21163f3
 SHA512:
-  metadata.gz: c50766e6d2fe027102d49c8cf71b1974806f2a248e28083927f0fd4a709179a33649d1432fd14f96c18d2df9c4c05b3188e114fc6feaa34b85d32ca6bc3d8a57
-  data.tar.gz: 650c4c01e6202148a7ab063cc017739596bda2bffa9bc0b605a383d7fa211159abef6c61101d464d64d9878ea0abc69f24f59937af04bee8d7b438d23bfc1b06
+  metadata.gz: c153176f3d556eecd47ecd3dc7d1b825a187913e82a41f17e1fc514d9dc3ea49bf80d7f1cb624d6737c10199c1e7b4c1521eb809699be5ef30dba0ee0b318633
+  data.tar.gz: c6ec6d01d3ecaaf7c9bb3a22dc0ec361485f5fe1f864174cd43420923fd0ebf6a80cfb26592f970e771612ef84943e10b7c98af9a9a9810afa5b5b60e046006f

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
-## [v0.5.1](https://github.com/vibrato/awskeyring/tree/v0.5.1) (2018-09-13)
+## [v0.5.2](https://github.com/vibrato/awskeyring/tree/v0.5.2) (2018-09-18)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.5.1...v0.5.2)
+
+**Implemented enhancements:**
+
+- More robust autocomplete. [\#30](https://github.com/vibrato/awskeyring/pull/30) ([tristanmorgan](https://github.com/tristanmorgan))
+
+## [v0.5.1](https://github.com/vibrato/awskeyring/tree/v0.5.1) (2018-09-12)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.5.0...v0.5.1)
 
 **Implemented enhancements:**

data/lib/awskeyring/version.rb

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

data/lib/awskeyring_command.rb

@@ -13,7 +13,6 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   I18n.backend.load_translations
 
   map %w[--version -v] => :__version
-  map %w[--help -h] => :help
   map ['init'] => :initialise
   map ['con'] => :console
   map ['ls'] => :list
@@ -22,6 +21,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   map ['rmr'] => :remove_role
   map ['rmt'] => :remove_token
   map ['rot'] => :rotate
+  map ['tok'] => :token
   map ['up'] => :update
 
   desc '--version, -v', I18n.t('__version.desc')
@@ -357,11 +357,21 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   private
 
+  def age_check_and_get(account:, no_token:)
+    cred = Awskeyring.get_valid_creds(account: account, no_token: no_token)
+
+    maxage = Awskeyring.prefs[:keyage] || Awskeyring::DEFAULT_KEY_AGE
+    age = (Time.new - cred[:updated]).div Awskeyring::Awsapi::ONE_DAY
+    warn I18n.t('message.age_check', account: account, age: age) unless age < maxage
+
+    cred
+  end
+
   def comp_type(comp_line:, curr:, prev:)
     comp_len = comp_line.split.index(prev)
-    sub_cmd = comp_line.split[1] if comp_len > 0
+    sub_cmd = sub_command(comp_line.split)
 
-    comp_len = 3 if curr.start_with?('-') && !sub_cmd.nil?
+    comp_len = 3 if curr.start_with?('-')
 
     case prev
     when 'help'
@@ -373,14 +383,14 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     [curr, comp_len, sub_cmd]
   end
 
-  def age_check_and_get(account:, no_token:)
-    cred = Awskeyring.get_valid_creds(account: account, no_token: no_token)
+  def sub_command(comp_lines)
+    return nil if comp_lines.nil? || comp_lines.length < 2
 
-    maxage = Awskeyring.prefs[:keyage] || Awskeyring::DEFAULT_KEY_AGE
-    age = (Time.new - cred[:updated]).div Awskeyring::Awsapi::ONE_DAY
-    warn I18n.t('message.age_check', account: account, age: age) unless age < maxage
+    sub_cmd = comp_lines[1]
 
-    cred
+    return sub_cmd if self.class.all_commands.keys.index(sub_cmd)
+
+    self.class.map[sub_cmd].to_s
   end
 
   def print_auto_resp(curr, len, sub_cmd)
@@ -405,7 +415,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   end
 
   def list_arguments(command:)
-    command = list_commands.find { |elem| elem.start_with?(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)
   end

metadata

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