ops_team 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e624e071ff1192e4f1d53d3a76135f0cb93feb43730531012944c245109a5f
-  data.tar.gz: 55a945d92fc66f60ff5dce922a734d93e3ec74973d97505357efb1c57d0d7a76
+  metadata.gz: 8c5f694faa0c40cbd2f850fe45fb7eb35012d3359bf815e95984198366ddac6d
+  data.tar.gz: 4d9e6178368112d8a55869162b4371ec715a9168bfb9c0b2fca08e0025d7d1e6
 SHA512:
-  metadata.gz: a1b19fb48de6a17dc8430bd09855ae94483117562ab6c725870abcacf72df86dad737ffb4cdbfe1b0d1c1290acf27c466194c39b88f6b98b833cfe2b61a5b43b
-  data.tar.gz: fbae4f1f500e1d9ef96a1befc963111bfc28a32d3c7da2bc5e0c1a4a8e8e9ad2c5308eb3c3adaa58b3c55b5ce6e9f59e47482cb5e5e6c629a32dd74d35c7b14d
+  metadata.gz: 1bf4567b067db9a9041628384e3b09c096b6ece2caada9749c449a29e2e772197e52f5ee8413155e47a8faeb3bc68134f9f4ef86d7aa1f26d4b3111cbe21b0c1
+  data.tar.gz: 59eb6746612f1f7209ea93b086be4556274fbda04d2e7372b2ce8583bc1eea9d86b7a0c795d6d137a6278c3c4a716faa67ee3c69ab2ab1cd155d2b7ec5c097b5

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/builtins/helpers/dependency_handler.rb

@@ -18,7 +18,7 @@ module Builtins
 
 				@dependency_set.map do |type, names|
 					dependencies_for(type, names)
-				end.flatten
+				end.flatten.compact
 			end
 
 			def dependencies_for(type, names)

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'English'
+
+require 'dependency'
+require 'options'
+
+module Dependencies
+	class Pip < Dependency
+		DEFAULT_PIP = "python3 -m pip"
+
+		def met?
+			execute("#{pip} show #{name}")
+		end
+
+		def meet
+			execute("#{pip} install #{name}")
+		end
+
+		def unmeet
+			# do nothing; we don't want to uninstall packages and reinstall them every time
+			true
+		end
+
+		def should_meet?
+			true
+		end
+
+		private
+
+		def pip
+			Options.get("pip.command") || DEFAULT_PIP
+		end
+	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.0'
+	s.version = '1.13.0'
 	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.0
+  version: 1.13.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -193,6 +193,7 @@ files:
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
 - lib/dependencies/helpers/apt_cache_policy.rb
+- lib/dependencies/pip.rb
 - lib/dependencies/sshkey.rb
 - lib/dependencies/versioned_dependency.rb
 - lib/dependency.rb
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting