takeltau 0.37.1 → 0.37.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293a71b537a49394f198b0a1479285f57e43d899ccaffdcf64f18e91a95a4445
-  data.tar.gz: 00e04f3a868ac61e81660b4e37e74a83d055c72d591ca53be88e04c48b32e488
+  metadata.gz: 6e297c80af53f6afcb49ac3728e6c5833a53fdbaf745d1df9f2cc024da99a87e
+  data.tar.gz: 29593c7d300c8f960292a9527a778421a41a3b7bea203da4ec6acc25eac7113a
 SHA512:
-  metadata.gz: 4f259593b1df8171bcd2400ba152a55c430b3c535e8c8f5abe6cbc3e66c4484947e32472d0ff612e848f0429ee96424306329f0a7abc063f116c9610396fb628
-  data.tar.gz: b71b36fcba29683483fa39e35e46293dac09c61c6b1603977605ab0eacf16eefe12867058160544ac21774b05a0f34b95c24baf7b915c18530a60cebb3fe3dcc
+  metadata.gz: 54d2ce13da764a2d7fa40c344ef139605eafc5e1d6559fdaeb7dea38ff9702b7f57fa99a7c520469dac89f55800aaf2c284fc014f0735ff920dde3397a639867
+  data.tar.gz: 0f4d384cfaba7ccb214cfb6a0e780f662703706e706898858a6663257f9d1af3d26cab3daf24b172d583b89936d32b8f44b0d33ff3aed86b81705e6663673d9b

data/lib/takeltau/default.yml

@@ -64,7 +64,10 @@ git_hg_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'
-mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
-mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'
-mutagen_socket_path_ssh: '~/.gnupg/S.gpg-agent.ssh'
+mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
+mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
 mutagen_socket_takelage_label: 'type=takelage'

data/lib/takeltau/docker/container/cli.rb

@@ -40,9 +40,12 @@ module Takeltau
       @hostname = _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"
       @takellabel = config.active['mutagen_socket_takelage_label']
-      @mutagensock = config.active['mutagen_socket_path_mutagen']
-      @gpgsock = config.active['mutagen_socket_path_gpg']
-      @sshsock = config.active['mutagen_socket_path_ssh']
+      @mutagensock_container = config.active['mutagen_socket_path_mutagen_container']
+      @mutagensock_host = config.active['mutagen_socket_path_mutagen_host']
+      @gpgsock_container = config.active['mutagen_socket_path_gpg_container']
+      @gpgsock_host = config.active['mutagen_socket_path_gpg_host']
+      @sshsock_container = config.active['mutagen_socket_path_ssh_container']
+      @sshsock_host = config.active['mutagen_socket_path_ssh_host']
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize

data/lib/takeltau/docker/container/lib.rb

@@ -10,9 +10,9 @@ module DockerContainerLib
   def _docker_container_lib_start_sockets
     return false unless mutagen_check_daemon
 
-    mutagen_socket_create 'mutagen', @mutagensock, @mutagensock
-    mutagen_socket_create 'gpg', @gpgsock, @gpgsock
-    mutagen_socket_create 'ssh', @sshsock, @sshsock
+    mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
+    mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host
+    mutagen_socket_create 'ssh', @sshsock_container, @sshsock_host
   end
 
   # Create unique docker hostname

data/lib/takeltau/mutagen/check/daemon.rb

@@ -5,14 +5,13 @@ module MutagenCheckDaemon
   # Backend method for mutagen check daemon.
   # @return [Boolean] is mutagen available?
   # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def mutagen_check_daemon
     return true if @mutagen_daemon_available
 
-    return false unless command_available_else_warn? config.active['cmd_mutagen']
-
     log.debug 'Check mutagen status'
 
+    return false unless _mutagen_check_check_prerequisites
+
     # are we outside of a takelage container?
     unless _docker_container_lib_check_matrjoschka
       unless _mutagen_check_daemon_version
@@ -25,11 +24,6 @@ module MutagenCheckDaemon
       return true
     end
 
-    unless _file_exists? config.active['mutagen_socket_path_mutagen']
-      log.error 'The mutagen socket is not available'
-      return false
-    end
-
     unless _mutagen_check_daemon_host_connection
       log.error 'A mutagen host connection is not available'
       return false
@@ -39,11 +33,25 @@ module MutagenCheckDaemon
     @mutagen_daemon_available = true
     true
   end
-  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
 
+  # Check mutagen prerequisites
+  def _mutagen_check_check_prerequisites
+    unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
+      log.error 'The mutagen socket path in the container is not available'
+      return false
+    end
+
+    unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
+      log.error 'The mutagen socket path on the host is not available'
+      return false
+    end
+
+    command_available_else_error? config.active['cmd_mutagen']
+  end
+
   # Check mutagen host connection
   # rubocop:disable Metrics/MethodLength
   def _mutagen_check_daemon_host_connection

data/lib/takeltau/version

@@ -1 +1 @@
-0.37.1
+0.37.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.37.3
 platform: ruby
 authors:
 - Takelwerk