ops_team 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70498a1ccc87cf4bf2ddd7ad29028785f02d8dc5a6c8ea44f181a1db5d8e8fea
-  data.tar.gz: e43c220a41cf3956c14bc077ead9abf64f5502960ad46c6c49915a3a51a4b76d
+  metadata.gz: c1dc62ca13a4fa0fb9fc2b6ebe6b06016dac94ff1f05308890cfa010369bb12e
+  data.tar.gz: 89936730eb61c53c23c873af7ff1fd6c9d410204be7de027b6a9b45c062b47f7
 SHA512:
-  metadata.gz: be7def6a15311c5bed82a39b898a22d9aaeacd7058abecd1cdea47cef341439b78af9c9271cccf8ecdf5f9445c6be1d8fb76d44650a18654e0b22dd69b64dbd7
-  data.tar.gz: ad1cb8908108aae55c985b8b513421ad4669143a40a79db2fa064c1f4b07615b82fc736af36d766432204f459bd0cc467af8fa8743b8ff3c03b5af9aa4f259b5
+  metadata.gz: c51e41abec028542d7aa60a8aae7efbd1e3a6a9422f5e6ac3c8175ab9f094cece843616eb68dd7f5ddf993fe19ddf1fbca736c1a822397eec583f30a746315c0
+  data.tar.gz: e612fd4349b5468a876f1398663859048031964808a4ff0ef55a9dc6e429052780d1ead4abba28470fc4d7f687014ee8f7d63ae9be3b9c509c7d037be97070ea

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,18 +27,18 @@ module Builtins
 
 		private
 
+		def set_bglog_file_permissions
+			File.new(Background.log_filename, "w").chmod(0o600)
+		end
+
 		def run_ops(args)
-			Output.warn("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
+			Output.notice("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
 			$stdout.sync = $stderr.sync = true
 			$stdout.reopen(Background.log_filename, "w")
 			$stderr.reopen($stdout)
 
 			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/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

@@ -33,7 +33,7 @@ class Ops
 	end
 
 	def run
-		exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
+		return exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
 
 		run_action
 	rescue UnknownActionError => e
@@ -45,8 +45,7 @@ class Ops
 
 	def syntax_valid?
 		if @action_name.nil?
-			# TODO: output to stderr
-			puts "Usage: ops <action>"
+			Output.error("Usage: ops <action>")
 			false
 		else
 			true
@@ -59,7 +58,7 @@ class Ops
 
 		return builtin.run if builtin
 
-		Output.warn("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
+		Output.notice("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
 	end
 

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.9.1'
+	s.version = '0.9.6'
 	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.1
+  version: 0.9.6
 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