ops_team 0.9.7 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf41e11aef46cc62ac4ce648aac3c84ed2de854a23ffe8cc2a89d9a678fde503
-  data.tar.gz: 84bb677017c9e7ff084f6c3635a6228c26080736c1f27ccfdb6b9a761f3b1f33
+  metadata.gz: d9a12cfab8e68251d5651fdb580efaf961d21333a083df1bc7a8bc14ca08e498
+  data.tar.gz: 0ddea0179d89116a9ed85c8c6f18dd24e9420cff0d3ae1c1a39aa2b983d0e7e3
 SHA512:
-  metadata.gz: 6319116434905f139d5b9853f96cfe7efa9934d34f66df17a0abc1aed531b4389ab163039c867560a53b27738c472f5642aa9de1af7d528b9e2f2d9b6073dc49
-  data.tar.gz: ff9c8c68c014e39616e572e6fe74fc988d15807da12fd4c99fc7d91144d667bb7e386c62f68af659ca349116566adbc5a473b77a8be33c75dffcd69b6fbfd661
+  metadata.gz: 3b17c7f2bfb516da3ffa82acc5b1ac754a41f2b1a762e460c881a83561b874a925ed8cbdc555c53b5a9500681d77a46551086685936c58a4a1b35c9634614f56
+  data.tar.gz: 3ddde96d1009c84725c2312e6df25a39e2743b12792e55e300a5dce8b61aac8453527f78c632a573c2507678c948a924d16d96155c9fac7fc5b28de1753a5c1a

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?
-			system("which apk")
+			`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"
+			`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

@@ -94,7 +94,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/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.9.7'
+	s.version = '0.10.2'
 	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.7
+  version: 0.10.2
 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