ops_team 0.8.6 → 0.8.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dependencies/sshkey.rb +16 -8
- data/ops_team.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d595d1f23daf3cab0833a010f9fc99feadaee8fe63e5f98f6a6943b7e39db0f0
|
|
4
|
+
data.tar.gz: af36bed405ec7982a89e6d4837098ccb92d227d37a6beba086dc0b7e33ab33c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d50db908a70f94f1d3db693856dc664900386e95c33c90a77aedc8766c8e1b33d72d742668230dcf2c2b546ecee132e8320c6c9fa58df02065fb43a134b3364b
|
|
7
|
+
data.tar.gz: 88b9e6bb4410fe491673ec101a65d48b7f51746682e55dea06ba2747a250b0ba1fdb23849171b3a17ac2fd3690331fb5155463edad23451fcdd5f00ef2ad049c
|
data/lib/dependencies/sshkey.rb
CHANGED
|
@@ -21,7 +21,7 @@ module Dependencies
|
|
|
21
21
|
FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
|
|
22
22
|
|
|
23
23
|
generate_key unless File.exist?(priv_key_name) && File.exist?(pub_key_name)
|
|
24
|
-
add_key if success? &&
|
|
24
|
+
add_key if success? && should_add_key?
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
def unmeet
|
|
@@ -35,17 +35,21 @@ module Dependencies
|
|
|
35
35
|
private
|
|
36
36
|
|
|
37
37
|
def generate_key
|
|
38
|
-
execute("ssh-keygen -b #{
|
|
38
|
+
execute("ssh-keygen -b #{opt_key_size} -t #{opt_key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
def add_key
|
|
42
42
|
Net::SSH::Authentication::Agent.connect.add_identity(
|
|
43
43
|
unencrypted_key,
|
|
44
44
|
key_comment,
|
|
45
|
-
lifetime:
|
|
45
|
+
lifetime: opt_key_lifetime
|
|
46
46
|
)
|
|
47
47
|
end
|
|
48
48
|
|
|
49
|
+
def should_add_key?
|
|
50
|
+
ENV["SSH_AUTH_SOCK"] && opt_add_keys?
|
|
51
|
+
end
|
|
52
|
+
|
|
49
53
|
def unencrypted_key
|
|
50
54
|
Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase)
|
|
51
55
|
end
|
|
@@ -67,23 +71,27 @@ module Dependencies
|
|
|
67
71
|
"#{priv_key_name}.pub"
|
|
68
72
|
end
|
|
69
73
|
|
|
70
|
-
def
|
|
74
|
+
def opt_key_size
|
|
71
75
|
Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
|
|
72
76
|
end
|
|
73
77
|
|
|
74
|
-
def
|
|
78
|
+
def opt_key_algo
|
|
75
79
|
DEFAULT_KEY_ALGO
|
|
76
80
|
end
|
|
77
81
|
|
|
78
82
|
def passphrase
|
|
79
|
-
`echo #{
|
|
83
|
+
`echo #{opt_passphrase}`.chomp
|
|
80
84
|
end
|
|
81
85
|
|
|
82
|
-
def
|
|
86
|
+
def opt_passphrase
|
|
83
87
|
Options.get("sshkey.passphrase")
|
|
84
88
|
end
|
|
85
89
|
|
|
86
|
-
def
|
|
90
|
+
def opt_add_keys?
|
|
91
|
+
Options.get("sshkey.add_keys").nil? ? true : Options.get("sshkey.add_keys")
|
|
92
|
+
end
|
|
93
|
+
|
|
94
|
+
def opt_key_lifetime
|
|
87
95
|
Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
|
|
88
96
|
end
|
|
89
97
|
end
|
data/ops_team.gemspec
CHANGED