ops_team 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15bace4f2993d10f93e68f9b10c506222409556476717a28b1bb7252e1c81ada
-  data.tar.gz: f47bd7063e540df0b3bc8037085869cd10ff0b7aa667350e7ee3681d99e173d5
+  metadata.gz: d3275503f96fce4529f7c0c27eef2becd1f71b6350207fa6fd201eb9075ac27b
+  data.tar.gz: eac2684058d86bebbba3210642332a7b21d51a544d3b9941484169c6e35002fc
 SHA512:
-  metadata.gz: e2b932596006029a2125f5d58f92dc1b353dbeea24e72d459e8af5ab08b61d46a937f2d9f6812baa86b6820e58337c69306c17c2f4b9bd1290611f9862523911
-  data.tar.gz: ba5ebcf1adbe359f35e39e9612ea10b3877aec207c0bd1c6844738ca1d101a264990f01fbc9b9b7a719f9afa632921dc50073db76f000460dabf974a9100a227
+  metadata.gz: 8e22c3134f19065d761077b81f585f96839f35676dd8237b22ad3b48dd4f895ab1fd03df424b3b3d0fc1cc355e6a661890449b7872b6d5c156681386781869d9
+  data.tar.gz: 245620d939cd538fc3931ef79f6c615be59690c819e8d89a14a302c8c1590446852b7e20b2ae07ed26dc286d6ed62e510b5fa1ad263c31d9b8bcb3c1d028ec2f

data/lib/app_config.rb

@@ -23,7 +23,7 @@ class AppConfig
 
 	def load
 		config['environment']&.each do |key, value|
-			ENV[key] = value.to_s
+			ENV[key] = value.is_a?(Hash) || value.is_a?(Array) ? value.to_json : value.to_s
 		end
 	end
 

data/lib/builtins/background.rb

@@ -4,7 +4,6 @@ require 'builtin'
 
 module Builtins
 	class Background < Builtin
-		DEFAULT_SHELL = "bash"
 		DEFAULT_LOG_FILE_PREFIX = "/tmp/ops_bglog_"
 
 		class << self
@@ -13,18 +12,13 @@ module Builtins
 			end
 
 			def log_filename
-				"#{log_filename_prefix}#{Ops.project_name}"
-			end
-
-			private
-
-			def log_filename_prefix
-				Options.get("background.log_filename_prefix") || DEFAULT_LOG_FILE_PREFIX
+				Options.get("background.log_filename") || "#{DEFAULT_LOG_FILE_PREFIX}#{Ops.project_name}"
 			end
 		end
 
 		def run
 			subprocess = fork do
+				set_bglog_file_permissions
 				run_ops(args)
 			end
 
@@ -33,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
@@ -41,10 +39,6 @@ module Builtins
 
 			Ops.new(args).run
 		end
-
-		def shell
-			Options.get("background.shell") || DEFAULT_SHELL
-		end
 	end
 
 	# set an alias

data/lib/builtins/background_log.rb

@@ -18,7 +18,17 @@ module Builtins
 			end
 
 			Output.notice("Displaying background log '#{Background.log_filename}'...")
-			exec("tail #{args.join(' ')} '#{Background.log_filename}'")
+			display_file
+		end
+
+		private
+
+		def display_file
+			if args.any?
+				exec("tail #{args.join(' ')} '#{Background.log_filename}'")
+			else
+				exec("cat '#{Background.log_filename}'")
+			end
 		end
 	end
 

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

@@ -18,7 +18,7 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux"
+			`uname`.chomp == "Linux" && system("which apt-get &>/dev/null")
 		end
 
 		private

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,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.9.3'
+	s.version = '0.9.8'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2020-08-11'
+	s.date = '2020-08-12'
 	s.summary = 'ops_team handles basic operations tasks for your project, driven by YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf