ops_team 0.17.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a18acecc72ca3ac11486856bf71b2c082d81e3dfa65931141c20c1bb4ec8bc5
-  data.tar.gz: 852ea38c8598ca1ed3d806b3f5a334cd191e6484827f7141a265d1324c15fe9d
+  metadata.gz: '00009bd6fac219bc943c27592ee2131f110769ef2124697c91b52fcbd123a9a0'
+  data.tar.gz: 9f6c85c4019f6ceb777709f42ba6ebb7640039ed3db521ab15b7b4935dcf5cca
 SHA512:
-  metadata.gz: 19c70546affd151d331225af93e807acd07c536eca7f4369a2c36df4961cae845cd0adea9eb7446041d6e45e66a82cd5980f8a5f979393fccf0538406dbc4100
-  data.tar.gz: 471c92c6afd006c0073be40773a568823e37f8795ef74f8aa76e54a4b22a47208187af34274ebe54044d5b59f4f41036621893570f79eab41a035694b771198e
+  metadata.gz: 165158ff1c590509aa9ae88211996cefcd035faf227d0c88132dc0ea4d3cc4013166b20280627b89d20f6ebcdb2371a537d7f734105118d7d45c1356744c5f62
+  data.tar.gz: 73378dff392b26b0da6091e24cba07e66661971469ca7e1ccc0bbdde0eee661ad7dca58a5348228061f649203864e22379a80d96722dc697d69a1e2173839856

data/lib/action.rb

@@ -5,12 +5,18 @@ require 'secrets'
 # represents one action to be performed in the shell
 # can assemble a command line from a command and args
 class Action
+	class NotAllowedInEnvError < StandardError; end
+
 	def initialize(config, args)
 		@config = config
 		@args = args
 	end
 
 	def run
+		unless allowed_in_current_env?
+			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
+		end
+
 		Secrets.load if load_secrets?
 
 		Kernel.exec(to_s)
@@ -55,4 +61,20 @@ class Action
 	def load_secrets?
 		@config["load_secrets"]
 	end
+
+	def not_in_envs
+		@config["not_in_envs"] || []
+	end
+
+	def in_envs
+		@config["in_envs"] || []
+	end
+
+	def allowed_in_current_env?
+		return false if not_in_envs.include?(Environment.environment)
+
+		return false if in_envs.any? && !in_envs.include?(Environment.environment)
+
+		true
+	end
 end

data/lib/builtins/help.rb

@@ -3,12 +3,15 @@
 require 'colorize'
 
 require 'builtin'
+require 'forwards'
 
 module Builtins
 	class Help < Builtin
+		NAME_WIDTH = 35
+
 		class << self
 			def description
-				"displays available builtins and actions"
+				"displays available builtins, actions, and forwards"
 			end
 		end
 
@@ -16,15 +19,24 @@ module Builtins
 			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  ")}")
 		end
 
 		private
 
+		def forwards
+			Forwards.new(@config).forwards.map do |name, dir|
+				format("%<name>-#{NAME_WIDTH}s %<desc>s" , name: name.yellow, desc: "#{dir}")
+			end
+		end
+
 		def builtins
 			builtin_class_map.map do |klass, name|
-				format("%<name>-35s %<desc>s", name: name.downcase.to_s.yellow, desc: klass.description)
+				format("%<name>-#{NAME_WIDTH}s %<desc>s", name: name.downcase.to_s.yellow, desc: klass.description)
 			end
 		end
 
@@ -55,7 +67,7 @@ module Builtins
 			return [] unless @config["actions"]
 
 			@config["actions"].map do |name, action_config|
-				format("%<name>-40s %<desc>s",
+				format("%<name>-#{NAME_WIDTH}s %<desc>s",
 					name: "#{name.yellow} #{alias_string_for(action_config)}",
 					desc: action_config["description"] || action_config["command"]
 				)

data/lib/executor.rb

@@ -3,15 +3,6 @@
 class Executor
 	attr_reader :output, :exit_code
 
-	class << self
-		def execute(command)
-			@output, status = Open3.capture2e(command)
-			@exit_code = status.exitstatus
-
-			[@output, @exit_code]
-		end
-	end
-
 	def initialize(command)
 		@command = command
 	end

data/lib/forward.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'output'
+
+class Forward
+	def initialize(dir, args)
+		@dir = dir
+		@args = args
+	end
+
+	def run
+		Output.notice("Forwarding 'ops #{@args.join(" ")}' to '#{@dir}/'...")
+
+		Dir.chdir(@dir)
+		Ops.new(@args).run
+	end
+end

data/lib/forwards.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'forward'
+
+class Forwards
+	def initialize(config, args = [])
+		@config = config
+		@args = args
+	end
+
+	def get(name)
+		Forward.new(forwards[name], @args) if forwards[name]
+	end
+
+	def forwards
+		@forwards ||= @config["forwards"] || {}
+	end
+end

data/lib/hook_handler.rb

@@ -25,11 +25,18 @@ class HookHandler
 	def execute_hooks(name)
 		hooks(name).each do |hook|
 			Output.notice("Running #{name} hook: #{hook}")
-			output, exit_code = Executor.execute(hook)
+			output, exit_code = execute_hook(hook)
 
 			next if exit_code.zero?
 
 			raise HookExecError, "#{name} hook '#{hook}' failed with exit code #{exit_code}:\n#{output}"
 		end
 	end
+
+	def execute_hook(name)
+		executor = Executor.new(name)
+		executor.execute
+
+		[executor.output, executor.exit_code]
+	end
 end

data/lib/ops.rb

@@ -13,6 +13,7 @@ require 'environment'
 require 'version'
 require 'action_list'
 require 'action_suggester'
+require 'forwards'
 
 require_rel "builtins"
 
@@ -29,6 +30,7 @@ class Ops
 	MIN_VERSION_NOT_MET_EXIT_CODE = 67
 	ACTION_CONFIG_ERROR_EXIT_CODE = 68
 	BUILTIN_SYNTAX_ERROR_EXIT_CODE = 69
+	ACTION_NOT_ALLOWED_IN_ENV_EXIT_CODE = 70
 
 	RECOMMEND_HELP_TEXT = "Run 'ops help' for a list of builtins and actions."
 
@@ -100,6 +102,8 @@ class Ops
 	end
 
 	def run_action
+		return forward.run if forward
+
 		do_before_all
 
 		return builtin.run if builtin
@@ -115,6 +119,9 @@ class Ops
 	rescue AppConfig::ParsingError => e
 		Output.error("Error parsing app config: #{e}")
 		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
+	rescue Action::NotAllowedInEnvError => e
+		Output.error("Error running action #{@action_name}: #{e}")
+		exit(ACTION_NOT_ALLOWED_IN_ENV_EXIT_CODE)
 	end
 
 	def do_before_all
@@ -123,10 +130,11 @@ class Ops
 	end
 
 	def do_before_action
-		hook_handler.do_hooks("before") unless ENV["OPS_RUNNING"] || action.skip_hooks?("before")
+		return if ENV["OPS_RUNNING"] || action.skip_hooks?("before")
 
 		# this prevents before hooks from running in ops executed by ops
 		ENV["OPS_RUNNING"] = "1"
+		hook_handler.do_hooks("before")
 	end
 
 	def hook_handler
@@ -144,6 +152,10 @@ class Ops
 		Builtins.constants.select { |c| Builtins.const_get(c).is_a? Class }.map(&:downcase)
 	end
 
+	def forward
+		@forward ||= Forwards.new(@config, @args).get(@action_name)
+	end
+
 	def action
 		return action_list.get(@action_name) if action_list.get(@action_name)
 		return action_list.get_by_alias(@action_name) if action_list.get_by_alias(@action_name)

data/ops_team.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.20.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -175,6 +175,8 @@ files:
 - lib/dependency.rb
 - lib/environment.rb
 - lib/executor.rb
+- lib/forward.rb
+- lib/forwards.rb
 - lib/hook_handler.rb
 - lib/ops.rb
 - lib/options.rb