ops_team 1.3.0 → 1.4.1rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284cb7b523fa92a233a477d63adf73ca4257a460968fa135e722af70d7782e33
-  data.tar.gz: e9ec66dfe05a1411b5a3180cbffe5545ec23dfc193d06150c80a2cb96147bcd9
+  metadata.gz: 72fc897bb3da49ff3be4bd05b2ffdb329cc8b8c3f5e996584c037e07eb54f2cd
+  data.tar.gz: 34ffc547970704c09ba49d07ff10fa35851215e5142c48a68f4f4e9f3b9afea4
 SHA512:
-  metadata.gz: 4f399f48ff25956007f5ee9f7ff043b01c06639d1c58ba6d2dbffbaac5705b33b6c0d94a8a323279b7781aa8a199b8076c3f98e645b9e1a27c1e418cffd4c876
-  data.tar.gz: 0abe327dc2b32a4a82124a1de5f83e71f2d2674b2d3d102cd96db47a4dbed316d094d9041c9f2a2d729176c0cd2cc4ee1c393726f659d4a8d1460e2a1ac03ec6
+  metadata.gz: cfde711236d54780ea984a8af8b5540a5876ce019d981f186d855838ab4183369cf9036422438814d2cff3576a3a68b44f9c41e401f9e7a425ef383d0a1f0874
+  data.tar.gz: 232030ad7aecfe374c1c243e77207aa1a5c81981192a519aa56e49ba6254e03288807ad7a762a970d1d04fea59d8e9b211315b999f983328ab6f9d5badbd807b

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/builtins/countdown.rb

@@ -47,7 +47,7 @@ module Builtins
 
 		def timer_task
 			@timer_task ||= Concurrent::TimerTask.new(run_now: true, execution_interval: 1) do
-				Output.print("\r#{seconds_left}")
+				Output.print("\r      \r#{seconds_left}")
 			end
 		end
 

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.0'
+	s.version = '1.4.1rc1'
 	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',
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 	s.required_ruby_version = '~> 2.5'
 	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 'concurrent-ruby', '~> 1.1', '>= 1.1.7'
 	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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1rc1
 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
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description:
-email:
+description: 
+email: 
 executables:
 - ops
 extensions: []
@@ -191,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
@@ -202,13 +222,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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: []