ops_team 0.9.6 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1dc62ca13a4fa0fb9fc2b6ebe6b06016dac94ff1f05308890cfa010369bb12e
-  data.tar.gz: 89936730eb61c53c23c873af7ff1fd6c9d410204be7de027b6a9b45c062b47f7
+  metadata.gz: 802441d64eb1dc1403011f6b912898ba1caebcfada19bb1241928ad879c1f086
+  data.tar.gz: 47fa8c46b9114dfe577dcf8a9f43525abaf01ad76c809ffb239449400a866202
 SHA512:
-  metadata.gz: c51e41abec028542d7aa60a8aae7efbd1e3a6a9422f5e6ac3c8175ab9f094cece843616eb68dd7f5ddf993fe19ddf1fbca736c1a822397eec583f30a746315c0
-  data.tar.gz: e612fd4349b5468a876f1398663859048031964808a4ff0ef55a9dc6e429052780d1ead4abba28470fc4d7f687014ee8f7d63ae9be3b9c509c7d037be97070ea
+  metadata.gz: f107e6877affa1afc72481239e9e3d7e3a7e6e8b4722ee2e8e5f21af789e200ab271ef974904ced2e0e06931485c62ceeb67c5b3435efc376e8229e2d61535c0
+  data.tar.gz: 06e406cdbde8295490977e552bd7cef0f2a53652a1d818d6892ec68c749d4788d2079a9916c1bf6619a583b3bc500bb0f7cf28a3773bf3f3ce702e5b9a23378e

data/lib/builtins/exec.rb

@@ -15,7 +15,12 @@ module Builtins
 
 		def run
 			Secrets.load if Options.get("exec.load_secrets")
-			Kernel.exec(@args.join(" "))
+
+			if args.any?
+				Kernel.exec(args.join(" "))
+			else
+				Output.error("Usage: ops exec '<command>'")
+			end
 		end
 	end
 end

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

@@ -77,8 +77,16 @@ class Ops
 	end
 
 	def actions
-		config["actions"].transform_values do |config|
-			Action.new(config, @args)
+		@actions ||= begin
+			if config["actions"]
+				config["actions"]&.transform_values do |config|
+					Action.new(config, @args)
+				end
+			else
+				# only print this error if ops.yml had something in it
+				Output.warn("'ops.yml' has no 'actions' defined.") if config.any?
+				{}
+			end
 		end
 	end
 
@@ -86,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.6'
+	s.version = '0.10.1'
 	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.6
+  version: 0.10.1
 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