ops_team 0.8.7 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d595d1f23daf3cab0833a010f9fc99feadaee8fe63e5f98f6a6943b7e39db0f0
-  data.tar.gz: af36bed405ec7982a89e6d4837098ccb92d227d37a6beba086dc0b7e33ab33c2
+  metadata.gz: 70498a1ccc87cf4bf2ddd7ad29028785f02d8dc5a6c8ea44f181a1db5d8e8fea
+  data.tar.gz: e43c220a41cf3956c14bc077ead9abf64f5502960ad46c6c49915a3a51a4b76d
 SHA512:
-  metadata.gz: d50db908a70f94f1d3db693856dc664900386e95c33c90a77aedc8766c8e1b33d72d742668230dcf2c2b546ecee132e8320c6c9fa58df02065fb43a134b3364b
-  data.tar.gz: 88b9e6bb4410fe491673ec101a65d48b7f51746682e55dea06ba2747a250b0ba1fdb23849171b3a17ac2fd3690331fb5155463edad23451fcdd5f00ef2ad049c
+  metadata.gz: be7def6a15311c5bed82a39b898a22d9aaeacd7058abecd1cdea47cef341439b78af9c9271cccf8ecdf5f9445c6be1d8fb76d44650a18654e0b22dd69b64dbd7
+  data.tar.gz: ad1cb8908108aae55c985b8b513421ad4669143a40a79db2fa064c1f4b07615b82fc736af36d766432204f459bd0cc467af8fa8743b8ff3c03b5af9aa4f259b5

data/lib/action.rb

@@ -17,7 +17,7 @@ class Action
 	end
 
 	def to_s
-		"#{command} #{@args.join(' ')}"
+		"#{command} #{@args.join(' ')}".strip
 	end
 
 	def alias

data/lib/builtin.rb

@@ -1,10 +1,22 @@
 # frozen_string_literal: true
 
 class Builtin
+	attr_reader :args, :config
+
 	class << self
 		def description
 			"no description"
 		end
+
+		def class_for(name:)
+			Builtins.const_get(builtin_class_name_for(name: name), false)
+		end
+
+		private
+
+		def builtin_class_name_for(name:)
+			name.capitalize.to_sym
+		end
 	end
 
 	def initialize(args, config)

data/lib/builtins/background.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'builtin'
+
+module Builtins
+	class Background < Builtin
+		DEFAULT_SHELL = "bash"
+		DEFAULT_LOG_FILE_PREFIX = "/tmp/ops_bglog_"
+
+		class << self
+			def description
+				"runs the given command in a background session"
+			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
+			end
+		end
+
+		def run
+			subprocess = fork do
+				run_ops(args)
+			end
+
+			Process.detach(subprocess)
+		end
+
+		private
+
+		def run_ops(args)
+			Output.warn("Running '#{args.join(' ')}' with stderr and stdout redirected to '#{Background.log_filename}'")
+			$stdout.sync = $stderr.sync = true
+			$stdout.reopen(Background.log_filename, "w")
+			$stderr.reopen($stdout)
+
+			Ops.new(args).run
+		end
+
+		def shell
+			Options.get("background.shell") || DEFAULT_SHELL
+		end
+	end
+
+	# set an alias
+	Bg = Background
+end

data/lib/builtins/background_log.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'builtin'
+require 'builtins/background'
+
+module Builtins
+	class BackgroundLog < Builtin
+		class << self
+			def description
+				"displays the log from the current or most recent background task from this project"
+			end
+		end
+
+		def run
+			unless File.exist?(Background.log_filename)
+				Output.warn("No background log found at '#{Background.log_filename}'.")
+				return 0
+			end
+
+			Output.notice("Displaying background log '#{Background.log_filename}'...")
+			exec("tail #{args.join(' ')} '#{Background.log_filename}'")
+		end
+	end
+
+	# set an alias
+	Bglog = BackgroundLog
+end

data/lib/dependencies/sshkey.rb

@@ -35,6 +35,8 @@ 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
 
@@ -51,12 +53,11 @@ module Dependencies
 		end
 
 		def unencrypted_key
-			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase)
+			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase.empty? ? nil : passphrase)
 		end
 
 		def key_comment
-			# the current directory is usually named for the project
-			File.basename(::Dir.pwd)
+			Ops.project_name
 		end
 
 		def dir_name
@@ -84,7 +85,20 @@ module Dependencies
 		end
 
 		def opt_passphrase
-			Options.get("sshkey.passphrase")
+			@opt_passphrase ||= begin
+				return "$#{Options.get('sshkey.passphrase_var')}" if Options.get("sshkey.passphrase_var")
+
+				output_passphrase_warning if Options.get("sshkey.passphrase")
+
+				Options.get("sshkey.passphrase")
+			end
+		end
+
+		def output_passphrase_warning
+			Output.warn(
+				"\n'options.sshkey.passphrase' is deprecated and will be removed in a future release. " \
+				"Use 'options.sshkey.passphrase_var' instead."
+			)
 		end
 
 		def opt_add_keys?

data/lib/ops.rb

@@ -19,6 +19,12 @@ class Ops
 	INVALID_SYNTAX_EXIT_CODE = 64
 	UNKNOWN_ACTION_EXIT_CODE = 65
 
+	class << self
+		def project_name
+			File.basename(::Dir.pwd)
+		end
+	end
+
 	def initialize(argv)
 		@action_name = argv[0]
 		@args = argv[1..-1]
@@ -58,16 +64,12 @@ class Ops
 	end
 
 	def builtin
-		@builtin ||= Builtins.const_get(builtin_class_name, false).new(@args, config)
+		@builtin ||= Builtin.class_for(name: @action_name).new(@args, config)
 	rescue NameError
 		# this means there isn't a builtin with that name in that module
 		nil
 	end
 
-	def builtin_class_name
-		@action_name.capitalize.to_sym
-	end
-
 	def action
 		return actions[@action_name] if actions[@action_name]
 		return aliases[@action_name] if aliases[@action_name]

data/lib/output.rb

@@ -40,6 +40,8 @@ class Output
 			@err.puts(msg.yellow)
 		end
 
+		alias_method :notice, :warn
+
 		def error(msg)
 			@err.puts(msg.red)
 		end

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.8.7'
+	s.version = '0.9.1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2020-05-29'
+	s.date = '2020-08-11'
 	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.8.7
+  version: 0.9.1
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -148,6 +148,8 @@ files:
 - lib/action.rb
 - lib/app_config.rb
 - lib/builtin.rb
+- lib/builtins/background.rb
+- lib/builtins/background_log.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
 - lib/builtins/exec.rb