ssh_key_switcher 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4e430fedd3b88c306adc11aed32f2c3f6cbbf13599fc5a71c9b27d43c913e7
-  data.tar.gz: 866ea4963674b4266afa0686f642ff52d564d27b9067d24fa52db0922d7702ff
+  metadata.gz: 0cb5737abcac6c9d84606bf41e6ee5b0574adb81c06f759082002a605e1510f5
+  data.tar.gz: 904c1781a5ea8c727a7aaa4185957ba9987fb90709059b940ce32c3a01214f10
 SHA512:
-  metadata.gz: 289a5cb9d9e21b2566ff6b302fc6a8f204cee42879e162d52dcff799089ac864277ef763ac7eea6ee7f433a41d5205ab3485655b26878d5627513b631daeb2d0
-  data.tar.gz: 9802b57d0a61019a169bfd98719cb596c96a60f8607197c1a97aa56b6a60937516cd000d31d39d9d97499d31a866481e44b82eee363f3b7f9c48981a1f741149
+  metadata.gz: 6f0ea37d20e460b051bf425db54ccc1eea1a02502ab7a150b8608a16a8c2f2de35ee33e6af6a0e3fc039604d4915a9d3b587735d0d8f1a534b8b4bc82c408e60
+  data.tar.gz: 7c658daae267a438027c3ed4c438b0e72b226830152e1edebfc864529e1ad9a1a5280581573687178081f1c2784f43c6bbbdfd5d16d3f05316ec7bbdbad4e275

data/bin/sks

@@ -2,6 +2,13 @@
 # frozen_string_literal: true
 
 require 'ssh_key_switcher'
-require_relative '../lib/ssh_key_switcher'
 
-SshKeySwitcher::CLI.start
+# Prevent failures from being reported twice.
+Thread.report_on_exception = false
+
+begin
+  SshKeySwitcher::CLI.start(ARGV)
+rescue StandardError => e
+  puts "  \e[31mERROR (#{e.class}): #{e.message}\e[0m"
+  exit 1
+end

data/lib/ssh_key_switcher/options/current_agent.rb

@@ -5,24 +5,11 @@ module SshKeySwitcher
     class CurrentAgent
       class << self
         def fetch_results
-          results = []
-          payload = Cmd.exec('ssh-add -l')[0]
-          payload.each_line { |line| results << line.split[-2..].join(' ') }
-          results
+          Helper.current_active_keys
         end
 
         def display
-          if fetch_results[0].include?('no identities')
-            prompt.warn('No active SSH keys')
-          elsif fetch_results.size == 1
-            prompt.say('Active SSH key: ')
-            prompt.ok(fetch_results[0])
-          else
-            prompt.say('List of active SSH keys:')
-            fetch_results.each.with_index(1) do |result, index|
-              prompt.ok("  #{index}) #{result}")
-            end
-          end
+          Helper.display_current_ssh_keys(prompt)
         end
 
         private

data/lib/ssh_key_switcher/options/delete.rb

@@ -5,9 +5,9 @@ module SshKeySwitcher
     class Delete
       class << self
         def display_select
-          keys = Helper.find_open_ssh_keys
-          if keys.empty?
-            prompt.error('No OpenSSH keys found in ~/.ssh')
+          files = Helper.find_ssh_keys
+          if files.empty?
+            prompt.error("No OpenSSH keys found in #{SSH_DIR}")
             nil
           else
             msg = 'Choose the OpenSSH keys to REMOVE. Press [CTRL+C] to exit.'
@@ -55,7 +55,7 @@ module SshKeySwitcher
 
         def select_choices(menu, keys)
           keys.each do |value|
-            display_text = value.split('/')[-2..].join('/').gsub('.ssh/', '')
+            display_text = value.split('/').last(2).join('/').gsub('.ssh/', '')
             menu.choice display_text, value
           end
         end

