awskeyring 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d212e152f33eeef7c344651706e798f7e8d6c66d
-  data.tar.gz: e5843ba96c3ae96f82ea3dc8096b577d581d7b47
+  metadata.gz: acf4100ecde4dce232c8ab205879ba29569ca81a
+  data.tar.gz: 5ea4a9a1dc79b5aa67280a3c412caa455f044674
 SHA512:
-  metadata.gz: 3d9652bbd275b6af595b4ccea507a9c779976347acf2fb97b14c5c4131fd0c578e9e3d75ef17f1b7cb8133d58bc57beb100e9a3aaf5fee78b6768360d2d14167
-  data.tar.gz: 041af8b40538d8a3c8d6a7028fc6849c4bc2bcd81e30c8aa0d10574c44e031e122b9ffbb8847d6006874b2d15446c8465a439d821e32e5ba4319b9dca06a06f0
+  metadata.gz: 2f84e0aeb24f28dcab583cb04b26700db189484e81e898df95e6dff02c33f4ff4e70397ae485594b2a8c07c5f5a5cd32d62b051f228316b77f3398f6b1227207
+  data.tar.gz: 902baf9cf05652cb081b126589d4e1763e1e65a5868d1c86ec59e375e38f6c5c3c9fbf5b52964717b8f0f931a58e01cfda484f4e3581aad5c614ea52368c9874

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v0.7.0](https://github.com/vibrato/awskeyring/tree/v0.7.0) (2018-11-26)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.6.0...v0.7.0)
+
+**Implemented enhancements:**
+
+- Validate existing account. [\#35](https://github.com/vibrato/awskeyring/pull/35) ([tristanmorgan](https://github.com/tristanmorgan))
+- Swap Highline for Thor::LineEditor [\#34](https://github.com/vibrato/awskeyring/pull/34) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.6.0](https://github.com/vibrato/awskeyring/tree/v0.6.0) (2018-10-18)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.5.3...v0.6.0)
 

data/Gemfile

@@ -2,3 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in awskeyring.gemspec
 gemspec
+
+group :development do
+  gem 'bundler'
+  gem 'github_changelog_generator'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'yard'
+end

data/awskeyring.gemspec

@@ -13,21 +13,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/vibrato/awskeyring'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/|^\..*}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency('aws-sdk-iam')
-  spec.add_dependency('highline')
   spec.add_dependency('i18n')
   spec.add_dependency('ruby-keychain')
   spec.add_dependency('thor')
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'github_changelog_generator'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'yard'
 end

data/lib/awskeyring/version.rb

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

data/lib/awskeyring.rb

@@ -115,13 +115,12 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
   #
   # @param [String] role The role name to add
   # @param [String] arn The arn of the role
-  # @param [String] account The account associate (optional)
-  def self.add_role(role:, arn:, account:)
+  def self.add_role(role:, arn:)
     all_items.create(
       label: ROLE_PREFIX + role,
       account: arn,
       password: '',
-      comment: account
+      comment: ''
     )
   end
 
@@ -280,4 +279,13 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
     puts message if message
     role.delete
   end
+
+  # Validate account exists
+  #
+  # @param [String] account_name the associated account name.
+  def self.account_exists(account_name)
+    raise 'Account does not exist' unless list_account_names.include?(account_name)
+
+    account_name
+  end
 end

data/lib/awskeyring_command.rb

@@ -1,4 +1,3 @@
-require 'highline'
 require 'i18n'
 require 'thor'
 
@@ -68,7 +67,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Print Env vars
   def env(account = nil)
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = age_check_and_get(account: account, no_token: options['no-token'])
     put_env_string(
@@ -84,7 +83,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Print JSON for use with credential_process
   def json(account = nil)
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = age_check_and_get(account: account, no_token: options['no-token'])
     expiry = Time.at(cred[:expiry]) unless cred[:expiry].nil?
@@ -149,7 +148,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Update an Account
   def update(account = nil) # rubocop:disable Metrics/MethodLength
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     key = ask_check(
       existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring::Validate.method(:access_key)
@@ -171,7 +170,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   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
-  def add_role(role = nil) # rubocop:disable Metrics/MethodLength
+  def add_role(role = nil)
     role = ask_check(
       existing: role, message: I18n.t('message.role'),
       validator: Awskeyring::Validate.method(:role_name)
@@ -180,15 +179,10 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: options[:arn], message: I18n.t('message.arn'),
       validator: Awskeyring::Validate.method(:role_arn)
     )
-    account = ask_check(
-      existing: account, message: I18n.t('message.account'),
-      optional: true, validator: Awskeyring::Validate.method(:account_name)
-    )
 
     Awskeyring.add_role(
       role: role,
-      arn: arn,
-      account: account
+      arn: arn
     )
     puts I18n.t('message.addrole', role: role)
   end
@@ -197,7 +191,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Remove an account
   def remove(account = nil)
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     Awskeyring.delete_account(account: account, message: I18n.t('message.delaccount', account: account))
   end
@@ -206,7 +200,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # remove a session token
   def remove_token(account = nil)
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     Awskeyring.delete_token(account: account, message: I18n.t('message.deltoken', account: account))
   end
@@ -225,7 +219,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # rotate Account keys
   def rotate(account = nil) # rubocop:disable Metrics/MethodLength
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = Awskeyring.get_valid_creds(account: account, no_token: true)
 
@@ -257,7 +251,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # generate a sessiopn token
   def token(account = nil, role = nil, code = nil) # rubocop:disable all
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     role ||= options[:role]
     if role
@@ -314,7 +308,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Open the AWS Console
   def console(account = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = age_check_and_get(account: account, no_token: options['no-token'])
 
@@ -467,11 +461,11 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   def ask(message:, secure: false, optional: false)
     if secure
-      HighLine.new.ask(message.rjust(20) + ': ') { |q| q.echo = '*' }
+      Thor::LineEditor.readline(message.rjust(20) + ': ', echo: false)
     elsif optional
-      HighLine.new.ask((message + ' (optional)').rjust(20) + ': ')
+      Thor::LineEditor.readline((message + ' (optional)').rjust(20) + ': ')
     else
-      HighLine.new.ask(message.rjust(20) + ': ')
+      Thor::LineEditor.readline(message.rjust(20) + ': ')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -80,90 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Manages AWS credentials in the macOS keychain
 email:
 - tristan@vibrato.com.au
@@ -172,10 +74,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/bin/

data/.rspec

@@ -1,3 +0,0 @@
---order rand
---format documentation
---color

data/.rubocop.yml

@@ -1,22 +0,0 @@
----
-Metrics/LineLength:
-  Max: 120
-
-Metrics/MethodLength:
-  Max: 16
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-
-Metrics/AbcSize:
-  Max: 20
-
-Bundler/GemComment:
-   Enabled: false
-   Include:
-     - Gemfile
-
-AllCops:
-  Exclude:
-    - bin/*

data/.travis.yml

@@ -1,19 +0,0 @@
----
-language: ruby
-os: osx
-rvm:
-  - 2.3.3
-  - 2.3.7
-before_install: gem install bundler
-notifications:
-  slack:
-    secure: "okKLlQ93ogj8ut18MZazQD63XTIzCpTfneYQMlKPaLU5HnooAkUFmEpSN8ig\
-TJD0GuEQ7Jf8+BkFlhECWl1FwtzIW6z/yMadiiLwY6qA/O1ZVVYZmkS4kpcKtCMrvO0Hf3iPL\
-XpJX0sQGfGsMsho6NZuNs0dzlrr4+HX/cEGmDXBocDDxdv2d25HzHtqt4l+4axeJ+PJdHDmYl\
-DzhtMAXhkGoPfzws7MPvkVcqY0eZRW2WqccO52zlQrBNcphp7BI8mLTW/BwkEY9YndJf2xoBa\
-oEOuaIJbGgHbmskGMRui3vZnd08/fiWkNsCI/EhB5BDJ41bwobsHEtuqu+Qx92kI+hzjtU4D1\
-6k1v/6HDm61T6gh6BTp0QEXJeOkiecjVGyzrMlBf5BEyIB7JfLvGPa7RUbvvvUxFGcEtnSbUZ\
-49cXAG7cKiiSgcNOocCrMNIRAe864Tm606Mud1RbOv8tEiS9BJ96ktOpOfvrYPyYMRFTte2gR\
-LwNDwcpXIWTI39CXD2EBxSfRK/OqmggLYMG5AKhxyS/Vl7E2p9gii6syB0LnpFBIZ6t+OSve7\
-fZtCU/wruC5IrI/vHtWfApvADYKsXG6FEYJoJ1LsCDjIRlrkwV1dEVsp/HSSO6zRh9KhJ3b7y\
-zL97Dyi6dCi+nM7aKGrox/8kvcn9alrdRt8sz3c="