ops_team 1.3.2 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bf39d607b3fb8f62433b114abb5c9e217d1960883e832fbb4ef2d660385707
-  data.tar.gz: 17341778ab4e0a9d54553ba0cc0785fcc80b55e4513aacecfe5f92e8aa7cd177
+  metadata.gz: 7bf95d0b212fcf2fc2b6f6beb2d9acf60002725f6b0e51a85ae7b49cb337772c
+  data.tar.gz: 9ad06b3344df5c710420d31580ce7b316b9e22d172143397081d37c9e6b0b55f
 SHA512:
-  metadata.gz: 511d16e71f072bc617a3af9839398ea5fe500556a216cb91d381b732a4f2bc34730a09dd8237bc9c98e526eeb044f54b97f4faacdaaae7e4ff778cb2e0214552
-  data.tar.gz: a5e2ecd49da9859fd856cd8ee62cccfc32e9e28dac75c26ce115ddc09adcc50c8d46de8fda10bfb9443071984e7f7477ac962c27dd123c100ba826140b0e0b61
+  metadata.gz: 69e8a3408d8111ac85c032ae51d9d8bd83c4b2d4455b459f11e4a202868335652c1b93df6bf56de97c98bf8cd3fa34a4855b2a6b0917ed95d0cb345c4c20923f
+  data.tar.gz: 47a7174fffd8a391359a8ff3253be91d3b1a03ea7607cfc628e3cce0cb36f17e227928592f35d6ab344494d0cb4687747cc67a8e8205d40cda839056aa0b518f

data/lib/app_config.rb

@@ -42,7 +42,7 @@ class AppConfig
 	def config
 		@config ||= file_contents ? YAML.safe_load(file_contents) : {}
 	rescue YAML::SyntaxError => e
-		raise ParsingError, "Error parsing config data: #{e}"
+		raise ParsingError, "#{@filename}: #{e}"
 	end
 
 	def file_contents

data/lib/dependencies/sshkey.rb

@@ -9,6 +9,7 @@ module Dependencies
 		DEFAULT_KEY_SIZE = 2048
 		DEFAULT_KEY_ALGO = "rsa"
 		DEFAULT_KEY_LIFETIME_S = 3600
+		DEFAULT_KEY_FILE_COMMENT_COMMAND = "$USER@`hostname -s`"
 
 		def met?
 			# we always need to at least update the key lifetime in the agent
@@ -36,7 +37,9 @@ module Dependencies
 		private
 
 		def generate_key
-			execute("ssh-keygen -b #{opt_key_size} -t #{opt_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}' -C '#{key_file_comment}'"
+			)
 		end
 
 		def add_key
@@ -59,6 +62,10 @@ module Dependencies
 			Ops.project_name
 		end
 
+		def key_file_comment
+			`echo #{opt_key_file_comment_command}`.chomp
+		end
+
 		def dir_name
 			`echo #{File.dirname(name)}`.chomp
 		end
@@ -107,5 +114,9 @@ module Dependencies
 		def opt_key_lifetime
 			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
 		end
+
+		def opt_key_file_comment_command
+			Options.get("sshkey.key_file_comment") || DEFAULT_KEY_FILE_COMMENT_COMMAND
+		end
 	end
 end

data/lib/secrets.rb

@@ -53,7 +53,7 @@ class Secrets < AppConfig
 			out, err, _status = Open3.capture3("ejson decrypt #{@filename}")
 
 			# TODO: err is only nil in testing, but I can't figure out why the stubbing isn't working
-			raise ParsingError, "Error decrypting EJSON file: #{err}" unless err.nil? || err.empty?
+			raise ParsingError, "#{@filename}: #{err}" unless err.nil? || err.empty?
 
 			out
 		end

data/ops_team.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.3.2'
+	s.version = '1.4.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2020-08-12'
-	s.summary = 'ops_team handles basic operations tasks for your project, driven by YAML config'
+	s.date = '2021-05-05'
+	s.summary = 'ops_team handles basic operations tasks for your project, driven by self-documenting YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[
 		'Gemfile',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.2
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description:
-email:
+description: 
+email: 
 executables:
 - ops
 extensions: []
@@ -211,7 +211,7 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -227,8 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
-summary: ops_team handles basic operations tasks for your project, driven by YAML
-  config
+summary: ops_team handles basic operations tasks for your project, driven by self-documenting
+  YAML config
 test_files: []