cap-ssh-key-man 1.2.3 → 1.3.0

data/README.md

@@ -12,9 +12,9 @@ Usage
 
 2. Add `require 'cap-ssh-key-man/tasks/rsync'` to `config/deploy.rb` of your rails project.
 
-3. Put all public ssh keys to `config/developer_ssh_keys` dir of your rails project.
+3. Add `set :sshkeys_path, PATH_TO_SSHKEYS_STORE_PATH` to `deploy.rb`.
 
-4. Add `set :sshkeys_path, PATH_TO_SSHKEYS_STORE_PATH` to `deploy.rb`.
+4. Put all public ssh keys to `PATH_TO_SSHKEYS_STORE_PATH` dir of your rails project.
 
 5. Execute `cap sshkey:deploy`
 

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.3.0

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.3"
+  s.version = "1.3.0"
 
   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,19 +1,24 @@
 module CapSshKeyMan
   class PublicKeyCombiner
-    AUTHORIZED_KEYS_PATH = File.join ".", "tmp", "authorized_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")
 
-    def self.combine_developer_public_keys_to public_key_path = PUBLIC_KEY_PATH
-      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, '*')]
-        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)
-        end
+    def self.combine_developer_public_keys_in public_key_path
+      public_key_path ||= PUBLIC_KEY_PATH
+      abort "Please put your public keys in #{public_key_path}." unless File.exist?(public_key_path)
+
+      authorized_keys_string = ""
+      authorized_keys_string << File.read(get_current_user_public_key_path) if get_current_user_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|
+        authorized_keys_string << File.read(file)
       end
+
+      authorized_keys_string
     end
 
     def self.get_current_user_public_key_path

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

@@ -5,12 +5,10 @@ Capistrano::Configuration.instance(true).load do
   namespace :sshkey do
     desc "Sync keys to servers"
     task :deploy do
-      if !exists?(:sshkeys_path) or !File.exist?(sshkeys_path)
-        abort "Please add 'set :sshkeys_path, YOUR_PUBLIC_KEY_DIR' in your deploy.rb, and put public keys in YOUR_PUBLIC_KEY_DIR."
-      end
-      CapSshKeyMan::PublicKeyCombiner.combine_developer_public_keys_to sshkeys_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.
+      set :sshkeys_path, nil unless exists?(:sshkeys_path)
+      remote_ssh_folder_path = File.join("/home/#{user}", ".ssh", "authorized_keys")
+      put CapSshKeyMan::PublicKeyCombiner.combine_developer_public_keys_in(sshkeys_path), remote_ssh_folder_path
+      run "chmod 600 #{remote_ssh_folder_path}"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-ssh-key-man
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
   - 3
-  version: 1.2.3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Michael He