ops_team 1.20.2.pre.rc1 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 455f0e62f07bc41ac0ef70c79c622a3ae367bf1f73f3b903b63a8a7a7d29cef8
-  data.tar.gz: bc91912b9c30b81ce6f5afb615bb33d0f13f092dcdc20c3fa77ff2536167c421
+  metadata.gz: 6544a5e51d57b3cc01a3c8e0b1b8fab0adf6734be81dcad66154ca344e129e15
+  data.tar.gz: 855d1adc6a202256a761c4d09149444bb0bd775da479292c9f18dd32065a479c
 SHA512:
-  metadata.gz: 1b7ff635a4f099ef8ec0bea62b5ae18027520d6d45f9ce94807979741d5c73588dcd635165330fc771921a26a6068f57f8cf56802f457a78938cd780b37d3cc6
-  data.tar.gz: 6eabc65621b9e6e8fc2102a9eff392e1b1347e07e886c6142603de55aa7e610ff1099525cb19895db8901555a6e4fc56d05b69a6f3dc146e79c0ffff5c5cf963
+  metadata.gz: 12060be2f05b3eb3c346918a757be80cb220eef373871fc6c256a6ff262f7f1df8ca8d7915c120cdb141bbde507f30c93dd7d9c9b2b8d08c882b509e3cc5bea7
+  data.tar.gz: 5c8e7d7077493e8482a5691ec7b3894a23ec039a913ba01b808276017ec39f8d52726bb7bcd0e62f7d1f69d55d21e2f9d24dbc925908edd5ef80efa7a65250c6

data/lib/dependencies/sshkey.rb

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

data/lib/ops.rb

@@ -9,6 +9,8 @@ end
 Profiler.measure("ops:requires_internal") do
 end
 
+CONFIG_FILES = ["ops.yaml", "ops.yml"].freeze
+
 # executes commands based on local `ops.yml`
 class Ops
 	INVALID_SYNTAX_EXIT_CODE = 64
@@ -30,7 +32,7 @@ class Ops
 	def initialize(argv, config_file: nil)
 		@action_name = argv[0]
 		@args = argv[1..-1]
-		@config_file = config_file || "ops.yml"
+		@config_file = config_file || CONFIG_FILES.find { |file| File.exist?(file) } || "ops.yml"
 
 		Options.set(config["options"] || {})
 	end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.20.2-rc1'
+	s.version = '1.21.1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
 		'ops_team.gemspec'
 	]
 	s.executables << 'ops'
-	s.required_ruby_version = '> 2.5'
+	s.required_ruby_version = '> 2.6'
 	s.add_runtime_dependency 'bcrypt_pbkdf', '~> 1.0', '>= 1.0.1'
 	s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8.1'
 	s.add_runtime_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.7'
 	s.add_runtime_dependency 'ed25519', '~> 1.2', '>= 1.2.4'
 	s.add_runtime_dependency 'ejson', '~> 1.2', '>= 1.2.1'
-	s.add_runtime_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
+	s.add_runtime_dependency 'net-ssh', '~> 7.1', '>= 7.1.0'
 	s.add_runtime_dependency 'require_all', '~> 1.1', '>= 1.1.6'
 	s.add_runtime_dependency 'zeitwerk', '~> 2.5', '>= 2.5.3'
 	s.license = 'GPL-3.0-only'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.20.2.pre.rc1
+  version: 1.21.1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -116,20 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,6 @@ files:
 - Gemfile
 - bin/benchmark
 - bin/ops
-- bin/ops.orig
 - bin/print_config
 - bin/print_secrets
 - bin/tag
@@ -215,7 +214,6 @@ 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
@@ -247,14 +245,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting

data/bin/ops.orig

@@ -1,42 +0,0 @@
-#!/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

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