ops_team 1.11.2 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6775a19f3c97954027d7ed21ff4433ec76ae9f2102c378f36a6658d55603c196
-  data.tar.gz: d9ce7a27cfd7124935c145df548f41f438e599ed89e8464a31c37e997822636a
+  metadata.gz: 21c0933e00ebfbc331a0fcf88344ab554fb87c9f0889a9033dd26c1afcd30200
+  data.tar.gz: 44805923090fb8846ccf1f78375ac70bc30b54238aa444961127a17730f67c7f
 SHA512:
-  metadata.gz: 3feccc3a6ab8205664a041a0216bab8f2e68f36cb2fc8edc8a15371120550afa27994e2ab3c606f164742b1a4e378fda383c42c870acef4549bcde783ae663ba
-  data.tar.gz: 3d265366298b75333ae17c10ad65790cd70909bbf2b301d1077d9ec9645f12094c8ecbb3e002074fc0d48db743bbbdb76e2da3172db26da6fc83718077913ce6
+  metadata.gz: ccc49f6c5b23f98bdcd944e96497c54245f3ef26e912bdc109b89eee20e070e5c18ecca9cfe474aac8791be003ad7b4945e33ce13e0ee74477c45ab5722957a2
+  data.tar.gz: 879871fd770c450b0560beb31788cc83b7e95fd103a86ce78d387533d79f54049ee5d7a7041cfe897fe2113eb0a15d69c642ce12bc652e7e5537a0f09424dbff

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

data/lib/builtin.rb

@@ -6,16 +6,26 @@ class Builtin
 	attr_reader :args, :config
 
 	class << self
+		BUILTIN_DIR = "builtins"
+
 		def description
 			"no description"
 		end
 
 		def class_for(name:)
+			file = file_for(name: name)
+			return nil unless File.exist?(file)
+
+			require file
 			Builtins.const_get(builtin_class_name_for(name: name), false)
 		end
 
 		private
 
+		def file_for(name:)
+			File.join(File.dirname(__FILE__), BUILTIN_DIR, "#{name}.rb")
+		end
+
 		def builtin_class_name_for(name:)
 			name.capitalize.to_sym
 		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/builtins/helpers/enumerator.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'require_all'
+require_rel ".."
+
 module Builtins
 	module Helpers
 		class Enumerator

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'output'
+require 'executor'
 
 class HookHandler
 	class HookConfigError < StandardError; end

data/lib/ops.rb

@@ -10,8 +10,6 @@ require 'options'
 require 'version'
 require 'runner'
 
-require_rel "builtins"
-
 # executes commands based on local `ops.yml`
 class Ops
 	INVALID_SYNTAX_EXIT_CODE = 64

data/lib/runner.rb

@@ -6,6 +6,10 @@ require 'action_list'
 require 'action_suggester'
 require 'forwards'
 require 'environment'
+require 'builtin'
+
+module Builtins
+end
 
 class Runner
 	class UnknownActionError < StandardError; end
@@ -61,10 +65,7 @@ class Runner
 	end
 
 	def builtin
-		@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
+		@builtin ||= Builtin.class_for(name: @action_name)&.new(@args, @config)
 	end
 
 	def builtin_names

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.11.2'
+	s.version = '1.14.1'
 	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.2
+  version: 1.14.1
 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.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting