ops_team 0.18.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe720771051eb12c4f6786c7a9409d8e2ab01e592abb7959349ceba74f47eed
-  data.tar.gz: d2fdd069587db893f74d599abf875d15dcad4a09c19b94169496527ba462c77f
+  metadata.gz: 0e74fe375694383d5cf99385e04c314e804a2ab1aae6b03558b811e78874c65e
+  data.tar.gz: 4c9f31d818c8bc456c4c9c37d40d42491dde28ef6e038eee77ff0e7c42e7a6da
 SHA512:
-  metadata.gz: 48f067fd6e9379a1b40830defed7652301786020310137c1be4349e8abb5ab45eae478084b6614d807e10db6738531fb1f169c44146445fed77c1b517eabdba5
-  data.tar.gz: 32d83b0e2cf94f4178f577b3fbc2b9d232bd10f1de3370f5d516fac9e98f86abe1401749428a486c1f436d0d4646ad332f88701e889ac75764e432978f634000
+  metadata.gz: 87320ca1362f2691ad4808bca8b7733b2d1be4bc70b4ca06b650267bf5c50c7d69e64a554fc91d246c821e17454794ae0aadb9cca27ea747f7092f5f636a6492
+  data.tar.gz: 6b6bee1687f1858a1097931e336ddcf28fe4f50a9b8802cded747a034f4fefddbcab0fd4331bd961a269811384eb574bfca4e4cc69c5cca576a709bcb2cb59e0

data/lib/action.rb

@@ -17,8 +17,6 @@ class Action
 			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
 		end
 
-		Secrets.load if load_secrets?
-
 		Kernel.exec(to_s)
 	end
 
@@ -56,12 +54,12 @@ class Action
 		end
 	end
 
-	private
-
 	def load_secrets?
-		@config["load_secrets"]
+		@config["load_secrets"].nil? ? false : @config["load_secrets"]
 	end
 
+	private
+
 	def not_in_envs
 		@config["not_in_envs"] || []
 	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"
 
@@ -101,10 +102,13 @@ class Ops
 	end
 
 	def run_action
+		return forward.run if forward
+
 		do_before_all
 
 		return builtin.run if builtin
 
+		raise UnknownActionError, "Unknown action: #{@action_name}" unless action
 		raise ActionConfigError, action.config_errors.join("; ") unless action.config_valid?
 
 		do_before_action
@@ -122,15 +126,17 @@ class Ops
 	end
 
 	def do_before_all
-		environment.set_variables
 		AppConfig.load
+		Secrets.load if action && action.load_secrets?
+		environment.set_variables
 	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
@@ -148,11 +154,13 @@ 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)
-
-		raise UnknownActionError, "Unknown action: #{@action_name}"
 	end
 
 	def action_list

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.18.0'
+	s.version = '1.0.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.18.0
+  version: 1.0.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