ops_team 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a811c1178ce7f125d006e4a3839191446cf758bf24dd5b68d10e6778b4aa2927
-  data.tar.gz: 4b46a9a22a19f533d244c4442ab8c4bbb30479e04c09d4f40f65993faa7f4ea1
+  metadata.gz: 68bef8a0a6e0fb892d9d5ef94f6487ee4eaa6ed8f07d3b5f5b874bd9f1170ad7
+  data.tar.gz: 0b11cf35f0b0b3f656d5972f4a88e76ba3f84768006490174c93b9e11107f13d
 SHA512:
-  metadata.gz: 14117ab9417d99efc20ea08a0497504acdc7486704be02b96f65fe7da0719447dace894e8ee733261e9fd73b5cafe81199527aa37e4977cd818434e6517465be
-  data.tar.gz: 179c07999a87d8f43710ab22f1ffda3dd7a5776e56640324c1a4e175df36607fe904e0b2c15901e8c5e89eaba3a1a216157a6fb518e5aca6f64120061bb6dbc5
+  metadata.gz: 1305aa44e4043d677d34d7c74e5c429ae6a12afc5c5fd705e2db87d7ee14c25449bbb8b4eba52219dbcf2f8fa7dc77a6e51ce63559cfef0b8915652f3a1c0099
+  data.tar.gz: afd4a2e9207b9359d2c3a5b7f41f44d9af3ea05cdce808683e7e6f455a6498fd642f08d7bc71d74c0a92bb15a29006b7ba1efcea80dae17709aacc86020cca10

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

@@ -7,6 +7,16 @@ class Builtin
 		def description
 			"no description"
 		end
+
+		def class_for(name:)
+			Builtins.const_get(builtin_class_name_for(name: name), false)
+		end
+
+		private
+
+		def builtin_class_name_for(name:)
+			name.capitalize.to_sym
+		end
 	end
 
 	def initialize(args, config)

data/lib/builtins/background.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require 'open3'
-
 require 'builtin'
 
 module Builtins
 	class Background < Builtin
-		DEFAULT_SHELL = "bash"
 		DEFAULT_LOG_FILE_PREFIX = "/tmp/ops_bglog_"
 
 		class << self
 			def description
 				"runs the given command in a background session"
 			end
+
+			def log_filename
+				Options.get("background.log_filename") || "#{DEFAULT_LOG_FILE_PREFIX}#{Ops.project_name}"
+			end
 		end
 
 		def run
@@ -26,25 +27,13 @@ module Builtins
 		private
 
 		def run_ops(args)
-			Output.warn("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{log_file}'")
+			Output.notice("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
 			$stdout.sync = $stderr.sync = true
-			$stdout.reopen(log_file, "w")
+			$stdout.reopen(Background.log_filename, "w")
 			$stderr.reopen($stdout)
 
 			Ops.new(args).run
 		end
-
-		def log_file
-			@log_file ||= "#{log_file_prefix}#{Ops.project_name}"
-		end
-
-		def log_file_prefix
-			Options.get("background.log_file_prefix") || DEFAULT_LOG_FILE_PREFIX
-		end
-
-		def shell
-			Options.get("background.shell") || DEFAULT_SHELL
-		end
 	end
 
 	# set an alias

data/lib/builtins/background_log.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'builtin'
+require 'builtins/background'
+
+module Builtins
+	class BackgroundLog < Builtin
+		class << self
+			def description
+				"displays the log from the current or most recent background task from this project"
+			end
+		end
+
+		def run
+			unless File.exist?(Background.log_filename)
+				Output.warn("No background log found at '#{Background.log_filename}'.")
+				return 0
+			end
+
+			Output.notice("Displaying background log '#{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
+
+	# set an alias
+	Bglog = BackgroundLog
+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,21 +58,17 @@ 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
 
 	def builtin
-		@builtin ||= Builtins.const_get(builtin_class_name, false).new(@args, config)
+		@builtin ||= Builtin.class_for(name: @action_name).new(@args, config)
 	rescue NameError
 		# this means there isn't a builtin with that name in that module
 		nil
 	end
 
-	def builtin_class_name
-		@action_name.capitalize.to_sym
-	end
-
 	def action
 		return actions[@action_name] if actions[@action_name]
 		return aliases[@action_name] if aliases[@action_name]

data/lib/output.rb

@@ -40,6 +40,8 @@ class Output
 			@err.puts(msg.yellow)
 		end
 
+		alias_method :notice, :warn
+
 		def error(msg)
 			@err.puts(msg.red)
 		end

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.9.0'
+	s.version = '0.9.5'
 	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.0
+  version: 0.9.5
 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
@@ -149,6 +149,7 @@ files:
 - lib/app_config.rb
 - lib/builtin.rb
 - lib/builtins/background.rb
+- lib/builtins/background_log.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
 - lib/builtins/exec.rb