ops_team 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bef8a0a6e0fb892d9d5ef94f6487ee4eaa6ed8f07d3b5f5b874bd9f1170ad7
-  data.tar.gz: 0b11cf35f0b0b3f656d5972f4a88e76ba3f84768006490174c93b9e11107f13d
+  metadata.gz: 047c3860b15eb79d392d3616d822530752746acee221a309b3ad0fbe35a7c4fa
+  data.tar.gz: db149bdce3d9777ec2416ba7489a0cea00bb268d8d82ce3c22ec4326b6a9c7e9
 SHA512:
-  metadata.gz: 1305aa44e4043d677d34d7c74e5c429ae6a12afc5c5fd705e2db87d7ee14c25449bbb8b4eba52219dbcf2f8fa7dc77a6e51ce63559cfef0b8915652f3a1c0099
-  data.tar.gz: afd4a2e9207b9359d2c3a5b7f41f44d9af3ea05cdce808683e7e6f455a6498fd642f08d7bc71d74c0a92bb15a29006b7ba1efcea80dae17709aacc86020cca10
+  metadata.gz: 3ee633e1ba692622711b0d9b6d2a5e4357dd0dbcfdad22567b858616328d2548a0ee8be45c9aa90517f17f15451dad2ff720cb02314829c0feab41164a4d5e4b
+  data.tar.gz: 7b03cdd354652f5c68ca1b430a1540136e08f33498a29021e4ed6fa9147779b82104c6ece6878d16b5c7530af1491f75aad23b7fe2c4db6ae0bf669f17276e5f

data/lib/builtins/background.rb

@@ -18,6 +18,7 @@ module Builtins
 
 		def run
 			subprocess = fork do
+				set_bglog_file_permissions
 				run_ops(args)
 			end
 
@@ -26,6 +27,10 @@ module Builtins
 
 		private
 
+		def set_bglog_file_permissions
+			File.new(Background.log_filename, "w").chmod(0o600)
+		end
+
 		def run_ops(args)
 			Output.notice("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
 			$stdout.sync = $stderr.sync = true

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

@@ -20,7 +20,7 @@ module Dependencies
 		end
 
 		def should_meet?
-			system("which apk")
+			`uname`.chomp == "Linux" && system("which apk &>/dev/null")
 		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,11 +23,27 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux"
+			`uname`.chomp == "Linux" && system("which apt-get &>/dev/null")
 		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
 

data/lib/dependencies/helpers/apt_cache_policy.rb

@@ -0,0 +1,55 @@
+# 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 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
+		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
 

data/ops_team.gemspec

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