ops_team 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e320ffce54700e023fb48da06735086bcabac888b44dabb927db8e31aece1a
-  data.tar.gz: e44234004fb6c38f17d1f750b53273572928aad090798b3c79707129ef47a983
+  metadata.gz: a811c1178ce7f125d006e4a3839191446cf758bf24dd5b68d10e6778b4aa2927
+  data.tar.gz: 4b46a9a22a19f533d244c4442ab8c4bbb30479e04c09d4f40f65993faa7f4ea1
 SHA512:
-  metadata.gz: bb5ebb07a72f717d5b71089bd2159f70d7c2bd0718e380f8318dd6334277013089ed2f90535e9d94fe7098320cee40426338e98e0195d937a4dec6e649d92af3
-  data.tar.gz: 67fab9f3a7761ba133c43e3670c6e72ce0473d65333a5d1df734012d1521ae34a07af4fce803ab3ef8dd6c8df1c3a103c73a03bb83cb0a73705b7e4ffe9180bb
+  metadata.gz: 14117ab9417d99efc20ea08a0497504acdc7486704be02b96f65fe7da0719447dace894e8ee733261e9fd73b5cafe81199527aa37e4977cd818434e6517465be
+  data.tar.gz: 179c07999a87d8f43710ab22f1ffda3dd7a5776e56640324c1a4e175df36607fe904e0b2c15901e8c5e89eaba3a1a216157a6fb518e5aca6f64120061bb6dbc5

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,6 +1,8 @@
 # frozen_string_literal: true
 
 class Builtin
+	attr_reader :args, :config
+
 	class << self
 		def description
 			"no description"

data/lib/builtins/background.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+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
+		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 '#{log_file}'")
+			$stdout.sync = $stderr.sync = true
+			$stdout.reopen(log_file, "w")
+			$stderr.reopen($stdout)
+
+			Ops.new(args).run
+		end
+
+		def log_file
+			@log_file ||= "#{log_file_prefix}#{Ops.project_name}"
+		end
+
+		def log_file_prefix
+			Options.get("background.log_file_prefix") || DEFAULT_LOG_FILE_PREFIX
+		end
+
+		def shell
+			Options.get("background.shell") || DEFAULT_SHELL
+		end
+	end
+
+	# set an alias
+	Bg = Background
+end

data/lib/dependencies/sshkey.rb

@@ -21,7 +21,7 @@ module Dependencies
 			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? && ENV["SSH_AUTH_SOCK"]
+			add_key if success? && should_add_key?
 		end
 
 		def unmeet
@@ -35,24 +35,29 @@ module Dependencies
 		private
 
 		def generate_key
-			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+			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
 
 		def add_key
 			Net::SSH::Authentication::Agent.connect.add_identity(
 				unencrypted_key,
 				key_comment,
-				lifetime: key_lifetime
+				lifetime: opt_key_lifetime
 			)
 		end
 
+		def should_add_key?
+			ENV["SSH_AUTH_SOCK"] && opt_add_keys?
+		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
@@ -67,23 +72,40 @@ module Dependencies
 			"#{priv_key_name}.pub"
 		end
 
-		def key_size
+		def opt_key_size
 			Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
 		end
 
-		def key_algo
+		def opt_key_algo
 			DEFAULT_KEY_ALGO
 		end
 
 		def passphrase
-			`echo #{configured_passphrase}`.chomp
+			`echo #{opt_passphrase}`.chomp
+		end
+
+		def opt_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 configured_passphrase
-			Options.get("sshkey.passphrase")
+		def opt_add_keys?
+			Options.get("sshkey.add_keys").nil? ? true : Options.get("sshkey.add_keys")
 		end
 
-		def key_lifetime
+		def opt_key_lifetime
 			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
 		end
 	end

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]

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.8.6'
+	s.version = '0.9.0'
 	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.6
+  version: 0.9.0
 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,7 @@ files:
 - lib/action.rb
 - lib/app_config.rb
 - lib/builtin.rb
+- lib/builtins/background.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
 - lib/builtins/exec.rb