ops_team 1.2.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0326ed47ce090f45118f068bfbc92f8d3dddea710c08e5623202ac76e1478ebd
-  data.tar.gz: 0bae3c9e5f6079a3286acf59c32af5f72bfbc47f0365a4c6c2f6efff49576ed4
+  metadata.gz: acb68f893870d3f80465ed28d10902c2fe24ac849d1870d160425024648840cb
+  data.tar.gz: bf5b86aafc47e0988133a6aec9774b416c625f19a5c210328a351362fd51d478
 SHA512:
-  metadata.gz: c640ee9e260aba54f559750b02ccd9edfc9153ebf2dbc41422b19de8b5321e8502145d3766dcce8f16518972ab7f09b39aa3a0e984801f23d8e5c5e68d64213a
-  data.tar.gz: b59dcbb2c7e09f264d8a98ffa9a580508c5a7455e6b8cccb9fdd7259cc4e068cf2602c0834635a7627eddb0d5660358cec49d1c75c62fb4b8f600cb9c3296f77
+  metadata.gz: c99a5ca997ff084cefb8e7a8afc97b4ca89a22bf1338a6d9d00c2313cf41163dd4c4e148aad7871577e474d48195d9029c74ca0c6af754031b41b9c6adf7b0be
+  data.tar.gz: 50b98f0d6ace6c1c1c5ce1c1e65b36a7c5773deef12f10b60b429b243afe81ec2935109ea835fa74f027f05dbbbb9130e1c8615423c7c7aa2f24ffd5bc0df403

data/Gemfile

@@ -6,6 +6,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem "bcrypt_pbkdf"
 gem "colorize"
+gem 'concurrent-ruby', require: 'concurrent'
 gem "e2mmap"
 gem "ed25519"
 gem "ejson"

data/lib/builtins/countdown.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+
+require 'builtin'
+require 'output'
+
+module Builtins
+	class Countdown < Builtin
+		USAGE_STRING = "Usage: ops countdown <seconds>"
+
+		class << self
+			def description
+				"Like `sleep`, but displays time remaining in terminal."
+			end
+		end
+
+		def run
+			check_args
+
+			timer_task.execute
+
+			while timer_task.running?
+				sleep(1)
+				timer_task.shutdown if task_complete?
+			end
+			Output.out("\rCountdown complete after #{sleep_seconds}s.")
+		end
+
+		private
+
+		def check_args
+			check_arg_count
+			check_arg_is_positive_int
+		end
+
+		def check_arg_count
+			raise Builtin::ArgumentError, USAGE_STRING unless args.length == 1
+		end
+
+		def check_arg_is_positive_int
+			raise Builtin::ArgumentError, USAGE_STRING unless sleep_seconds.positive?
+		# raised when the arg is not an int
+		rescue ::ArgumentError
+			raise Builtin::ArgumentError, USAGE_STRING
+		end
+
+		def timer_task
+			@timer_task ||= Concurrent::TimerTask.new(run_now: true, execution_interval: 1) do
+				Output.print("\r      \r#{seconds_left}")
+			end
+		end
+
+		def sleep_seconds
+			Integer(args.first)
+		end
+
+		def task_start_time
+			@task_start_time ||= Time.now
+		end
+
+		def task_end_time
+			@task_end_time ||= task_start_time + sleep_seconds
+		end
+
+		def task_complete?
+			Time.now > task_end_time
+		end
+
+		def seconds_left
+			Integer(task_end_time - Time.now + 1)
+		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/ops_team.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.2.4'
+	s.version = '1.4.0'
 	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.2.4
+  version: 1.4.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
 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
@@ -94,22 +114,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +172,7 @@ files:
 - lib/builtin.rb
 - lib/builtins/background.rb
 - lib/builtins/background_log.rb
+- lib/builtins/countdown.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
 - lib/builtins/envdiff.rb
@@ -205,9 +226,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 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: []