data/lib/ssh_key_switcher/options/list.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module SshKeySwitcher
+  module Options
+    class List
+      class << self
+        def display
+          ssh_keys = Helper.find_ssh_keys
+          if ssh_keys.empty?
+            prompt.error("No OpenSSH keys found in #{SSH_DIR}")
+            nil
+          else
+            prompt.say('List of OpenSSH keys:')
+            Helper.display_list_keys(prompt, ssh_keys, color: :blue)
+          end
+
+          print "\n"
+          Helper.display_current_ssh_keys(prompt)
+        end
+
+        private
+
+        include SshKeySwitcher::Contains
+        include SshKeySwitcher::Utils
+
+        def prompt
+          @prompt ||= TTY::Prompt.new(interrupt: :exit)
+        end
+      end
+    end
+  end
+end

data/lib/ssh_key_switcher/options/remove.rb

@@ -5,7 +5,7 @@ module SshKeySwitcher
     class Remove
       class << self
         def display_select
-          keys = Helper.find_open_ssh_keys
+          keys = Helper.find_ssh_keys
           if keys.empty?
             prompt.error('No OpenSSH keys found in ~/.ssh')
             nil
@@ -56,7 +56,7 @@ module SshKeySwitcher
 
         def select_choices(menu, keys)
           keys.each do |value|
-            display_text = value.split('/')[-2..].join('/').gsub('.ssh/', '')
+            display_text = value.split('/').last(2).join('/').gsub('.ssh/', '')
             menu.choice display_text, value
           end
         end

data/lib/ssh_key_switcher/options/select.rb

@@ -5,20 +5,21 @@ module SshKeySwitcher
     class Select
       class << self
         def display_select
-          ssh_keys = Helper.find_open_ssh_keys
+          ssh_keys = Helper.find_ssh_keys
           if ssh_keys.empty?
-            prompt.error('No OpenSSH keys found in ~/.ssh')
+            prompt.error("No OpenSSH keys found in #{SSH_DIR}")
             nil
           else
             prompt.select('Select an OpenSSH key:', select_options) do |menu|
               menu.enum '.'
               select_choices(menu, ssh_keys)
             end
-
           end
         end
 
         def add(path_open_ssh_key)
+          return if path_open_ssh_key.nil?
+
           SshKeySwitcher::Utils::SshAgent.remove_all
           SshKeySwitcher::Utils::SshAgent.add(path_open_ssh_key)
           prompt.ok('OpenSSH key added successfully!')
@@ -44,10 +45,10 @@ module SshKeySwitcher
           }
         end
 
-        def select_choices(menu, keys)
-          keys.each do |value|
-            display_text = value.split('/')[-2..].join('/').gsub('.ssh/', '')
-            menu.choice display_text, value
+        def select_choices(menu, ssh_keys)
+          ssh_keys.each do |key|
+            display_text = Helper.filename(key)
+            menu.choice display_text, key
           end
         end
       end

data/lib/ssh_key_switcher/utils/contains.rb

@@ -2,7 +2,7 @@
 
 module SshKeySwitcher
   module Contains
-    SSH_DIR = '~/.ssh'
+    SSH_DIR = "#{Dir.home}/.ssh"
     STRING_DETECT_OPENSSH_KEY = 'OPENSSH'
     SERVER_NAMES = %w[github.com gitlab.com bitbucket.org].freeze
   end

data/lib/ssh_key_switcher/utils/helper.rb

@@ -7,20 +7,61 @@ module SshKeySwitcher
 
       module_function
 
-      def find_open_ssh_keys
-        ssh_folder = File.expand_path(SSH_DIR)
+      def find_ssh_keys
+        files  = fetch_private_ssh_keys_via_header
+        files += fetch_private_ssh_keys_via_filename
+        files.flatten.uniq.sort
+      end
+
+      def fetch_private_ssh_keys_via_header
+        ssh_dir = File.expand_path(SSH_DIR)
+        files = Dir.glob("#{ssh_dir}/**/*").select do |file|
+          next if File.directory?(file)
+
+          File.open(file, 'rb') do |f|
+            # Read the first 20 bytes from the file
+            header = f.read(20)
+            header.include?(STRING_DETECT_OPENSSH_KEY)
+          end
+        end
+      end
+
+      def fetch_private_ssh_keys_via_filename
+        ssh_dir = File.expand_path(SSH_DIR)
+        Dir.glob("#{ssh_dir}/**/*.pub").map { |file| file.gsub('.pub', '') }
+      end
 
