ops_team 0.10.0 → 0.11.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047c3860b15eb79d392d3616d822530752746acee221a309b3ad0fbe35a7c4fa
-  data.tar.gz: db149bdce3d9777ec2416ba7489a0cea00bb268d8d82ce3c22ec4326b6a9c7e9
+  metadata.gz: d3a9e4bdba561a28f5b282b09ab717b8445053d68ba715337df0bf7bd294abec
+  data.tar.gz: 7fc1110839291c7912c376597d32a4fcb048952e734dc586c2bf40476a53ec93
 SHA512:
-  metadata.gz: 3ee633e1ba692622711b0d9b6d2a5e4357dd0dbcfdad22567b858616328d2548a0ee8be45c9aa90517f17f15451dad2ff720cb02314829c0feab41164a4d5e4b
-  data.tar.gz: 7b03cdd354652f5c68ca1b430a1540136e08f33498a29021e4ed6fa9147779b82104c6ece6878d16b5c7530af1491f75aad23b7fe2c4db6ae0bf669f17276e5f
+  metadata.gz: 97707fa40c98bae65bc8919da37fd2a366090213fb8fd260339c9489da725779f3d763e06f708d51f70fb03273fa99cb4596f44d663c935515f4b82d3a9d94cf
+  data.tar.gz: 9907f1bcc2b41a4ec0b5e119ffad24c443d76e726b6aca9bec1529d8be6576889a362fd8f56d9cc123fcca8bbe242f30c17b6bf39fb4684e7b745b716532cc28

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

@@ -52,6 +52,8 @@ module Builtins
 		end
 
 		def actions
+			return [] unless @config["actions"]
+
 			@config["actions"].map do |name, value|
 				format("%<name>-35s %<desc>s",
 					name: name.yellow,

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/dependencies/apk.rb

@@ -20,7 +20,7 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux" && system("which apk &>/dev/null")
+			`uname`.chomp == "Linux" && system("which apk")
 		end
 	end
 end

data/lib/dependencies/apt.rb

@@ -23,7 +23,7 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux" && system("which apt-get &>/dev/null")
+			`uname`.chomp == "Linux" && system("which apt-get")
 		end
 
 		private
@@ -45,7 +45,7 @@ module Dependencies
 		end
 
 		def sudo_string
-			return "" if ENV['USER'] == "root" || Options.get("apt.use_sudo") == false
+			return "" if ENV['USER'] == "root" || `whoami` == "root" || Options.get("apt.use_sudo") == false
 
 			"sudo "
 		end

data/lib/dependencies/helpers/apt_cache_policy.rb

@@ -35,18 +35,6 @@ module Dependencies
 				match.nil? ? nil : match[1]
 			end
 
-			def version_lines
-				@version_lines ||= begin
-					version_table_index = apt_cache_lines.find_index { |line| line.match?(/Version table:/) }
-
-					apt_cache_lines[version_table_index..-1].each_with_object([]) do |line, versions|
-						next unless line.match(/ *(\*\*\*)? .*/)
-
-						versions << line
-					end
-				end
-			end
-
 			def apt_cache_lines
 				@apt_cache_lines ||= `apt-cache policy #{name}`.split("\n")
 			end

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&.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
@@ -94,7 +108,8 @@ class Ops
 		@config ||= begin
 			Output.warn("File '#{CONFIG_FILE}' does not exist.") unless File.exist?(CONFIG_FILE)
 			YAML.load_file(CONFIG_FILE)
-		rescue StandardError
+		rescue StandardError => e
+			Output.warn("Error parsing '#{CONFIG_FILE}': #{e}")
 			{}
 		end
 	end

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.0'
+	s.version = '0.11.0.pre'
 	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.0
+  version: 0.11.0.pre
 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: