ops_team 0.7.0 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011b0f2a12af0a58c9b48f53d2dd59b9a753eab0acd221ee2675c296c7b109d0
-  data.tar.gz: 157963863ac30030921804a37f57ab332502ba465ac9c4ea139b18a297f0618e
+  metadata.gz: 75e320ffce54700e023fb48da06735086bcabac888b44dabb927db8e31aece1a
+  data.tar.gz: e44234004fb6c38f17d1f750b53273572928aad090798b3c79707129ef47a983
 SHA512:
-  metadata.gz: 9ce81eacd3adb1f7416a96adeabc38b244919ef8e8b17b349cea60e21a68535cc7aaeca57d8af1fb9fb1a03f7b94e98d423f018c2ecd2e9a4da556234ea64f65
-  data.tar.gz: 0e0b772bdd70841e197079c93124f53a0d61ea8558add16a4b89e2e7340a1dbeba58222a3631165c03ed3ea35c85c7c596f9834aa0ba3e0445196b27b35e3f41
+  metadata.gz: bb5ebb07a72f717d5b71089bd2159f70d7c2bd0718e380f8318dd6334277013089ed2f90535e9d94fe7098320cee40426338e98e0195d937a4dec6e649d92af3
+  data.tar.gz: 67fab9f3a7761ba133c43e3670c6e72ce0473d65333a5d1df734012d1521ae34a07af4fce803ab3ef8dd6c8df1c3a103c73a03bb83cb0a73705b7e4ffe9180bb

data/Gemfile

@@ -4,7 +4,11 @@ source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
+gem "bcrypt_pbkdf"
 gem "colorize"
+gem "ed25519"
+gem "ejson"
+gem "net-ssh"
 gem "require_all"
 
 group :test do

data/lib/builtins/up.rb

@@ -29,7 +29,7 @@ module Builtins
 		def meet_dependencies
 			dependency_handler.dependencies.each do |dependency|
 				# don't even output anything for dependencies that shouldn't be considered on this machine
-				next unless dependency.should_meet?
+				next unless dependency&.should_meet?
 
 				Output.status("[#{dependency.type}] #{dependency.name}")
 

data/lib/dependencies/apt.rb

@@ -9,7 +9,7 @@ module Dependencies
 		end
 
 		def meet
-			execute("#{sudo_string}#{meet_command}")
+			execute("#{sudo_string}apt-get install -y #{name}")
 		end
 
 		def unmeet
@@ -28,9 +28,5 @@ module Dependencies
 
 			"sudo "
 		end
-
-		def meet_command
-			"apt-get install -y #{name}"
-		end
 	end
 end

data/lib/dependencies/dir.rb

@@ -9,7 +9,7 @@ module Dependencies
 		end
 
 		def meet
-			execute("mkdir #{name}")
+			execute("mkdir -p #{name}")
 		end
 
 		def unmeet

data/lib/dependencies/sshkey.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'net/ssh'
+
+require 'dependency'
+
+module Dependencies
+	class Sshkey < Dependency
+		DEFAULT_KEY_SIZE = 2048
+		DEFAULT_KEY_ALGO = "rsa"
+		DEFAULT_KEY_LIFETIME_S = 3600
+
+		def met?
+			# we always need to at least update the key lifetime in the agent
+			false
+		end
+
+		def meet
+			Secrets.load
+
+			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"]
+		end
+
+		def unmeet
+			true
+		end
+
+		def should_meet?
+			true
+		end
+
+		private
+
+		def generate_key
+			execute("ssh-keygen -b #{key_size} -t #{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
+			)
+		end
+
+		def unencrypted_key
+			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase)
+		end
+
+		def key_comment
+			# the current directory is usually named for the project
+			File.basename(::Dir.pwd)
+		end
+
+		def dir_name
+			`echo #{File.dirname(name)}`.chomp
+		end
+
+		def priv_key_name
+			`echo #{name}`.chomp
+		end
+
+		def pub_key_name
+			"#{priv_key_name}.pub"
+		end
+
+		def key_size
+			Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
+		end
+
+		def key_algo
+			DEFAULT_KEY_ALGO
+		end
+
+		def passphrase
+			`echo #{configured_passphrase}`.chomp
+		end
+
+		def configured_passphrase
+			Options.get("sshkey.passphrase")
+		end
+
+		def key_lifetime
+			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
+		end
+	end
+end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.7.0'
+	s.version = '0.8.6'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -22,7 +22,11 @@ Gem::Specification.new do |s|
 	]
 	s.executables << 'ops'
 	s.required_ruby_version = '~> 2.5'
+	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 '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 'require_all', '~> 1.1', '>= 1.1.6'
 	s.license = 'GPL-3.0-only'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.6
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -10,6 +10,26 @@ bindir: bin
 cert_chain: []
 date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +50,66 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: ejson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +164,7 @@ files:
 - lib/dependencies/dir.rb
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
+- lib/dependencies/sshkey.rb
 - lib/dependency.rb
 - lib/environment.rb
 - lib/ops.rb