ops_team 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d7f989252a5d65c3700079656d9067f638168efb95e42e6c65f8f45e782c6b
-  data.tar.gz: 73b1e94053e65c3c49d3cf6160d1efa83102d55d96e80c12a9c77599cee7889f
+  metadata.gz: '0733758a5894345ad921779b037a61bbfb19c64d23e8ac9abe6ae440fedafc8b'
+  data.tar.gz: b87cdb544558b4173c9f9e0c82537ca26f8f4d168855fcfc2154229f7980cb58
 SHA512:
-  metadata.gz: fabbbf8dcf87a66a5e949f7c1adc8c6ca4557616c221dd0f2213a14046cd0a484c38e2fdc0a1c974bb3803d58b07addccd788f34d21f8d39f784c7080780ab59
-  data.tar.gz: 0b515c670bc053ca122b31006ed7c32494e15bbc2c1302df0ad3c8b867eec827022d5efe466a3c860e172e8b27303a517f6e52637aa228f5fa035d5986f0eda2
+  metadata.gz: bbf9e515dc0514e7e3a1f1eaa27ffc2467a0b4872d6202d006ef12351f4166d9822e04d8f438d9d1b4d3d0c6369c8c9da01dcd72c09e7f04974f6e67f3448765
+  data.tar.gz: 200a4b8c30cebdc8a39f87394eb1241387b147deebc23491ccd88de58cc916c3d934c6f301d5169c0869610d4ad9f0c382fff2101fc504df909766322049ddd3

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

@@ -23,7 +23,7 @@ module Builtins
 		private
 
 		def dependency_handler
-			Helpers::DependencyHandler.new(@config["dependencies"])
+			Helpers::DependencyHandler.new(deps_to_meet)
 		end
 
 		def meet_dependencies
@@ -49,5 +49,11 @@ module Builtins
 				Output.out(dependency.output)
 			end
 		end
+
+		def deps_to_meet
+			return @config["dependencies"] if @args.empty?
+
+			return @config["dependencies"].select { |dep, names| @args.include?(dep) }
+		end
 	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.1'
+	s.version = '1.4.1'
 	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,10 +25,10 @@ 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'
 	s.add_runtime_dependency 'require_all', '~> 1.1', '>= 1.1.6'
-	s.add_runtime_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.7'
 	s.license = 'GPL-3.0-only'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 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,28 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-- !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
-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: []