ops_team 0.9.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a168c8803f5f12ecc5ba54fc77e4a304baa300aa100e2d81d92b2f5146551d7
-  data.tar.gz: dec291b877b6cc0fc056feb794e676abd56f5376b8373f914b6c24dfd3d7462d
+  metadata.gz: cf41e11aef46cc62ac4ce648aac3c84ed2de854a23ffe8cc2a89d9a678fde503
+  data.tar.gz: 84bb677017c9e7ff084f6c3635a6228c26080736c1f27ccfdb6b9a761f3b1f33
 SHA512:
-  metadata.gz: d96bea7054642ba35750f8efa59d6a6e2201dce98aaa5471dda573704ceb66f5daedf38f9cd7a68d2b31f9bd53ad17fff85790f61fe04fca8221ac9299140ddb
-  data.tar.gz: 86b51b059eca72ba60f30c2be14c83bc40e4e1c872c3edaa91bab6a94080eb34a59eda351ef796d42d903216ca71f1fd8059d031773fb0b1efd2e7f2b498e4f5
+  metadata.gz: 6319116434905f139d5b9853f96cfe7efa9934d34f66df17a0abc1aed531b4389ab163039c867560a53b27738c472f5642aa9de1af7d528b9e2f2d9b6073dc49
+  data.tar.gz: ff9c8c68c014e39616e572e6fe74fc988d15807da12fd4c99fc7d91144d667bb7e386c62f68af659ca349116566adbc5a473b77a8be33c75dffcd69b6fbfd661

data/lib/app_config.rb

@@ -23,7 +23,7 @@ class AppConfig
 
 	def load
 		config['environment']&.each do |key, value|
-			ENV[key] = value.to_s
+			ENV[key] = value.is_a?(Hash) || value.is_a?(Array) ? value.to_json : value.to_s
 		end
 	end
 

data/lib/builtins/background.rb

@@ -4,7 +4,6 @@ require 'builtin'
 
 module Builtins
 	class Background < Builtin
-		DEFAULT_SHELL = "bash"
 		DEFAULT_LOG_FILE_PREFIX = "/tmp/ops_bglog_"
 
 		class << self
@@ -13,18 +12,13 @@ module Builtins
 			end
 
 			def log_filename
-				"#{log_filename_prefix}#{Ops.project_name}"
-			end
-
-			private
-
-			def log_filename_prefix
-				Options.get("background.log_filename_prefix") || DEFAULT_LOG_FILE_PREFIX
+				Options.get("background.log_filename") || "#{DEFAULT_LOG_FILE_PREFIX}#{Ops.project_name}"
 			end
 		end
 
 		def run
 			subprocess = fork do
+				set_bglog_file_permissions
 				run_ops(args)
 			end
 
@@ -33,6 +27,10 @@ module Builtins
 
 		private
 
+		def set_bglog_file_permissions
+			File.new(Background.log_filename, "w").chmod(0o600)
+		end
+
 		def run_ops(args)
 			Output.notice("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
 			$stdout.sync = $stderr.sync = true
@@ -41,10 +39,6 @@ module Builtins
 
 			Ops.new(args).run
 		end
-
-		def shell
-			Options.get("background.shell") || DEFAULT_SHELL
-		end
 	end
 
 	# set an alias

data/lib/builtins/background_log.rb

@@ -18,7 +18,17 @@ module Builtins
 			end
 
 			Output.notice("Displaying background log '#{Background.log_filename}'...")
-			exec("tail #{args.join(' ')} '#{Background.log_filename}'")
+			display_file
+		end
+
+		private
+
+		def display_file
+			if args.any?
+				exec("tail #{args.join(' ')} '#{Background.log_filename}'")
+			else
+				exec("cat '#{Background.log_filename}'")
+			end
 		end
 	end
 

data/lib/builtins/exec.rb

@@ -15,7 +15,12 @@ module Builtins
 
 		def run
 			Secrets.load if Options.get("exec.load_secrets")
-			Kernel.exec(@args.join(" "))
+
+			if args.any?
+				Kernel.exec(args.join(" "))
+			else
+				Output.error("Usage: ops exec '<command>'")
+			end
 		end
 	end
 end

data/lib/builtins/help.rb

@@ -23,14 +23,32 @@ module Builtins
 		private
 
 		def builtins
-			builtin_class_names.map do |class_name|
-				description = Builtins.const_get(class_name).description
-				format("%<name>-35s %<desc>s", name: class_name.downcase.to_s.yellow, desc: description)
+			builtin_class_map.map do |klass, name|
+				format("%<name>-35s %<desc>s", name: name.downcase.to_s.yellow, desc: klass.description)
+			end
+		end
+
+		def builtin_class_map
+			builtin_class_names.each_with_object({}) do |name, hash|
+				# get the class reference for this name
+				constant = const_for(name)
+				# check hash for an existing entry for the same class
+				existing_name = hash[constant]
+
+				# if there is an existing key for the same class, and it's longer than the one we just found,
+				# skip adding this one one to avoid duplicates, leaving the shortest name for each class
+				next if existing_name && existing_name.length <= name.length
+
+				hash[constant] = name
 			end
 		end
 
 		def builtin_class_names
-			Builtins.constants.select { |c| Builtins.const_get(c).is_a? Class }
+			@builtin_class_names ||= Builtins.constants.select { |c| const_for(c).is_a?(Class) }.sort
+		end
+
+		def const_for(name)
+			Builtins.const_get(name, false)
 		end
 
 		def actions
@@ -39,7 +57,7 @@ module Builtins
 					name: name.yellow,
 					desc: value["description"] || value["command"]
 				)
-			end
+			end.sort
 		end
 	end
 end

data/lib/ops.rb

@@ -77,8 +77,16 @@ class Ops
 	end
 
 	def actions
-		config["actions"].transform_values do |config|
-			Action.new(config, @args)
+		@actions ||= begin
+			if config["actions"]
+				config["actions"]&.transform_values do |config|
+					Action.new(config, @args)
+				end
+			else
+				# only print this error if ops.yml had something in it
+				Output.warn("'ops.yml' has no 'actions' defined.") if config.any?
+				{}
+			end
 		end
 	end
 

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.9.2'
+	s.version = '0.9.7'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2020-08-11'
+	s.date = '2020-08-12'
 	s.summary = 'ops_team handles basic operations tasks for your project, driven by YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.7
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf