cap-ssh-key-man 1.2.2 → 1.2.3

data/README.md

@@ -10,11 +10,13 @@ Usage
 
 1. Add `gem "cap-ssh-key-man"` in your Gemfile.
 
-2. Add `require 'cap-ssh-key-man'` to `config/deploy.rb` of your rails project.
+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.
 
-4. Execute `cap sshkey:deploy`
+4. Add `set :sshkeys_path, PATH_TO_SSHKEYS_STORE_PATH` to `deploy.rb`.
+
+5. Execute `cap sshkey:deploy`
 
 Done.
 

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

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.2"
+  s.version = "1.2.3"
 
   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.rb

@@ -1 +0,0 @@
-Dir[File.join(File.dirname(__FILE__), 'cap-ssh-key-man/tasks/*.rb')].sort.each { |lib| require lib }

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

@@ -5,10 +5,10 @@ module CapSshKeyMan
     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
+    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, '*')]
+        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)

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

@@ -1,11 +1,16 @@
+abort "cap-ssh-key-man requires Capistrano 2" unless Capistrano::Configuration.respond_to?(:instance)
 require "cap-ssh-key-man/public_key_combiner"
+
 Capistrano::Configuration.instance(true).load do
   namespace :sshkey do
     desc "Sync keys to servers"
     task :deploy do
-      CapSshKeyMan::PublicKeyCombiner.combine_developer_public_keys
+      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.
     end
   end
-end
+end

metadata

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