ops_team 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a12cfab8e68251d5651fdb580efaf961d21333a083df1bc7a8bc14ca08e498
-  data.tar.gz: 0ddea0179d89116a9ed85c8c6f18dd24e9420cff0d3ae1c1a39aa2b983d0e7e3
+  metadata.gz: 952f4e8174c60f623b0768fc6a35eb62524c1f574ea8d887c07023d423365d8e
+  data.tar.gz: 9e8421e67c77535683fd7aae10d90c8a671ea3e58c37656a975f303092c8df06
 SHA512:
-  metadata.gz: 3b17c7f2bfb516da3ffa82acc5b1ac754a41f2b1a762e460c881a83561b874a925ed8cbdc555c53b5a9500681d77a46551086685936c58a4a1b35c9634614f56
-  data.tar.gz: 3ddde96d1009c84725c2312e6df25a39e2743b12792e55e300a5dce8b61aac8453527f78c632a573c2507678c948a924d16d96155c9fac7fc5b28de1753a5c1a
+  metadata.gz: 8e3c9bb627b2f8570cca8a3dd60f8e176138dcf01b9417889bcf50e2a24cc25759f5cf0492784bbc28e779fe6d201f570e0992fcb1a8261cab9d09f2f4d54e40
+  data.tar.gz: 4c89388eb2bf7669cb7d4ddc588424911f56d04a5f6c72921e9fb2729caa0c95aa7cd2efac3b7040842d8976c367364eb881e0e4e672583b3c923d97b291d297

data/lib/app_config.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AppConfig
+	class ParsingError < StandardError; end
+
 	class << self
 		def load
 			new(app_config_path).load
@@ -36,8 +38,7 @@ class AppConfig
 	def config
 		@config ||= file_contents ? YAML.safe_load(file_contents) : {}
 	rescue YAML::SyntaxError => e
-		Output.error("Error parsing config data: #{e}")
-		{}
+		raise ParsingError, "Error parsing config data: #{e}"
 	end
 
 	def file_contents

data/lib/builtins/init.rb

@@ -32,12 +32,18 @@ module Builtins
 
 		private
 
-		def template_name_arg
+		def template_name
 			@args[0]
 		end
 
 		def template_path
-			format(OPS_YML_TEMPLATE, template_name: template_name_arg || DEFAULT_TEMPLATE_NAME)
+			return template_name if template_name && File.exist?(template_name)
+
+			builtin_template_path
+		end
+
+		def builtin_template_path
+			format(OPS_YML_TEMPLATE, template_name: template_name || DEFAULT_TEMPLATE_NAME)
 		end
 
 		def template_name_list

data/lib/dependency.rb

@@ -4,11 +4,12 @@ require 'open3'
 require 'English'
 
 require 'output'
+require 'executor'
 
 class Dependency
 	DESCRIPTION_TYPE_WIDTH = 8
 
-	attr_reader :name, :output, :exit_code
+	attr_reader :name
 
 	def initialize(name)
 		@name = name
@@ -45,15 +46,23 @@ class Dependency
 	end
 
 	def success?
-		@exit_code.nil? ? true : @exit_code.zero?
+		@executor.nil? ? true : @executor.success?
+	end
+
+	def output
+		@executor&.output
+	end
+
+	def exit_code
+		@executor&.exit_code
 	end
 
 	private
 
 	def execute(cmd)
-		@output, status = Open3.capture2e(cmd)
-		@exit_code = status.exitstatus
+		@executor = Executor.new(cmd)
+		@executor.execute
 
-		success?
+		@executor.success?
 	end
 end

data/lib/executor.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+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
+
+	def execute
+		@output, status = Open3.capture2e(@command)
+		@exit_code = status.exitstatus
+
+		success?
+	end
+
+	def success?
+		@exit_code.nil? ? true : @exit_code.zero?
+	end
+end

data/lib/hook_handler.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class HookHandler
+	class HookConfigError < StandardError; end
+	class HookExecError < StandardError; end
+
+	def initialize(config)
+		@config = config
+	end
+
+	def do_hooks(name)
+		raise HookConfigError, "'hooks.#{name}' must be a list" unless hooks(name).is_a?(Array)
+
+		execute_hooks(name)
+	end
+
+	private
+
+	def hooks(name)
+		@config.dig("hooks", name) || []
+	end
+
+	def execute_hooks(name)
+		hooks(name).each do |hook|
+			output, exit_code = Executor.execute(hook)
+
+			next if exit_code.zero?
+
+			raise HookExecError, "#{name} hook '#{hook}' failed with exit code #{exit_code}:\n#{output}"
+		end
+	end
+end

data/lib/ops.rb

@@ -4,6 +4,7 @@
 require 'yaml'
 require 'require_all'
 
+require 'hook_handler'
 require 'action'
 require 'output'
 require 'options'
@@ -18,6 +19,7 @@ class Ops
 
 	INVALID_SYNTAX_EXIT_CODE = 64
 	UNKNOWN_ACTION_EXIT_CODE = 65
+	ERROR_LOADING_APP_CONFIG_EXIT_CODE = 66
 
 	class << self
 		def project_name
@@ -53,13 +55,25 @@ class Ops
 	end
 
 	def run_action
-		environment.set_variables
-		AppConfig.load
+		do_before_run_action
 
 		return builtin.run if builtin
 
 		Output.notice("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
+	rescue AppConfig::ParsingError => e
+		Output.error("Error parsing app config: #{e}")
+		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
+	end
+
+	def do_before_run_action
+		environment.set_variables
+		AppConfig.load
+		hook_handler.do_hooks("before")
+	end
+
+	def hook_handler
+		@hook_handler ||= HookHandler.new(config)
 	end
 
 	def builtin

data/lib/secrets.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'open3'
 
 require 'output'
 require 'app_config'
@@ -38,6 +39,19 @@ class Secrets < AppConfig
 	end
 
 	def file_contents
-		@file_contents ||= @filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : super
+		@file_contents ||= begin
+			@filename.match(/\.ejson$/) ? ejson_contents : super
+		end
+	end
+
+	def ejson_contents
+		@ejson_contents ||= begin
+			out, err, _status = Open3.capture3("ejson decrypt #{@filename}")
+
+			# TODO: err is only nil in testing, but I can't figure out why the stubbing isn't working
+			raise ParsingError, "Error decrypting EJSON file: #{err}" unless err.nil? || err.empty?
+
+			out
+		end
 	end
 end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.10.2'
+	s.version = '0.11.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.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -170,6 +170,8 @@ files:
 - lib/dependencies/sshkey.rb
 - lib/dependency.rb
 - lib/environment.rb
+- lib/executor.rb
+- lib/hook_handler.rb
 - lib/ops.rb
 - lib/options.rb
 - lib/output.rb