ops_team 1.0.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf2a309a88bc396994795bca23a308043e8e8ec6c16a5e7b85baf0b66e15ed83
-  data.tar.gz: 526857c4d776fddf9d20d96c81cf4ab6905a364601d32fb5989467439f366aea
+  metadata.gz: 87d7f989252a5d65c3700079656d9067f638168efb95e42e6c65f8f45e782c6b
+  data.tar.gz: 73b1e94053e65c3c49d3cf6160d1efa83102d55d96e80c12a9c77599cee7889f
 SHA512:
-  metadata.gz: 815571122a732fcc85046f386ae9918c961033dc1c6141ad8d32334b2beb09ee9775b83640dad88d100d67a463468667a9dd9bbc5875e2b8612dc64fcc0d53e0
-  data.tar.gz: 6c4146afc51d45f1f80f91c57093750160589d0d6bf89cd6df2c2f79f6d58e30525edee2a122e3b0059d7bfd2a2f0f2a1b0e3f4ceefe4f1373ad0c1892fead77
+  metadata.gz: fabbbf8dcf87a66a5e949f7c1adc8c6ca4557616c221dd0f2213a14046cd0a484c38e2fdc0a1c974bb3803d58b07addccd788f34d21f8d39f784c7080780ab59
+  data.tar.gz: 0b515c670bc053ca122b31006ed7c32494e15bbc2c1302df0ad3c8b867eec827022d5efe466a3c860e172e8b27303a517f6e52637aa228f5fa035d5986f0eda2

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

@@ -1,8 +1,31 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../loader"
+require 'optparse'
+
+
+def usage
+	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"
+
+	exit(1)
+end
 
+options = {}
+while ARGV[0]&.match(/^-/)
+	opt = ARGV.shift
+	case opt
+	when '-f', '--file'
+		usage unless ARGV.length >= 1
+
+		options[:file] = ARGV.shift
+	else
+		usage
+	end
+end
+
+require_relative "../loader"
 require 'ops'
 
-Ops.new(ARGV).run
+Ops.new(ARGV, config_file: options[:file]).run

data/lib/action.rb

@@ -17,7 +17,11 @@ class Action
 			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
 		end
 
-		Kernel.exec(to_s)
+		if perform_shell_expansion?
+			Kernel.exec(to_s)
+		else
+			Kernel.exec(*to_a)
+		end
 	end
 
 	def to_s
@@ -60,6 +64,10 @@ class Action
 
 	private
 
+	def to_a
+		command.split(" ").reject(&:nil?) | @args
+	end
+
 	def not_in_envs
 		@config["not_in_envs"] || []
 	end
@@ -75,4 +83,8 @@ class Action
 
 		true
 	end
+
+	def perform_shell_expansion?
+		@config["shell_expansion"].nil? ? true : @config["shell_expansion"]
+	end
 end

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#{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

@@ -14,8 +14,6 @@ require_rel "builtins"
 
 # executes commands based on local `ops.yml`
 class Ops
-	CONFIG_FILE = "ops.yml"
-
 	INVALID_SYNTAX_EXIT_CODE = 64
 	UNKNOWN_ACTION_EXIT_CODE = 65
 	ERROR_LOADING_APP_CONFIG_EXIT_CODE = 66
@@ -32,9 +30,10 @@ class Ops
 		end
 	end
 
-	def initialize(argv)
+	def initialize(argv, config_file: nil)
 		@action_name = argv[0]
 		@args = argv[1..-1]
+		@config_file = config_file || "ops.yml"
 
 		Options.set(config["options"] || {})
 	end
@@ -98,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
@@ -106,21 +105,25 @@ class Ops
 			if config_file_exists?
 				parsed_config_contents
 			else
-				Output.warn("File '#{CONFIG_FILE}' does not exist.") unless @action_name == "init"
+				Output.warn("File '#{@config_file}' does not exist.") unless @action_name == "init"
 				{}
 			end
 		end
 	end
 
 	def parsed_config_contents
-		YAML.load_file(CONFIG_FILE)
+		YAML.load_file(@config_file)
 	rescue StandardError => e
-		Output.warn("Error parsing '#{CONFIG_FILE}': #{e}")
+		Output.warn("Error parsing '#{@config_file}': #{e}")
 		{}
 	end
 
 	def config_file_exists?
-		File.exist?(CONFIG_FILE)
+		File.exist?(@config_file)
+	end
+
+	def config_file_absolute_path
+		File.expand_path(@config_file)
 	end
 end
 

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.0.1'
+	s.version = '1.3.1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
 	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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -94,22 +94,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
@@ -130,6 +130,26 @@ 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:
 executables:
@@ -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