ops_team 0.10.1 → 0.11.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802441d64eb1dc1403011f6b912898ba1caebcfada19bb1241928ad879c1f086
-  data.tar.gz: 47fa8c46b9114dfe577dcf8a9f43525abaf01ad76c809ffb239449400a866202
+  metadata.gz: 0a5f98b47649c277f4c0b29228d9d9ced79c985301bde206ec9a9a1cdad1990c
+  data.tar.gz: 6a5f36ef9a54b6a31dc745922888996f2420959a1a414f95318e6374fa162cc0
 SHA512:
-  metadata.gz: f107e6877affa1afc72481239e9e3d7e3a7e6e8b4722ee2e8e5f21af789e200ab271ef974904ced2e0e06931485c62ceeb67c5b3435efc376e8229e2d61535c0
-  data.tar.gz: 06e406cdbde8295490977e552bd7cef0f2a53652a1d818d6892ec68c749d4788d2079a9916c1bf6619a583b3bc500bb0f7cf28a3773bf3f3ce702e5b9a23378e
+  metadata.gz: a0869b884b7c8bda06c1ae664c3a056610776326ca7a0f87adfa64c9f45f4d4deb53d5e64000ffcdd0528865153da7b0a4155a92d20c4939cd38a8224ac3aa7f
+  data.tar.gz: 444234f4870cc90c6d56233763a69973de5f6f78c92eada37324bb5da354d09ae4493a49b04f15bf09f5d471f4669595f558e9de52e7f75ee287f9b1a05964fd

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/environment.rb

@@ -6,6 +6,7 @@ class Environment
 	end
 
 	def set_variables
+		set_ops_variables
 		set_environment_aliases
 		set_configured_variables
 	end
@@ -18,6 +19,10 @@ class Environment
 
 	private
 
+	def set_ops_variables
+		ENV["OPS_YML_DIR"] = Dir.pwd
+	end
+
 	def set_environment_aliases
 		environment_aliases.each do |alias_name|
 			ENV[alias_name] = environment

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.1'
+	s.version = '0.11.0.pre2'
 	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.1
+  version: 0.11.0.pre2
 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
@@ -191,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: