ops_team 0.8.2 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c91d50eeddf170724b335ec23089f3f5a452507f034e1edb8d9bce7fe419976
-  data.tar.gz: 9fa1b82f605e2342cfe01e6127849c41bae745ff68464afcb294f0796e5b9b82
+  metadata.gz: 5d627dbbdad038718bd7fce64f99d37830b7e0c8ba7b6214fa0f4639e1997d1a
+  data.tar.gz: 213ca817d96f52c6666745b9ba4312a7ef97baa019e4176c1216b9f263ac5c37
 SHA512:
-  metadata.gz: b1e9b52dcbcc50975dd2dd9e5369d4e1134822a7837a1132994c296fe32021c339d1457a1d9e92bbb6fdc5daa0581b761a13ce0f04ba92138821e41161f45209
-  data.tar.gz: 7b94c375bb4a1614aff89cbe83a530864b9c9aff8d597a0945fb499629833ff8dd099eb986df610d458a3a009d6ea00ac1eaf6c9c92e063892c15ee0290810d5
+  metadata.gz: 1ffdb94e555112eed03b2f2ec6b9bb945e5ee97a89d4ec353279763a599599d0a97f36c2c6496674588af95392322732b7cbea94ddee2ed00915d4b3f02d9efe
+  data.tar.gz: 0f1fdbbcbd13fbeebfe8a4e32c99bc5885140b244e47c3b7e1c910768efea8875e4cbb7d93219eafb1d8ca6fcbed9b0d77da7c9782d951c37ba22f8847abd9cf

data/Gemfile

@@ -7,6 +7,7 @@ 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"
 

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

@@ -8,7 +8,7 @@ module Dependencies
 	class Sshkey < Dependency
 		DEFAULT_KEY_SIZE = 2048
 		DEFAULT_KEY_ALGO = "rsa"
-		DEFAULT_KEY_LIFETIME_S = 600
+		DEFAULT_KEY_LIFETIME_S = 3600
 
 		def met?
 			# we always need to at least update the key lifetime in the agent
@@ -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,19 +35,28 @@ module Dependencies
 		private
 
 		def generate_key
-			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+			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,
-				"ops",
-				lifetime: key_lifetime
+				key_comment,
+				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)
 		end
 
 		def dir_name
@@ -62,23 +71,27 @@ 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 configured_passphrase
+		def opt_passphrase
 			Options.get("sshkey.passphrase")
 		end
 
-		def key_lifetime
+		def opt_add_keys?
+			Options.get("sshkey.add_keys").nil? ? true : Options.get("sshkey.add_keys")
+		end
+
+		def opt_key_lifetime
 			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
 		end
 	end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.8.2'
+	s.version = '0.8.8'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 	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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.8
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -70,6 +70,26 @@ dependencies:
     - - ">="
       - !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