-        Dir.glob("#{ssh_folder}/*").select { |file| valid_ssh_key?(file) }.sort
+      def filename(key)
+        key.gsub("#{SSH_DIR}/", '').gsub('.pub', '').strip
+      end
+
+      def current_active_keys
+        results = []
+        payload = Cmd.exec('ssh-add -l')[0]
+        payload.each_line { |line| results << line.split.last(2).join(' ') }
+        results
+      end
+
+      def display_current_ssh_keys(prompt, color: :green)
+        ssh_keys = Helper.current_active_keys
+
+        if ssh_keys[0].include?('no identities')
+          prompt.warn('No active SSH keys')
+        elsif ssh_keys.size == 1
+          prompt.say("Active SSH key: #{ssh_keys[0]}", color: color)
+        else
+          prompt.say('List of active SSH keys:')
+          Helper.display_list_keys(prompt, ssh_keys, color: color)
+        end
       end
 
-      def valid_ssh_key?(file)
-        File.open(file, 'rb') do |f|
-          # Read the first 20 bytes from the file
-          header = f.read(20)
-          header.include?(STRING_DETECT_OPENSSH_KEY)
+      def display_list_keys(prompt, ssh_keys, color: :blue)
+        max_space_size = ssh_keys.size.to_s.size
+        ssh_keys.each.with_index(1) do |key, idx|
+          space_size = max_space_size - (idx < 10 ? 0 : idx.to_s.size - 1)
+          filename = Helper.filename(key)
+          prompt.say(format("  %d.%#{space_size}s%s", idx, ' ', filename), color: color)
         end
-      rescue StandardError
-        false
       end
     end
   end

data/lib/ssh_key_switcher/utils/ssh_agent.rb

@@ -3,8 +3,8 @@
 module SshKeySwitcher
   module Utils
     class SshAgent
-      def self.add(key)
-        Cmd.exec("ssh-add #{key}")
+      def self.add(private_key)
+        Cmd.exec("ssh-add #{private_key}")
       end
 
       def self.remove_all

data/lib/ssh_key_switcher/version.rb

@@ -1,3 +1,3 @@
 module SshKeySwitcher
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/ssh_key_switcher.rb

@@ -10,6 +10,8 @@ module SshKeySwitcher
   class Error < StandardError; end
 
   class CLI < Thor
+    ENV['THOR_SILENCE_DEPRECATION'] = 'true'
+
     desc 'version [-v, --version]', 'Show version'
     map %w[-v --version] => :version
     def version
@@ -29,6 +31,12 @@ module SshKeySwitcher
       SshKeySwitcher::Options::Select.add(path_open_ssh_key)
     end
 
+    desc 'list [-l, --list]', 'List of OpenSSH key files'
+    map %w[-l --list] => :list
+    def list
+      SshKeySwitcher::Options::List.display
+    end
+
     desc 'current [-c, --current]', 'List of active OpenSSH keys'
     map %w[-c --current] => :current
     def current

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssh_key_switcher
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Minh Tang Q.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,30 +16,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
-description: Simple and efficient for managing and switching between OpenSSH keys
-  seamlessly
+        version: 0.23.0
+description:
 email:
 - minh.tang1@tomosia.com
 - vhquocminhit@gmail.com
@@ -53,6 +52,7 @@ files:
 - lib/ssh_key_switcher.rb
 - lib/ssh_key_switcher/options/current_agent.rb
 - lib/ssh_key_switcher/options/delete.rb
+- lib/ssh_key_switcher/options/list.rb
 - lib/ssh_key_switcher/options/ping.rb
 - lib/ssh_key_switcher/options/remove.rb
 - lib/ssh_key_switcher/options/select.rb
@@ -77,15 +77,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Simple and efficient for managing and switching between OpenSSH keys seamlessly
+summary: A simple and efficient for managing and switching between OpenSSH keys seamlessly
 test_files: []