ssh-short 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: bbe973b7717c28b471aabdc48d745b426a06ca643b5e73917718d3a82e56fb21b80a4ac4c673777cf43c06889b029e56ea3d44fe778ae6a15e0850666c3471ac
-  data.tar.gz: 76944a2e2c54ec68e1ce484fe8aea6dc45ed5e46267a5d4ce7f8e339345b1456ab0e31f2f8e7e5e8bb4cbba0292bc491553d04181a9ea296207e45b56cb2852c
+  data.tar.gz: 8dd082ac87f7edfae8849622cd12d53e72c869a794bba884d58b3a1b86155025f0cc11608ee1dc89b2c54759be97beadb6dffcdc8997f9fb975ccfbc4a49bab0
+  metadata.gz: abee1242981455872aa9556b41588e8fd0b379d1db3ca458951b2b662fdea744412db526862b7155689aa085427a758b14fae13bf4eaa7dee3939f3f556c73a8
 SHA1: 
-  metadata.gz: 20e9987e3c98a5143b9e66939a19eab801e22e7d
-  data.tar.gz: f7e8835fb92e1f2f930755a26b2eaec005e1f4b3
+  data.tar.gz: 38070a5945bf08e55a334e6eff7a2e5abf5c6f7d
+  metadata.gz: 06f47f255095c87e0dcf0f740fc8c5ea7ad1085a

data/lib/ssh_short/keyset.rb

@@ -14,6 +14,7 @@ module SshShort
       abort "Error: No keys found in #{@keys_dir}" unless keys.count > 0
 
       key_names = keys.collect { |key| File.basename key }
+      key_names.unshift 'id_rsa'
 
       puts 'Select a key:'
       key_names.each_with_index { |key_name, i| puts "#{i}) #{key_name}" }
@@ -25,7 +26,8 @@ module SshShort
     end
 
     def get_key(key_name)
-      key = "#{@keys_dir}/#{key_name}"
+      key = key_name.eql?('id_rsa') ? '~/.ssh/id_rsa' : "#{@keys_dir}/#{key_name}"
+      key = File.expand_path(key)
       abort "Error: Cannot find #{key}" unless File.exist? key
       key
     end

data/lib/ssh_short/version.rb

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

data/spec/ssh_short/keyset_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+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' ] }
+
+  subject(:key_set) { SshShort::KeySet.new keys_dir }
+
+  before(:each) do
+    allow(File).to receive(:exist?) {keys_dir}.and_return(true)
+    allow(File).to receive(:file?).and_return(true)
+    allow(Dir).to receive(:glob).and_return(keys)
+    allow(STDIN).to receive(:gets).and_return('2')
+    allow(key_set).to receive(:puts) # Stop prompt list printing to STDOUT
+  end
+
+  describe 'prompt_for_key' do
+
+    it 'returns the name of the selected key' do
+      result = key_set.prompt_for_key
+      expect(result).to eq 'key_b.pem'
+    end
+
+    context 'when key 0 is selected' do
+
+      before(:each) do
+        allow(STDIN).to receive(:gets).and_return('0')
+      end
+
+      it 'returns the default key name' 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'
+      result = key_set.get_key key_name
+      expect(result).to eq "#{keys_dir}/#{key_name}"
+    end
+
+    context 'when the default key name is provided' do
+
+      it 'returns the default key path' do
+        result = key_set.get_key 'id_rsa'
+        expect(result).to match /.ssh\/id_rsa/
+      end
+
+    end
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ssh-short
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-09-25 00:00:00 Z
+date: 2016-02-11 00:00:00 Z
 dependencies: []
 
 description: Easy ssh
@@ -33,6 +33,7 @@ files:
 - lib/ssh_short/parser.rb
 - lib/ssh_short/version.rb
 - spec/spec_helper.rb
+- spec/ssh_short/keyset_spec.rb
 - spec/ssh_short/nodemapper_spec.rb
 - spec/ssh_short/parser_spec.rb
 - ssh-short.gemspec
@@ -64,5 +65,6 @@ specification_version: 4
 summary: Fewer keystrokes to get things done
 test_files: 
 - spec/spec_helper.rb
+- spec/ssh_short/keyset_spec.rb
 - spec/ssh_short/nodemapper_spec.rb
 - spec/ssh_short/parser_spec.rb