ssh-short 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 8dd082ac87f7edfae8849622cd12d53e72c869a794bba884d58b3a1b86155025f0cc11608ee1dc89b2c54759be97beadb6dffcdc8997f9fb975ccfbc4a49bab0
-  metadata.gz: abee1242981455872aa9556b41588e8fd0b379d1db3ca458951b2b662fdea744412db526862b7155689aa085427a758b14fae13bf4eaa7dee3939f3f556c73a8
+  data.tar.gz: 013894983677178843ed84e84de179db2646b94851fbb8352bec508d392d0bef9f4473178cf6bb9170f8882ba2dc6173f45cf1673236be8e7794631e81d565cd
+  metadata.gz: f0950a8ffdcdbcbe3f69fe3b92d34d9be9f69aa713d76d5459f36794c2a87ab43ececc0660b4de31632d5645cb57bfa030e7eb17c650d10038590baa224a4c45
 SHA1: 
-  data.tar.gz: 38070a5945bf08e55a334e6eff7a2e5abf5c6f7d
-  metadata.gz: 06f47f255095c87e0dcf0f740fc8c5ea7ad1085a
+  data.tar.gz: 31394bed9beb69c61f3cfc15142abe3ed88d1e7f
+  metadata.gz: 9ae918535b15ed6c1ea250f7b12d9902bdb12820

data/README.md

@@ -69,12 +69,15 @@ You can override the user for a node, see args section below
 When you connect to a host for the first time with ssh-short, it will scan your `keys_dir`
 and present you with a list of numbered keys:
 
+**Update:** As of version 0.2.0 your default SSH Key (`id_rsa`) can now be used and will be presented as option `0`
+
 ```
 user@localhost $ sshort 16
 Select a key:
-0) Dev.pem
-1) Test.pem
-2) Admin.pem
+0) id_rsa
+1) Dev.pem
+2) Test.pem
+3) Admin.pem
 ```
 
 Simply type the number of the key and press enter. ssh-short will connect you via `ssh`, 
@@ -114,7 +117,8 @@ This forces an update to the key for a node and you will be presented with the l
 ```
 user@localhost $ sshort 16 -k
 Select a key:
-0) Dev.pem
+0) id_rsa
+1) Dev.pem
 ...
 ```
 

data/lib/ssh_short/keyset.rb

@@ -9,11 +9,7 @@ module SshShort
     end
 
     def prompt_for_key
-      abort "Error: Cannot find keys directory at #{@keys_dir}" unless File.exist? @keys_dir
-      keys = Dir.glob("#{@keys_dir}/*").select{ |e| File.file? e }
-      abort "Error: No keys found in #{@keys_dir}" unless keys.count > 0
-
-      key_names = keys.collect { |key| File.basename key }
+      key_names = find_keys.collect { |key| File.basename key }
       key_names.unshift 'id_rsa'
 
       puts 'Select a key:'
@@ -26,11 +22,29 @@ module SshShort
     end
 
     def get_key(key_name)
-      key = key_name.eql?('id_rsa') ? '~/.ssh/id_rsa' : "#{@keys_dir}/#{key_name}"
-      key = File.expand_path(key)
+      if key_name.eql?('id_rsa')
+        key = File.expand_path('~/.ssh/id_rsa')
+      else
+        keys = find_keys.select { |path| File.basename(path) == key_name }
+        abort "Error: More than one key found called #{key_name}" if keys.count > 1
+        key = keys.first
+      end
+      # key = File.expand_path(key)
       abort "Error: Cannot find #{key}" unless File.exist? key
       key
     end
+    
+    def find_keys
+      abort "Error: Cannot find keys directory at #{@keys_dir}" unless File.exist? @keys_dir
+      
+      # Recursively search directory, including following symlinks
+      search_string = "#{File.expand_path(@keys_dir)}/**{,/*/**}/*"
+      
+      keys = Dir.glob(search_string).select { |e| File.file? e }
+      abort "Error: No keys found in #{@keys_dir}" unless keys.count > 0
+      
+      keys
+    end
 
   end
 

data/lib/ssh_short/version.rb

@@ -1,3 +1,3 @@
 module SshShort
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/ssh_short/keyset_spec.rb

@@ -4,7 +4,12 @@ require 'ssh_short/keyset'
 describe SshShort::KeySet do
 
   let(:keys_dir) { '/path/to/keys' }
-  let(:keys) { [ 'key_a.pem', 'key_b.pem', 'key_c.pem', 'key_d.pem' ] }
+  let(:keys) { [
+      "#{keys_dir}/dir_a/key_a.pem",
+      "#{keys_dir}/dir_a/key_b.pem",
+      "#{keys_dir}/dir_b/key_c.pem",
+      "#{keys_dir}/dir_b/key_d.pem"
+  ] }
 
   subject(:key_set) { SshShort::KeySet.new keys_dir }
 
@@ -33,18 +38,15 @@ describe SshShort::KeySet do
         result = key_set.prompt_for_key
         expect(result).to eq 'id_rsa'
       end
-
     end
-
-
   end
 
   describe 'get_key' do
 
     it 'returns the key path from the name' do
-      key_name = 'key_c.pem'
+      key_name = File.basename keys[2] #key_c.pem
       result = key_set.get_key key_name
-      expect(result).to eq "#{keys_dir}/#{key_name}"
+      expect(result).to eq keys[2]
     end
 
     context 'when the default key name is provided' do
@@ -55,8 +57,6 @@ describe SshShort::KeySet do
       end
 
     end
-
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ssh-short
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-11 00:00:00 Z
+date: 2016-03-15 00:00:00 Z
 dependencies: []
 
 description: Easy ssh