capistrano-one_time_key 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939b2c31402865d6fc47b342b49cf2036b61a5ca
-  data.tar.gz: 27d4763cc9247c3e5e81e669594f830c4c00dbfe
+  metadata.gz: 18a0f1d72bbda6095497e9e52cf7e5cd5fe6cf8a
+  data.tar.gz: 02c5c5582e72a125b8598551aaeb4fbc44a28d4c
 SHA512:
-  metadata.gz: acb7cf8ed73e1ac0371ac6cb2f4d26b60d4ba2e204483448e0bd2d92a72fcee1fdc4303c3dde47ea9f3224da378ba3cd914f5db348b573643d1b668a56b587d3
-  data.tar.gz: f9afe8d2f44bec9d273604df3bb9bf177cf950c9e122cbce0c4f76b58b3ee1d565fea947cb88f9733eff263ed4fc39542d35c7af3681aeb7825949dbaf5bb1b7
+  metadata.gz: '0877a5a85ebd3070e5be342cae30249c5b3686b6b678ec04ac35e2ce748cdc3d83ae3c3ad23bf5e5f365fad118ee6a67f43c10cf56adbd7070f0d08b3234bd88'
+  data.tar.gz: '059cd9cb9fea9c16fd7423788185ad212742fab56214e3ccc5ee8292564ac811548eb14f7cd9b32076b00c6fdf695f143c570204bcc4bebc96276da251141b93'

data/lib/capistrano/one_time_key.rb

@@ -18,14 +18,14 @@ module Capistrano
     end
 
     def self.generate_private_key!
-      `ssh-keygen -f #{temporary_ssh_private_key_path} -N "" -C "#{comment}"`
+      `ssh-keygen -m PEM -f #{temporary_ssh_private_key_path} -N "" -C "#{comment}"`
       return temporary_ssh_private_key_path
     end
-    
+
     def self.generate_one_time_key!
-      
+
       path = generate_private_key!
-      
+
       public_key = File.read("#{path}.pub")
 
       on roles(:all) do |host|
@@ -34,11 +34,11 @@ module Capistrano
 
       at_exit do
         # remove dirname locally
-        FileUtils.remove_entry Capistrano::OneTimeKey.temporary_ssh_private_key_path
+        FileUtils.remove_entry Capistrano::OneTimeKey.tmpdir
         on roles(:all) do |host|
           Capistrano::OneTimeKey.remove_key_from_host host, public_key
         end
-      end 
+      end
     end
 
     def self.add_key_to_host capistrano_host, public_key
@@ -50,7 +50,7 @@ module Capistrano
     end
 
     def self.remove_key_from_host capistrano_host, public_key
-      execute_on_remote capistrano_host, "sed -i.bak -e '/#{comment}$/d' ~/.ssh/authorized_keys && rm ~/.ssh/authorized_keys.bak"
+      execute_on_remote capistrano_host, "sed -i.bak -e '/#{comment}$/d' -e '/^$/d' ~/.ssh/authorized_keys && rm ~/.ssh/authorized_keys.bak"
     end
 
     def self.execute_on_remote capistrano_host, command
@@ -60,4 +60,4 @@ module Capistrano
 end
 
 
-load File.expand_path("../one_time_key/tasks/one_time_key.rake", __FILE__)
+load File.expand_path("../tasks/one_time_key.rake", __FILE__)

data/lib/capistrano/one_time_key/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module OneTimeKey
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/capistrano/tasks/one_time_key.rake

@@ -0,0 +1,9 @@
+namespace :load do
+  task :defaults do   
+    set :ssh_options, {
+      keys: [Capistrano::OneTimeKey.temporary_ssh_private_key_path],
+      forward_agent: false,
+      auth_methods: %w(publickey password)
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-one_time_key
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -80,8 +80,8 @@ files:
 - Rakefile
 - capistrano-one_time_key.gemspec
 - lib/capistrano/one_time_key.rb
-- lib/capistrano/one_time_key/tasks/one_time_key.rake
 - lib/capistrano/one_time_key/version.rb
+- lib/capistrano/tasks/one_time_key.rake
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: One time keys for capistrano

data/lib/capistrano/one_time_key/tasks/one_time_key.rake

@@ -1,5 +0,0 @@
-set :ssh_options, {
-  keys: [Capistrano::OneTimeKey.temporary_ssh_private_key_path],
-  forward_agent: false,
-  auth_methods: %w(publickey password)
-}