takeltau 0.39.2 → 0.39.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efcd37beaf72d26ec96d9036cec64b14150b2b1b3685d30842aa3843ccb29b1e
-  data.tar.gz: 5018c78c0dd215eeb8a49b17c58e1230ed697957d1188fb2abdf33e906c3f219
+  metadata.gz: de458afdf25146dfd853ae114f68ca7b56679c67b1ecb7c35d30fbafdb9abf46
+  data.tar.gz: b166842a3d716b32bd124aadb269dddee042762a181a9f7823a9d2c5bb024481
 SHA512:
-  metadata.gz: 6052b700a56b6c15f8c1c980a97ab47f10b33b9403f3266920f8aaa232b0dcb0a5db921df9863089b5f5440a7816c120b8169ff2be7b6306aed213562fa9acb5
-  data.tar.gz: a644c2d3082c2b1a6ed8a0ace6ce05e7b2bfbf327d7b118fd8201a668644e15c3791002edcd874bb0c98f467cceb699dc87dcbf2f3af8a4fd89e9b56c643054f
+  metadata.gz: 271eab2c47e35b5e9fc7241704b5f284a8530e4045465e40d8aa702dc2b419127990a177f7d47915486c45ffed407d6d71cb04219ac6a0139a3755ab27f13728
+  data.tar.gz: 8e40d72413de18a46f116888dbe606fcb6364424770c83f8e760593de1deedc525e39e6e1968a94d8953a413e3784f6cf38c6a48b4a5aef716ebab520a2fdea5

data/lib/takeltau/default.yml

@@ -46,7 +46,7 @@ cmd_init_lib_git_commit_initial: 'git commit -m "Initial commit"'
 cmd_init_lib_hg_clone: 'bash hgclone'
 cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
-cmd_mutagen_check_daemon_version: 'mutagen version'
+cmd_mutagen_check_daemon_start_daemon: 'mutagen daemon start'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
 cmd_mutagen_forward_socket_docker: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --socket-group-source=docker --socket-permission-mode=0660 docker://root@%{container}:unix:/var/run/docker.sock unix:%{hostsock}'
 cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'

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

@@ -5,17 +5,21 @@ 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
 
     log.debug 'Check mutagen status'
 
-    return false unless _mutagen_check_check_prerequisites
+    unless _mutagen_check_daemon_start
+      log.error 'The mutagen daemon cannot be started'
+      return false
+    end
 
     # are we outside of a takelage container?
     unless _docker_container_lib_check_matrjoschka
-      unless _mutagen_check_daemon_version
-        log.error 'The mutagen daemon is not available'
+      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
 
@@ -24,6 +28,11 @@ module MutagenCheckDaemon
       return true
     end
 
+    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 _mutagen_check_daemon_host_connection
       log.error 'A mutagen host connection is not available'
       return false
@@ -37,21 +46,6 @@ module MutagenCheckDaemon
 
   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
@@ -74,11 +68,12 @@ module MutagenCheckDaemon
 
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
-  # Check mutagen version
-  def _mutagen_check_daemon_version
-    version = try config.active['cmd_mutagen_check_daemon_version']
-    version.exitstatus.zero?
+  # Start mutagen daemon
+  def _mutagen_check_daemon_start
+    start = try config.active['cmd_mutagen_check_daemon_start_daemon']
+    start.exitstatus.zero?
   end
 end

data/lib/takeltau/version

@@ -1 +1 @@
-0.39.2
+0.39.7

metadata

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