ops_team 1.2.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57af38c44173187c829e4f07a894dac672b86dd3033564591804b693afa87fc8
-  data.tar.gz: bb9c475b0959e8d81d491406d533307a2276252ae99a2d27bb8bd91d1b65d302
+  metadata.gz: 46bf39d607b3fb8f62433b114abb5c9e217d1960883e832fbb4ef2d660385707
+  data.tar.gz: 17341778ab4e0a9d54553ba0cc0785fcc80b55e4513aacecfe5f92e8aa7cd177
 SHA512:
-  metadata.gz: d0ce89fe185230286256475fc1ada7d0fdf9d4aec5d31e0a6b2b735ea7f38d1d31a02c2dcdb65d99918cf4a47b745eb9953f60b8803b0fb739b38aabf4818984
-  data.tar.gz: a44717efc73eac86671f942322c9ca51e83403236c7897b854a86a32876e5c2e8179b50fb1b3cdb1e47d7c12342d7e4c29c39b0f9ddc9674a9fb7325db26842b
+  metadata.gz: 511d16e71f072bc617a3af9839398ea5fe500556a216cb91d381b732a4f2bc34730a09dd8237bc9c98e526eeb044f54b97f4faacdaaae7e4ff778cb2e0214552
+  data.tar.gz: a5e2ecd49da9859fd856cd8ee62cccfc32e9e28dac75c26ce115ddc09adcc50c8d46de8fda10bfb9443071984e7f7477ac962c27dd123c100ba826140b0e0b61

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/bin/ops

@@ -5,7 +5,7 @@ require 'optparse'
 
 
 def usage
-	puts "ops [-f|--file <ops_yml>] action [<action args>"
+	puts "Usage: ops [-f|--file <ops_yml>] action [<action args>"
 	puts "  ops_yml:      the config file to load instead of './ops.yml'"
 	puts "  action_args:  arguments to the action loaded from the config file; depends on the action"
 

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

@@ -13,8 +13,9 @@ class Environment
 		end
 	end
 
-	def initialize(env_hash)
+	def initialize(env_hash, config_path)
 		@env_hash = env_hash
+		@config_path = config_path
 	end
 
 	def set_variables
@@ -26,7 +27,7 @@ class Environment
 	private
 
 	def set_ops_variables
-		ENV["OPS_YML_DIR"] = Dir.pwd
+		ENV["OPS_YML_DIR"] = File.dirname(@config_path)
 		ENV["OPS_VERSION"] = Version.version.to_s
 		ENV["OPS_SECRETS_FILE"] = Secrets.config_path_for(Environment.environment)
 		ENV["OPS_CONFIG_FILE"] = AppConfig.config_path_for(Environment.environment)

data/lib/ops.rb

@@ -97,7 +97,7 @@ class Ops
 	end
 
 	def runner
-		@runner ||= Runner.new(@action_name, @args, config)
+		@runner ||= Runner.new(@action_name, @args, config, config_file_absolute_path)
 	end
 
 	def config
@@ -121,6 +121,10 @@ class Ops
 	def config_file_exists?
 		File.exist?(@config_file)
 	end
+
+	def config_file_absolute_path
+		File.expand_path(@config_file)
+	end
 end
 
 Ops.new(ARGV).run if $PROGRAM_NAME == __FILE__

data/lib/runner.rb

@@ -11,10 +11,11 @@ class Runner
 	class UnknownActionError < StandardError; end
 	class ActionConfigError < StandardError; end
 
-	def initialize(action_name, args, config)
+	def initialize(action_name, args, config, config_path)
 		@action_name = action_name
 		@args = args
 		@config = config
+		@config_path = config_path
 	end
 
 	def run
@@ -89,6 +90,6 @@ class Runner
 	end
 
 	def environment
-		@environment ||= Environment.new(env_vars)
+		@environment ||= Environment.new(env_vars, @config_path)
 	end
 end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.2.1'
+	s.version = '1.3.2'
 	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.1
+  version: 1.3.2
 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
@@ -205,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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