skm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZiODAwYTdlODA4ZmY2M2E3NmI4MGE5NDBlZDYxYTgwNDY0NDhjYQ==
+    ZjRiOGRjZDZlMzI1ODg2MWNkYWFiZmYwNjAwM2M3Y2Q3Y2FhZmUwNg==
   data.tar.gz: !binary |-
-    ZWZlZWY1MmM2NmYzMjQ2MDEwMzAxN2UwNGUxOGE0MGY4NWE5ZjE4OQ==
+    ZjA3OWViMTZiMmFhMzdjOTBmYWZkZGMzZjdiNmZiOGIxYTMyM2YwMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTE3MThlOWQ4NGU1NDEwMDk1MWMzODRjY2Y3MWU3ZTg3YzMwMDc2MzIzZWIx
-    M2FiMDFlMWZkZWNmMDgxZmZlNmIwM2YwYjM2ODZlNzllMzRiZDZkMjRkMDIz
-    ZWVhYWFiNTg4MGM0YTc5ZmZjMzY1ZjU5ODJkZDk2YWMwMzVhZDY=
+    OTgyZTU0ZTQ3MjUzYzFhNzFlYzA5YTk5NTUzYTQ2ZWYzZTY5M2EwNjZiOGNj
+    NDUwMTY2MzMxYWFmN2E0MTdjMzFhMzJlMjRlZTkxMTlhZmI3MmZhYjE1OTg3
+    MGM5ZWQyYjQ1MDAzNjQ2MTdjZDdjYjRhNTgxOGFkODBiY2U4ZGE=
   data.tar.gz: !binary |-
-    ZGUxYjEzYjJlMjllMWIyMzdiMDdkYWU3YzRjYTJhYjUxOTY5NjdhNmI2N2Qw
-    NGIzZjIxOGJjM2E4ZjM0MGE5Zjg2NzM1ODA3MjU3MjA4YzI3ZGI3M2EyNWFm
-    YzE5MzY0YjYyOWQ4NzVmOGQyMDYzNzgwMjE1NzNiZTZjMzg0YmY=
+    ZTAyZWEyYmNkYTBlMDAyNmJkNjkxNGU3ZTk1MGZhNDEyOWRlNzNjZmE3Zjhk
+    Mjc1NTM3OTFmNjFlN2U5NTk5OTVjZjEyZDExZjZmZjBkMjYzMjYxMDU0MjVk
+    OGQ1NDdmNGY1YzgxMzQ3OThiMjEzY2M1NTMxZWM4N2FhMTUxNGY=

data/README.md

@@ -22,6 +22,8 @@ Switch to another key:
 
     skm use key_name
 
+NOTE: ssh-agent may need to be disabled for this new key to be valid!
+
 List all keys:
 
     skm list

data/bin/skm

@@ -13,9 +13,25 @@ end
 
 DOT_SSH_DIR = "#{HOME_DIR}/.ssh"
 
+# check the existance of a key
+# @pub: also check public key?
+def does_key_exist?(keys_dir, name, pub)
+  does_rsa_key_exist?(keys_dir, name, pub) || does_dsa_key_exist?(keys_dir, name, pub)
+end
+
+def does_rsa_key_exist?(keys_dir, name, pub)
+  key_dir = "#{keys_dir}/#{name}"
+  File.exists?("#{key_dir}/id_rsa") && (!pub || File.exists?("#{key_dir}/id_rsa.pub"))
+end
+
+def does_dsa_key_exist?(keys_dir, name, pub)
+  key_dir = "#{keys_dir}/#{name}"
+  File.exists?("#{key_dir}/id_dsa") && (!pub || File.exists?("#{key_dir}/id_dsa.pub"))
+end
+
 # create command
 def cmd_create(argv, keys_dir)
-  # create a new ssh key under ~/.mul-ssh-keys/key-name directory
+  # create a new ssh key under ~/.skm/key-name directory
 
   opts = Trollop::options do
 
@@ -69,7 +85,7 @@ def cmd_use(argv, keys_dir)
   key_dir = "#{keys_dir}/#{name}"
 
   # check for existence of the key
-  unless File.exists? "#{key_dir}/id_rsa" or File.exists? "#{key_dir}/id_dsa"
+  unless does_key_exist?(keys_dir, name, false)
     puts "Key #{name} doesn't exist."
     exit 3
   end
@@ -101,6 +117,39 @@ def cmd_list(argv, keys_dir)
   end
 end
 
+# show command
+def cmd_show(argv, keys_dir)
+  Trollop::options do
+    banner <<-EOS
+  Ssh Key Manager
+
+  skm show key-name
+
+  Args:
+    EOS
+  end
+
+  Trollop::die "Too few arguments for 'show' command." if argv.empty?
+
+  name = argv[0]
+
+  # get the pub file
+  pub_file = ''
+  if does_rsa_key_exist?(keys_dir, name, true)
+    pub_file = "id_rsa.pub"
+  elsif does_dsa_key_exist?(keys_dir, name, true)
+    pub_file = "id_dsa.pub"
+  else
+    puts "Key #{name} doesn't exist."
+    exit 4
+  end
+
+  File.open("#{keys_dir}/#{name}/#{pub_file}", 'r').each_line do |line|
+    puts line
+  end
+end
+
+
 SUB_COMMANDS = %w(create list use)
 global_opts = Trollop::options do
   version "#{SshKeyManager::VERSION::STRING} (C) 2013 Hong Xu"
@@ -114,6 +163,7 @@ global_opts = Trollop::options do
 
   create            Create a new ssh key
   list              List ssh keys
+  show              Show the public key
   use               Switch ssh keys
 
   Use skm [command] --help for the help of the command.
@@ -137,11 +187,13 @@ cmd = ARGV.shift # get the subcommand
 case cmd
 when 'create'
   cmd_create(ARGV, keys_dir)
-when 'use'
-  cmd_use(ARGV, keys_dir)
 when 'list'
   cmd_list(ARGV, keys_dir)
+when 'show'
+  cmd_show(ARGV, keys_dir)
+when 'use'
+  cmd_use(ARGV, keys_dir)
 else
+  Trollop::die 'Use "skm --help" or "skm [command] --help" for help'
 end
 
-

data/lib/skm/version.rb

@@ -4,7 +4,7 @@ module SshKeyManager #:nodoc:#
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hong Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop