ops_team 1.20.0 → 1.20.2.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e3e7c3b99af394b1eb19ee35cc137cfde7a883a4236a56d2fb0010564b3d2d
-  data.tar.gz: 7765ee48f6a6e38e9443a8926354f7a126b817ad09b937ff0adad839e458a0d6
+  metadata.gz: 455f0e62f07bc41ac0ef70c79c622a3ae367bf1f73f3b903b63a8a7a7d29cef8
+  data.tar.gz: bc91912b9c30b81ce6f5afb615bb33d0f13f092dcdc20c3fa77ff2536167c421
 SHA512:
-  metadata.gz: b2aa262433e8a724f8255c42c3a5929baae08752029aeb3c80302105b4bb472113cafe2216db1ea86af54d238102eed0c27459b38d34aab34970b79dced5ce68
-  data.tar.gz: f1d3572c52f15e3ac504871617b60e992ad25a57545e50444f9409faa2a3371b883c731e6c4ec462b928cdfd50a8c46c4123110e44f25435f290a3c5bebf1142
+  metadata.gz: 1b7ff635a4f099ef8ec0bea62b5ae18027520d6d45f9ce94807979741d5c73588dcd635165330fc771921a26a6068f57f8cf56802f457a78938cd780b37d3cc6
+  data.tar.gz: 6eabc65621b9e6e8fc2102a9eff392e1b1347e07e886c6142603de55aa7e610ff1099525cb19895db8901555a6e4fc56d05b69a6f3dc146e79c0ffff5c5cf963

data/bin/ops.orig

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+require_relative '../lib/profiler'
+require 'optparse'
+
+def usage
+	puts "Usage: ops [-f|--file <ops_yml>] action [<action args>"
+	puts "  ops_yml:      the config file to load instead of './ops.yml'"
+	puts "  action_args:  arguments to the action loaded from the config file; depends on the action"
+
+	exit(1)
+end
+
+options = {}
+status = -1
+
+while ARGV[0]&.match(/^-/)
+	opt = ARGV.shift
+	case opt
+	when '-f', '--file'
+		usage unless ARGV.length >= 1
+
+		options[:file] = ARGV.shift
+	else
+		usage
+	end
+end
+
+Profiler.measure("bin:require") do
+	require_relative "../loader"
+end
+
+Profiler.measure("bin:run") do
+	status = Ops.new(ARGV, config_file: options[:file]).run
+end
+
+Profiler.add_measurement("bin:all", Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time)
+Output.error(Profiler.summary) if Profiler.summary
+exit status

data/lib/dependencies/helpers/ssh_key_decryptor.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "tempfile"
+
+module Dependencies
+	module Helpers
+		class SshKeyDecryptor
+			def initialize(source_key_path, passphrase)
+				@source_key_path = source_key_path
+				@passphrase = passphrase
+			end
+
+			def plaintext_key
+				@plaintext_key ||= begin
+					plaintext = decrypt_key
+
+					File.delete(temp_key_file.path)
+
+					plaintext
+				end
+			end
+
+			private
+
+			def temp_key_file
+				@temp_key_file ||= Tempfile.new("ops")
+			end
+
+			def decrypt_key
+				FileUtils.cp(@source_key_path, temp_key_file.path)
+				`ssh-keygen -f '#{temp_key_file.path}' -p -P '#{@passphrase}' </dev/null`
+
+				File.read(temp_key_file.path)
+			end
+		end
+	end
+end

data/lib/dependencies/sshkey.rb

@@ -54,7 +54,11 @@ module Dependencies
 		end
 
 		def unencrypted_key
-			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase.empty? ? nil : passphrase)
+			Net::SSH::KeyFactory.load_data_private_key(decryptor.plaintext_key, nil)
+		end
+
+		def decryptor
+			@decryptor ||= Helpers::SshKeyDecryptor.new(priv_key_name, passphrase)
 		end
 
 		def key_comment

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.20.0'
+	s.version = '1.20.2-rc1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.20.2.pre.rc1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -180,6 +180,7 @@ files:
 - Gemfile
 - bin/benchmark
 - bin/ops
+- bin/ops.orig
 - bin/print_config
 - bin/print_secrets
 - bin/tag
@@ -214,6 +215,7 @@ files:
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
 - lib/dependencies/helpers/apt_cache_policy.rb
+- lib/dependencies/helpers/ssh_key_decryptor.rb
 - lib/dependencies/pip.rb
 - lib/dependencies/snap.rb
 - lib/dependencies/sshkey.rb
@@ -248,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: