ops_team 1.2.2 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef9ff578bc479b6bbe53bee8143f2a0477393c32518ae15e417ab8338ac5fb4
-  data.tar.gz: 289a6516bda02ad14993a4529358a671a7ea500269ac9710f42a960cc5a3e524
+  metadata.gz: 1895adc1d2866cce124f65ce2960e5ab2275f8e49daa98355a9708d63e56c409
+  data.tar.gz: 538629b40d40f427c8756312dfac31fa241e5145cbf47499607e93767995022d
 SHA512:
-  metadata.gz: 685a469476c1ccbf25511c8ac1b0eec7cfc1eb3e9056eb8102905c88fbc48266a88dc0aaf3969ee4a6bc16bfc3cd840889d2dd3d4a39e84ce70b3eb43bb5594c
-  data.tar.gz: 87e5e4cb4ed35aac7107cd5614ec7fecaa66fa4fc11ffd077df87cf33daea4d324c2a7df99bac2e63507624762a67a925d132a85b6b1e08e9814ac8715cac3c8
+  metadata.gz: 2a87c1a55c7b990fbe1539ff4bf77933f6a195233beed8a7a2efcbaf73b83b95820f0e8de786496cbf9925cbd98dbf5ce9b7de443b672e9b194659ce65e00970
+  data.tar.gz: 0d49666784d9aeaa7e291f185ec4b51c6e625b88f5b6c77afd17159b6ab9e33cf27c0fce62a135edb2d87193a2b26c7e413cb45c432a9313ff70b4e09062b477

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/cask.rb

@@ -5,11 +5,11 @@ require 'dependencies/brew'
 module Dependencies
 	class Cask < Brew
 		def met?
-			execute("brew cask list #{name}")
+			execute("brew list --cask #{name}")
 		end
 
 		def meet
-			execute("brew cask install #{name}")
+			execute("brew install --cask #{name}")
 		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,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.2.2'
+	s.version = '1.4.0.rc1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -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.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !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
@@ -201,11 +222,11 @@ 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.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: ops_team handles basic operations tasks for your project, driven by YAML