ops_team 0.9.8 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3275503f96fce4529f7c0c27eef2becd1f71b6350207fa6fd201eb9075ac27b
-  data.tar.gz: eac2684058d86bebbba3210642332a7b21d51a544d3b9941484169c6e35002fc
+  metadata.gz: a78e3661dac6cc0796d00dc840eeb9fedbbc7f358bf3c6af4609d37175e8d53e
+  data.tar.gz: f919b18cdcec154a9dac78020c20f229771b3bd870baf86ef020002c74394acc
 SHA512:
-  metadata.gz: 8e22c3134f19065d761077b81f585f96839f35676dd8237b22ad3b48dd4f895ab1fd03df424b3b3d0fc1cc355e6a661890449b7872b6d5c156681386781869d9
-  data.tar.gz: 245620d939cd538fc3931ef79f6c615be59690c819e8d89a14a302c8c1590446852b7e20b2ae07ed26dc286d6ed62e510b5fa1ad263c31d9b8bcb3c1d028ec2f
+  metadata.gz: 54d21b402bce3e50963b679be2393a7cf1cd993fa51c2c73481c348c4fa019748d5511a4654d9c94c175a985bb7545580cf000594fd2a7c05c7a43d849895cdd
+  data.tar.gz: 64ef22c5c1a2264b3734166fef0b0752c2cc3ae18003ee376d1a86e0cba97d49fdb1c3de74606e0eb0aef050899d8e20c306165190d5cefc78dc030abe26997c

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/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

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
 require 'dependency'
+require 'dependencies/helpers/apt_cache_policy'
 
 module Dependencies
 	class Apt < Dependency
+		PACKAGE_NAME_SEPARATOR = "/"
+
 		def met?
-			execute("dpkg-query --show --showformat '${db:Status-Status}\n' #{name} | grep -q ^installed")
+			return apt_cache_policy.installed_version == package_version if package_version
+
+			apt_cache_policy.installed?
 		end
 
 		def meet
@@ -18,13 +23,29 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux" && system("which apt-get &>/dev/null")
+			`uname`.chomp == "Linux" && system("which apt-get")
 		end
 
 		private
 
+		def package_name
+			name_components[0]
+		end
+
+		def package_version
+			name_components[1]
+		end
+
+		def name_components
+			name.split(PACKAGE_NAME_SEPARATOR, 2)
+		end
+
+		def apt_cache_policy
+			@apt_cache_policy ||= Dependencies::Helpers::AptCachePolicy.new(package_name)
+		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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Dependencies
+	module Helpers
+		class AptCachePolicy
+			INSTALLED_VERSION_REGEX = /  Installed: ([-+.a-z0-9]+)/.freeze
+
+			attr_reader :name
+
+			def initialize(name)
+				@name = name
+			end
+
+			def installed_version
+				version_from_policy_version_line(installed_version_line)
+			end
+
+			def installed?
+				!!installed_version
+			end
+
+			private
+
+			def installed_version_line
+				apt_cache_lines.find { |line| line.match(/#{INSTALLED_VERSION_REGEX}/) }
+			end
+
+			def version_from_policy_version_line(line)
+				return nil if line.nil?
+
+				# E.g.:
+				#  Installed: 7.52.1-5+deb9u7
+				match = line.match(/#{INSTALLED_VERSION_REGEX}/)
+
+				match.nil? ? nil : match[1]
+			end
+
+			def apt_cache_lines
+				@apt_cache_lines ||= `apt-cache policy #{name}`.split("\n")
+			end
+		end
+	end
+end

data/lib/dependencies/sshkey.rb

@@ -18,8 +18,9 @@ module Dependencies
 		def meet
 			Secrets.load
 
-			FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+			Output.warn("\nNo passphrase set for SSH key '#{priv_key_name}'") if passphrase.nil? || passphrase.empty?
 
+			FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
 			generate_key unless File.exist?(priv_key_name) && File.exist?(pub_key_name)
 			add_key if success? && should_add_key?
 		end
@@ -35,8 +36,6 @@ module Dependencies
 		private
 
 		def generate_key
-			Output.warn("\nNo passphrase set for SSH key '#{priv_key_name}'") if passphrase.nil? || passphrase.empty?
-
 			execute("ssh-keygen -b #{opt_key_size} -t #{opt_key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
 		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/ops.rb

@@ -18,6 +18,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
@@ -60,6 +61,9 @@ class Ops
 
 		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 builtin
@@ -94,7 +98,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.9.8'
+	s.version = '0.10.3'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 		'lib/builtins/*',
 		'lib/builtins/helpers/*',
 		'lib/dependencies/*',
+		'lib/dependencies/helpers/*',
 		'loader.rb',
 		'ops_team.gemspec'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.3
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -166,6 +166,7 @@ files:
 - lib/dependencies/dir.rb
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
+- lib/dependencies/helpers/apt_cache_policy.rb
 - lib/dependencies/sshkey.rb
 - lib/dependency.rb
 - lib/environment.rb