ops_team 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd461334631b2cd8fb0aa5ab2f917d173edba9c9747ac3267316f6b0d689c0e
-  data.tar.gz: 98130c35c19e3e6dc934d93d5ffcd6e97c008f37cc4c387a636d1d584cec08ce
+  metadata.gz: 6775a19f3c97954027d7ed21ff4433ec76ae9f2102c378f36a6658d55603c196
+  data.tar.gz: d9ce7a27cfd7124935c145df548f41f438e599ed89e8464a31c37e997822636a
 SHA512:
-  metadata.gz: 8454002c499c4f3bcad73ac5621ba64f4868b32d6498985c69179f31fe894c4901b53b47e6ed2a1bacf9b9aa1418bc819b4a09bbe7d4b266f4d2039f7cb0c8d0
-  data.tar.gz: b0c2a8e5649e06f48989372726f16db4e6ce5bce263bc9a1ad462724d3f12ecfdf74cb2b794f218060bdc73309c565968d634f045efe4a0ef1cdd41f70d81d25
+  metadata.gz: 3feccc3a6ab8205664a041a0216bab8f2e68f36cb2fc8edc8a15371120550afa27994e2ab3c606f164742b1a4e378fda383c42c870acef4549bcde783ae663ba
+  data.tar.gz: 3d265366298b75333ae17c10ad65790cd70909bbf2b301d1077d9ec9645f12094c8ecbb3e002074fc0d48db743bbbdb76e2da3172db26da6fc83718077913ce6

data/bin/ops

@@ -3,7 +3,6 @@
 
 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'"

data/lib/action_list.rb

@@ -40,7 +40,16 @@ class ActionList
 			action = Action.new(name, config, @args)
 
 			@actions[name] = action
-			@aliases[action.alias] = action
+			if action.alias
+				check_duplicate_alias(name, action)
+				@aliases[action.alias] = action
+			end
 		end
 	end
+
+	def check_duplicate_alias(name, action)
+		return if @aliases[action.alias].nil?
+
+		Output.warn("Duplicate alias '#{action.alias}' detected in action '#{name}'.")
+	end
 end

data/lib/builtins/help.rb

@@ -17,23 +17,24 @@ module Builtins
 		end
 
 		def run
-			Output.out("Builtins:")
-			Output.out("  #{builtins.join("\n  ")}")
-			Output.out("")
-			Output.out("Forwards:")
-			Output.out("  #{forwards.join("\n  ")}")
-			Output.out("")
-			Output.out("Actions:")
-			Output.out("  #{actions.join("\n  ")}")
+			list("Builtins", builtins) if builtins.any?
+			list("Forwards", forwards) if forwards.any?
+			list("Actions", actions) if actions.any?
 
 			true
 		end
 
 		private
 
+		def list(name, items)
+			Output.out("#{name}:")
+			Output.out("  #{items.join("\n  ")}")
+			Output.out("")
+		end
+
 		def forwards
 			Forwards.new(@config).forwards.map do |name, dir|
-				format("%<name>-#{NAME_WIDTH}s %<desc>s" , name: name.yellow, desc: "#{dir}")
+				format("%<name>-#{NAME_WIDTH}s %<desc>s", name: name.yellow, desc: dir.to_s)
 			end
 		end
 

data/lib/hook_handler.rb

@@ -4,6 +4,7 @@ require 'output'
 
 class HookHandler
 	class HookConfigError < StandardError; end
+
 	class HookExecError < StandardError; end
 
 	def initialize(config)

data/lib/ops.rb

@@ -101,13 +101,11 @@ class Ops
 	end
 
 	def config
-		@config ||= begin
-			if config_file_exists?
-				parsed_config_contents
-			else
-				Output.warn("File '#{@config_file}' does not exist.") unless @action_name == "init"
-				{}
-			end
+		@config ||= if config_file_exists?
+			parsed_config_contents
+		else
+			Output.warn("File '#{@config_file}' does not exist.") unless @action_name == "init"
+			{}
 		end
 	end
 

data/lib/secrets.rb

@@ -43,9 +43,7 @@ class Secrets < AppConfig
 	end
 
 	def file_contents
-		@file_contents ||= begin
-			@filename.match(/\.ejson$/) ? ejson_contents : super
-		end
+		@file_contents ||= @filename.match(/\.ejson$/) ? ejson_contents : super
 	end
 
 	def ejson_contents

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.11.1'
+	s.version = '1.11.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - nickthecook@gmail.com