takelage 0.29.6 → 0.29.8
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/takelage/default.yml +1 -0
- data/lib/takelage/docker/container/login.rb +11 -0
- data/lib/takelage/lib/system.rb +7 -0
- data/lib/takelage/version +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: e8837b042456b6e1babf826a7b04a1a3156c77c0bae985987c4653d1edf844bb
|
|
4
|
+
data.tar.gz: cd60992104d7730dd7688189142ef2567aa86ddcebf59aec2370e2adc0782154
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fb2c0d378aeb648f070c29d28697f8345e38f1fa3e973b1694d121eb2a28ffde56f7441c7d3110bd27eabc8c9bf6a11e636428ae37d266eb6eb874e1792543ae
|
|
7
|
+
data.tar.gz: a0783056a1011839f7779debd94782479364f5a28294ca97c3b951c18023bc1c945bcfa0e8840a760d7712cebb92251bb2d47a957ab033b524e08291ce478ccd
|
data/lib/takelage/default.yml
CHANGED
|
@@ -79,6 +79,7 @@ docker_user: 'takelage'
|
|
|
79
79
|
git_main_branch: 'main'
|
|
80
80
|
info_project_main: 'project.yml'
|
|
81
81
|
info_project_private: 'private/project.yml'
|
|
82
|
+
login_wait_for_sockets: '1'
|
|
82
83
|
mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
|
|
83
84
|
mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'
|
|
84
85
|
mutagen_socket_path_ssh: '~/.gnupg/S.gpg-agent.ssh'
|
|
@@ -12,6 +12,8 @@ module DockerContainerLogin
|
|
|
12
12
|
|
|
13
13
|
_docker_container_lib_start_sockets
|
|
14
14
|
|
|
15
|
+
_docker_container_wait_for_sockets
|
|
16
|
+
|
|
15
17
|
run_and_exit _docker_container_login_enter_container @hostname
|
|
16
18
|
end
|
|
17
19
|
|
|
@@ -31,4 +33,13 @@ module DockerContainerLogin
|
|
|
31
33
|
username: @username
|
|
32
34
|
)
|
|
33
35
|
end
|
|
36
|
+
|
|
37
|
+
# Wait for the sockets to come up
|
|
38
|
+
def _docker_container_wait_for_sockets
|
|
39
|
+
wait_for_sockets = config.active['login_wait_for_sockets'].to_i
|
|
40
|
+
return if wait_for_sockets.zero?
|
|
41
|
+
|
|
42
|
+
log.debug "Waiting for #{wait_for_sockets} #{pluralize(wait_for_sockets, 'second', 'seconds')}"
|
|
43
|
+
sleep wait_for_sockets
|
|
44
|
+
end
|
|
34
45
|
end
|
data/lib/takelage/lib/system.rb
CHANGED
|
@@ -162,5 +162,12 @@ module SystemModule
|
|
|
162
162
|
end
|
|
163
163
|
true
|
|
164
164
|
end
|
|
165
|
+
|
|
166
|
+
# Pluralize a verb in relation to a number
|
|
167
|
+
def pluralize(number, singular, plural)
|
|
168
|
+
return singular if number == 1
|
|
169
|
+
|
|
170
|
+
plural
|
|
171
|
+
end
|
|
165
172
|
end
|
|
166
173
|
# rubocop:enable Metrics/ModuleLength
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.29.
|
|
1
|
+
0.29.8
|