ops_team 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e320ffce54700e023fb48da06735086bcabac888b44dabb927db8e31aece1a
-  data.tar.gz: e44234004fb6c38f17d1f750b53273572928aad090798b3c79707129ef47a983
+  metadata.gz: d595d1f23daf3cab0833a010f9fc99feadaee8fe63e5f98f6a6943b7e39db0f0
+  data.tar.gz: af36bed405ec7982a89e6d4837098ccb92d227d37a6beba086dc0b7e33ab33c2
 SHA512:
-  metadata.gz: bb5ebb07a72f717d5b71089bd2159f70d7c2bd0718e380f8318dd6334277013089ed2f90535e9d94fe7098320cee40426338e98e0195d937a4dec6e649d92af3
-  data.tar.gz: 67fab9f3a7761ba133c43e3670c6e72ce0473d65333a5d1df734012d1521ae34a07af4fce803ab3ef8dd6c8df1c3a103c73a03bb83cb0a73705b7e4ffe9180bb
+  metadata.gz: d50db908a70f94f1d3db693856dc664900386e95c33c90a77aedc8766c8e1b33d72d742668230dcf2c2b546ecee132e8320c6c9fa58df02065fb43a134b3364b
+  data.tar.gz: 88b9e6bb4410fe491673ec101a65d48b7f51746682e55dea06ba2747a250b0ba1fdb23849171b3a17ac2fd3690331fb5155463edad23451fcdd5f00ef2ad049c

data/lib/dependencies/sshkey.rb

@@ -21,7 +21,7 @@ module Dependencies
 			FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
 
 			generate_key unless File.exist?(priv_key_name) && File.exist?(pub_key_name)
-			add_key if success? && ENV["SSH_AUTH_SOCK"]
+			add_key if success? && should_add_key?
 		end
 
 		def unmeet
@@ -35,17 +35,21 @@ module Dependencies
 		private
 
 		def generate_key
-			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+			execute("ssh-keygen -b #{opt_key_size} -t #{opt_key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
 		end
 
 		def add_key
 			Net::SSH::Authentication::Agent.connect.add_identity(
 				unencrypted_key,
 				key_comment,
-				lifetime: key_lifetime
+				lifetime: opt_key_lifetime
 			)
 		end
 
+		def should_add_key?
+			ENV["SSH_AUTH_SOCK"] && opt_add_keys?
+		end
+
 		def unencrypted_key
 			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase)
 		end
@@ -67,23 +71,27 @@ module Dependencies
 			"#{priv_key_name}.pub"
 		end
 
-		def key_size
+		def opt_key_size
 			Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
 		end
 
-		def key_algo
+		def opt_key_algo
 			DEFAULT_KEY_ALGO
 		end
 
 		def passphrase
-			`echo #{configured_passphrase}`.chomp
+			`echo #{opt_passphrase}`.chomp
 		end
 
-		def configured_passphrase
+		def opt_passphrase
 			Options.get("sshkey.passphrase")
 		end
 
-		def key_lifetime
+		def opt_add_keys?
+			Options.get("sshkey.add_keys").nil? ? true : Options.get("sshkey.add_keys")
+		end
+
+		def opt_key_lifetime
 			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
 		end
 	end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.8.6'
+	s.version = '0.8.7'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - nickthecook@gmail.com