cap-ssh-key-man 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/cap-ssh-key-man.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-ssh-key-man}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael He"]

data/lib/cap-ssh-key-man/public_key_combiner.rb

@@ -1,12 +1,14 @@
 module CapSshKeyMan
   class PublicKeyCombiner
-    def self.combine_developer_public_keys
-      authorized_keys_path = File.join ".", "tmp", "authorized_keys"
-      public_key_path      = File.join(".", "config", "developer_public_keys")
+    AUTHORIZED_KEYS_PATH = File.join ".", "tmp", "authorized_keys"
+    PUBLIC_KEY_PATH      = File.join(".", "config", "developer_public_keys")
+    OMNI_RSA_KEY_PATH    = File.expand_path(File.join "~", ".ssh", "id_rsa.pub")
+    OMNI_DSA_KEY_PATH    = File.expand_path(File.join "~", ".ssh", "id_dsa.pub")
 
-      File.open authorized_keys_path, "w" do |f|
+    def self.combine_developer_public_keys
+      File.open AUTHORIZED_KEYS_PATH, "w" do |f|
         f.write File.read(get_current_user_public_key_path) if get_current_user_public_key_path
-        files = Dir[File.join(public_key_path, '*')]
+        files = Dir[File.join(PUBLIC_KEY_PATH, '*')]
         raise "Can't find any public keys in #{public_key_path} dir." if files.size == 0
         files.each do |file|
           f.write File.read(file)
@@ -15,12 +17,9 @@ module CapSshKeyMan
     end
 
     def self.get_current_user_public_key_path
-      omni_rsa_key_path = File.expand_path(File.join "~", ".ssh", "id_rsa.pub")
-      omni_dsa_key_path = File.expand_path(File.join "~", ".ssh", "id_dsa.pub")
-
       current_user_key_path = nil
-      current_user_key_path = omni_rsa_key_path if File.exist?(omni_rsa_key_path)
-      current_user_key_path = omni_dsa_key_path if File.exist?(omni_dsa_key_path)
+      current_user_key_path = OMNI_RSA_KEY_PATH if File.exist?(OMNI_RSA_KEY_PATH)
+      current_user_key_path = OMNI_DSA_KEY_PATH if File.exist?(OMNI_DSA_KEY_PATH)
       current_user_key_path
     end
   end

data/lib/cap-ssh-key-man/tasks/sync.rb

@@ -3,15 +3,9 @@ Capistrano::Configuration.instance(true).load do
   namespace :sshkey do
     desc "Sync keys to servers"
     task :deploy do
-      puts "Creating authorized_keys file ..."
       CapSshKeyMan::PublicKeyCombiner.combine_developer_public_keys
-
-      puts "Deploying authorized_keys ..."
-      tmp_authorized_keys_path = File.join(".", "tmp", "authorized_keys")
-      put File.read(tmp_authorized_keys_path), File.join("/home/#{user}", ".ssh", "authorized_keys")
-
-      # delete temp file after use it.
-      FileUtils.rm tmp_authorized_keys_path
+      put File.read(CapSshKeyMan::PublicKeyCombiner::AUTHORIZED_KEYS_PATH), File.join("/home/#{user}", ".ssh", "authorized_keys")
+      FileUtils.rm CapSshKeyMan::PublicKeyCombiner::AUTHORIZED_KEYS_PATH # delete temp file after use it.
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-ssh-key-man
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Michael He