ops_team 0.9.9 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb111c3faceceae92cb8ae9907b7bf9da2c4984191bb22f47c3f14237c287c05
-  data.tar.gz: 8fa74d1592b5b66a66b637325d737358220157796b08e2ab64a8248275ef4624
+  metadata.gz: 6f2b052b1a1dfd1e4cc30acca43495993be28499f2b1fa9eb8e587da57931d3a
+  data.tar.gz: 27b21a20f77b1a0bf416f3d3a56be4142baa0b7553b3161e0b916da61b0f3422
 SHA512:
-  metadata.gz: cea8868f0451869d8c4988b920c76d6c0d2ef6a9b878181da05ba8a7b35b66e5638c7062b4485e29f7fe9298b863c60f712fa12f7364fc723beada03e32bb323
-  data.tar.gz: 6dc28aae33915e08e482eb0373ba7babedf30b454cfd6189fefd9e3084a7ef0f61227ce8714e0a1433cc1b32ef08f28f56322f16da78051598a7d030058d34b3
+  metadata.gz: 67f1395a225c91a2ee619ecd1eb6eb26e16ca05bafb5f82916508875a7b58c0eafe40be120f83ec2b55a42aa3695bcb91cf1b1ca5973c521029bd377f9c02c86
+  data.tar.gz: cf644c0878ce56c6f11c6e45719044a72aa71a566bca492c5f51966436ef25010ec19dd6c5d8f5a0f4cd408177a114975f4e3160b27977bda3360db4ce456282

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

@@ -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/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.9'
+	s.version = '0.10.4'
 	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.9
+  version: 0.10.4
 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