ops_team 0.8.4 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac7f508035cd849eeac7d3277f3eeb3a1de9537e31201f0a2dbcbafc6b0765b
-  data.tar.gz: 2198752b9d2c9e6858a1c472befe4ba6d44475697b9c2f4882a4eef93c5e42ad
+  metadata.gz: caa9b859d0dac66be5cc981ed872b591a6c174a5c70dabdf145d415681960831
+  data.tar.gz: '08beac67a93906cb88db284977d1a10863820de5fd73369fb782f530cc8ec601'
 SHA512:
-  metadata.gz: 2579177f0edf6061b22b4cdb532943b90ac6077a0f265c5c5a4e3c844a0e742446bbf2f14d899df3d80582e175fff7380f83c5d94c0da004ff587ad76f7f82d9
-  data.tar.gz: 3b4f2a6bc2b604214ad96587430e90031ce529fe2cc03685e33d17bbbf41def8f88f2bba0679a0fe1657f12ec13fed7656f649bdca68d56f2f1e3c7fdac82931
+  metadata.gz: 472f261d6d94bc4024576b2a322fe69bd10b53b5892efbcc89027a825723901c9a1aede0cc393cd8fae372dba49bdeb95c703b912f4d83ecf6711de8f3541caa
+  data.tar.gz: 2a3a3ae0d383b40bec9cfaa79d705520f46b885f510aaab3833e763114a9c10a8b90af5a6c6285942e53057508643da93ad32f629fc4812819e24e44969ba750

data/Gemfile

@@ -7,6 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gem "bcrypt_pbkdf"
 gem "colorize"
 gem "ed25519"
+gem "ejson"
 gem "net-ssh"
 gem "require_all"
 

data/lib/action.rb

@@ -17,7 +17,7 @@ class Action
 	end
 
 	def to_s
-		"#{command} #{@args.join(' ')}"
+		"#{command} #{@args.join(' ')}".strip
 	end
 
 	def alias

data/lib/dependencies/sshkey.rb

@@ -8,7 +8,7 @@ module Dependencies
 	class Sshkey < Dependency
 		DEFAULT_KEY_SIZE = 2048
 		DEFAULT_KEY_ALGO = "rsa"
-		DEFAULT_KEY_LIFETIME_S = 600
+		DEFAULT_KEY_LIFETIME_S = 3600
 
 		def met?
 			# we always need to at least update the key lifetime in the agent
@@ -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,19 +35,25 @@ module Dependencies
 		private
 
 		def generate_key
-			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+			Output.warn("\nNo passphrase set for SSH key '#{priv_key_name}'") if passphrase.nil? || passphrase.empty?
+
+			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)
+			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase.empty? ? nil : passphrase)
 		end
 
 		def key_comment
@@ -67,23 +73,40 @@ 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 opt_passphrase
+			@opt_passphrase ||= begin
+				return "$#{Options.get('sshkey.passphrase_var')}" if Options.get("sshkey.passphrase_var")
+
+				output_passphrase_warning if Options.get("sshkey.passphrase")
+
+				Options.get("sshkey.passphrase")
+			end
+		end
+
+		def output_passphrase_warning
+			Output.warn(
+				"\n'options.sshkey.passphrase' is deprecated and will be removed in a future release. " \
+				"Use 'options.sshkey.passphrase_var' instead."
+			)
 		end
 
-		def configured_passphrase
-			Options.get("sshkey.passphrase")
+		def opt_add_keys?
+			Options.get("sshkey.add_keys").nil? ? true : Options.get("sshkey.add_keys")
 		end
 
-		def key_lifetime
+		def opt_key_lifetime
 			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
 		end
 	end

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.8.4'
+	s.version = '0.8.10'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2020-05-29'
+	s.date = '2020-08-11'
 	s.summary = 'ops_team handles basic operations tasks for your project, driven by YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency 'bcrypt_pbkdf', '~> 1.0', '>= 1.0.1'
 	s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8.1'
 	s.add_runtime_dependency 'ed25519', '~> 1.2', '>= 1.2.4'
+	s.add_runtime_dependency 'ejson', '~> 1.2', '>= 1.2.1'
 	s.add_runtime_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
 	s.add_runtime_dependency 'require_all', '~> 1.1', '>= 1.1.6'
 	s.license = 'GPL-3.0-only'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.10
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -70,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: ejson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement