ops_team 1.11.0.pre.rc3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643d86e6366ca29ee4d7368f9e913c0fad16fe3625e0480287936bb82a794f73
-  data.tar.gz: 8718e8d67b671d59f7252f0e59cd0aee15dfc1d458bf505609bd5a659330e6bc
+  metadata.gz: e4e8d641dd9ba491fb9be7b485203c2fcf22d46b15668b7640b483a6774bbb33
+  data.tar.gz: 76089c91d587dbf028ea25b04d62eb5b203303c7680248dd2e27dab377af8880
 SHA512:
-  metadata.gz: a5b86e7520a99816668db2fa5e57bb1b5a667f5b486f1d58ad01cc8b3612ec40fee7ee7764f2242fc5b24472d132b9a69bc324a09d050890e69905d309c49191
-  data.tar.gz: c20a44ba9ec6fdebf3d951513b17d9c7f2fac5e15ff08dd816894c460aa6520801c3de7e15b23187c400072a9c1e347261c63aea39e645df6d0d4de0c9df2a16
+  metadata.gz: e35d83233bae11f76df0f961bfc603426255ab5c51cb6f26af64060e87bf0f82dee3f60a20ce3f498b0de4c9d3131cd2b6d28c2520bebe5b53d79289d106a2c9
+  data.tar.gz: 4a38de80841fd5ad89b8263f97bb977397ea7915cb6ccdf476c7d73897f96766e5fe61756344ae64c51d0f0b53def9cceae4c2c49913c4d0cbe60ad6f4d32450

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

@@ -26,7 +26,13 @@ class Action
 	end
 
 	def alias
-		@config["alias"]
+		@config["alias"] || @config["aliases"]&.first
+	end
+
+	def aliases
+		return [@config["alias"]].compact unless @config["aliases"]
+
+		([@config["alias"]] + @config["aliases"]).compact
 	end
 
 	def command

data/lib/action_list.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'action'
+
 class ActionList
 	class UnknownActionError < StandardError; end
 
@@ -40,7 +42,16 @@ class ActionList
 			action = Action.new(name, config, @args)
 
 			@actions[name] = action
-			@aliases[action.alias] = action
+			action.aliases.each do |aliaz|
+				check_duplicate_alias(name, aliaz)
+				@aliases[aliaz] = action
+			end
 		end
 	end
+
+	def check_duplicate_alias(name, aliaz)
+		return if @aliases[aliaz].nil?
+
+		Output.warn("Duplicate alias '#{aliaz}' detected in action '#{name}'.")
+	end
 end

data/lib/builtins/background.rb

@@ -23,6 +23,8 @@ module Builtins
 			end
 
 			Process.detach(subprocess)
+
+			true
 		end
 
 		private

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/dependencies/apk.rb

@@ -7,7 +7,7 @@ require 'dependency'
 module Dependencies
 	class Apk < Dependency
 		def met?
-			execute("apk info | grep -q #{name}")
+			execute("apk info | grep -q '^#{name}'$")
 		end
 
 		def meet

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.0-rc3'
+	s.version = '1.12.0'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.11.0.pre.rc3
+  version: 1.12.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2021-10-25 00:00:00.000000000 Z
@@ -114,22 +114,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
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description:
-email:
+description: 
+email: 
 executables:
 - ops
 extensions: []
@@ -213,7 +213,7 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -224,12 +224,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting
   YAML config