lib/awskeyring_command.rb in awskeyring-1.9.3 vs lib/awskeyring_command.rb in awskeyring-1.9.4

@@ -370,11 +370,11 @@
         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']
+        user: ENV.fetch('USER', 'awskeyring')
       )
       Awskeyring.delete_token(account: account, message: '# Removing STS credentials')
     rescue Aws::Errors::ServiceError => e
       warn e.to_s
       exit 1
@@ -413,11 +413,11 @@
       login_url = Awskeyring::Awsapi.get_login_url(
         key: cred[:key],
         secret: cred[:secret],
         token: cred[:token],
         path: path,
-        user: ENV['USER']
+        user: ENV.fetch('USER', 'awskeyring')
       )
     rescue Aws::Errors::ServiceError => e
       warn e.to_s
       exit 1
     end
@@ -434,12 +434,12 @@
   desc "#{File.basename($PROGRAM_NAME)} CURR PREV", I18n.t('awskeyring_desc'), hide: true
   map File.basename($PROGRAM_NAME) => :autocomplete
   # 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)
       exit 1
     end
@@ -607,10 +607,10 @@
   def unbundle
     to_delete = ENV.keys.select { |elem| elem.start_with?('BUNDLER_ORIG_') }
     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|
       ENV.delete(env_name)
     end