awskeyring 1.9.3 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7e97d00115352839c4d8e0824bb600df50322cab8fc819236635ff17235c3b
-  data.tar.gz: bc9f08082c31fe1fdc130506ccab07f782b78b55aa8b55d45b51d2c93305a9fc
+  metadata.gz: b6ba49e965bca0b0058320cec1abfaaad640ce032c8e0307e1eb00c234de1290
+  data.tar.gz: 74c07eac3bf8080a776460a6466e789e6c18a31880fc619ea8ce2dca200b5d01
 SHA512:
-  metadata.gz: 200fd3d71505cb09266c76ff58ed9ad09ed671353b3df800aa774e68e482e4f02d87304cd5af59a978f084493da97352b10eed7fa47fa3aafad7a4aabdbfdd26
-  data.tar.gz: e0e114ab4d902e2ca79d571a34b88fd7d600abd322e6a98a2e44bd90f8b705a2d9571e9175fd3481e8666986d78b78e7de8c4b3038cd3e3744d5b61c60c0323f
+  metadata.gz: 93fe4ab30ce3b64de1ca11f3db11253593c5aba9935bb9b766ab17121f8fd4ae931ce3ac99769ca97bb00682b13b8909092e2741e95f4aa6fdffc967edeb345a
+  data.tar.gz: 39ababe4689fd33f5c5600adb08646e3e42fa0a67e5e93b69d608c346d90b4628ec828e35f1646038904f9b1e4f0017ed62e756222791f24cf4ae14acd275fd2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Tristan Morgan
+Copyright (c) 2016-2022 Tristan Morgan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,7 +2,7 @@
 
 ![Awskeyring](https://raw.githubusercontent.com/servian/awskeyring/main/awskeyring-144.png)
 
-* [![Build Status](https://travis-ci.com/servian/awskeyring.svg?branch=main)](https://travis-ci.com/servian/awskeyring)
+* [![Build Status](https://app.travis-ci.com/servian/awskeyring.svg?branch=main)](https://app.travis-ci.com/github/servian/awskeyring)
 * [![Gem Version](https://badge.fury.io/rb/awskeyring.svg)](https://badge.fury.io/rb/awskeyring)
 * [![license MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 * [![All Downloads](https://ruby-gem-downloads-badge.herokuapp.com/awskeyring?type=total)](https://rubygems.org/gems/awskeyring)

data/awskeyring.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = Awskeyring::HOMEPAGE
   spec.licenses      = ['MIT']
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/|^\..*|C.*\.md|.*\.ronn|.*\.png}) }
+  spec.files         = %w[awskeyring.gemspec README.md LICENSE.txt] + Dir['exe/*', 'lib/**/*.rb', 'man/*.5', 'i18n/*']
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

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.9.3'
+  VERSION = '1.9.5'
   # The Gem's homepage
   HOMEPAGE = 'https://github.com/servian/awskeyring'
 

data/lib/awskeyring_command.rb

@@ -364,21 +364,16 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     end
     item_hash = age_check_and_get(account: account, no_token: true)
 
-    begin
-      new_creds = Awskeyring::Awsapi.get_token(
-        code: code,
-        role_arn: (Awskeyring.get_role_arn(role_name: role) if role),
-        duration: default_duration(options[:duration], role, code),
-        mfa: item_hash[:mfa],
-        key: item_hash[:key],
-        secret: item_hash[:secret],
-        user: ENV['USER']
-      )
-      Awskeyring.delete_token(account: account, message: '# Removing STS credentials')
-    rescue Aws::Errors::ServiceError => e
-      warn e.to_s
-      exit 1
-    end
+    new_creds = Awskeyring::Awsapi.get_token(
+      code: code,
+      role_arn: (Awskeyring.get_role_arn(role_name: role) if role),
+      duration: default_duration(options[:duration], role, code),
+      mfa: item_hash[:mfa],
+      key: item_hash[:key],
+      secret: item_hash[:secret],
+      user: ENV.fetch('USER', 'awskeyring')
+    )
+    Awskeyring.delete_token(account: account, message: '# Removing STS credentials')
 
     Awskeyring.add_token(
       account: account,
@@ -409,18 +404,13 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
     path = options[:path] || 'console'
 
-    begin
-      login_url = Awskeyring::Awsapi.get_login_url(
-        key: cred[:key],
-        secret: cred[:secret],
-        token: cred[:token],
-        path: path,
-        user: ENV['USER']
-      )
-    rescue Aws::Errors::ServiceError => e
-      warn e.to_s
-      exit 1
-    end
+    login_url = Awskeyring::Awsapi.get_login_url(
+      key: cred[:key],
+      secret: cred[:secret],
+      token: cred[:token],
+      path: path,
+      user: ENV.fetch('USER', 'awskeyring')
+    )
 
     if options['no-open']
       puts login_url
@@ -436,8 +426,8 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # autocomplete
   def autocomplete(curr, prev = nil)
     curr, prev = fix_args(curr, prev)
-    comp_line = ENV['COMP_LINE']
-    comp_point_str = ENV['COMP_POINT']
+    comp_line = ENV.fetch('COMP_LINE', nil)
+    comp_point_str = ENV.fetch('COMP_POINT', nil)
     unless comp_line && comp_point_str
       exec_name = File.basename($PROGRAM_NAME)
       warn I18n.t('message.awskeyring', path: $PROGRAM_NAME, bin: exec_name)
@@ -609,7 +599,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     bundled_env = to_delete.map { |elem| elem[('BUNDLER_ORIG_'.length)..] }
     to_delete << 'BUNDLE_GEMFILE'
     bundled_env.each do |env_name|
-      ENV[env_name] = ENV["BUNDLER_ORIG_#{env_name}"]
+      ENV[env_name] = ENV.fetch("BUNDLER_ORIG_#{env_name}", nil)
       to_delete << env_name if ENV["BUNDLER_ORIG_#{env_name}"].start_with? 'BUNDLER_'
     end
     to_delete.each do |env_name|

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" "January 2022" "" ""
+.TH "AWSKEYRING" "5" "October 2022" "" ""
 .
 .SH "NAME"
 \fBAwskeyring\fR \- is a small tool to manage AWS account keys in the macOS Keychain

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.5
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -73,10 +73,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - awskeyring.gemspec
 - exe/awskeyring
 - i18n/en.yml
@@ -94,9 +92,9 @@ 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.9.3
+  documentation_uri: https://rubydoc.info/gems/awskeyring/1.9.5
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/servian/awskeyring/tree/v1.9.3
+  source_code_uri: https://github.com/servian/awskeyring/tree/v1.9.5
   wiki_uri: https://github.com/servian/awskeyring/wiki
 post_install_message: 
 rdoc_options: []

data/Gemfile

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in awskeyring.gemspec
-gemspec
-
-group :development do
-  gem 'github_changelog_generator'
-  gem 'rake'
-  gem 'ronn'
-  gem 'rspec'
-  gem 'rubocop'
-  gem 'rubocop-performance'
-  gem 'rubocop-rake'
-  gem 'rubocop-rspec'
-  gem 'rubocop-rubycw'
-  gem 'simplecov'
-  gem 'yard'
-end

data/Rakefile

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-require 'ronn'
-require 'github_changelog_generator/task'
-require 'yard'
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'servian'
-  config.project = 'awskeyring'
-  config.future_release = "v#{Awskeyring::VERSION}"
-  config.since_tag = 'v0.10.0'
-end
-
-RuboCop::RakeTask.new do |rubocop|
-  rubocop.options = %w[-D --enable-pending-cops]
-  rubocop.requires << 'rubocop-performance'
-  rubocop.requires << 'rubocop-rake'
-  rubocop.requires << 'rubocop-rspec'
-  rubocop.requires << 'rubocop-rubycw'
-end
-
-desc 'Run RSpec code examples'
-task :spec do
-  puts 'Running RSpec...'
-  require 'rspec/core'
-  runner = RSpec::Core::Runner
-  xcode = runner.run(%w[--pattern spec/**{,/*/**}/*_spec.rb --order rand --format documentation --color])
-  abort 'RSpec failed' if xcode.positive?
-end
-
-desc 'Check filemode bits'
-task :filemode do
-  puts 'Running FileMode...'
-  files = Set.new(`git ls-files -z`.split("\x0"))
-  dirs = Set.new(files.map { |file| File.dirname(file) })
-  failure = []
-  files.merge(dirs).each do |file|
-    mode = File.stat(file).mode
-    print '.'
-    failure << file if (mode & 0x7) != ((mode >> 3) & 0x7)
-  end
-  abort "\nError: Incorrect file mode found\n#{failure.join("\n")}" unless failure.empty?
-  print "\n"
-end
-
-desc 'generate manpage'
-task :ronn do
-  puts 'Running Ronn...'
-  doc = Ronn::Document.new('man/awskeyring.5.ronn')
-  doc.date = Time.parse(`git show -s --format=%ad --date=short`)
-  File.write('man/awskeyring.5', doc.to_roff)
-  puts "done\n\n"
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.options = ['--fail-on-warning', '--no-progress', '--files', '*.md']
-  t.stats_options = ['--list-undoc']
-end
-
-desc 'Run Linting, Tests and Documetation tasks'
-task default: %i[filemode rubocop spec ronn yard]