takelage 0.28.24 → 0.28.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a283a1e76877049cf7645c703c6bf2b17dcc3c7c13c1a5cac363441202f91b1
-  data.tar.gz: a53eb5c037d97b88d99e8bc4b9e9d5db17a2eb30b15fa993ac6a70924d5f9a36
+  metadata.gz: c5b24cafbddb28d0bc465c9b464a02d6d08c14639dfe5c58cc891828680143dc
+  data.tar.gz: 7743c6e2f629e35838820ab439c72a6b659c674f852fe7a114e9016d771011af
 SHA512:
-  metadata.gz: '05921e675c4136d159cf1e3e4e3774ea0e39a23bd4add0d4a0ce955b6e34806577ab63ddc9d14797799439e4abdde303b86471ef94c6a98ad24e196194e65416'
-  data.tar.gz: f0eb22800596daaefc3e6a8b2ccd9ea8df1d17e3ec547165bd795c98eedf06f02f310339406d6afb0164390b4fed7c88bc4b8b804b8f13c0db68f9665e33f3aa
+  metadata.gz: 4135b0857fbbff72ce697309745232b1433352cd7b3a884486044aa761b9a66f15b29ab896a5406cabab35c1b8c941fed2c91c0d2344bd604cbde99ef22fbb5f
+  data.tar.gz: 773c9fdfa99690acc118f837ddbdc343e51f1962f05bd740c312ae7b125713734eb1b591c2f411499f76728e009bc4b175ec128747319a53b614ff88b5c7e071

data/lib/takelage/lib/system.rb

@@ -77,6 +77,19 @@ module SystemModule
     stdout_str
   end
 
+  # Run a command and return the standard output
+  # the standard error and the exit status
+  # @return [[String, String, Integer]] array of
+  # stdout, stderr, exitstatus of command
+  def run_and_capture(command)
+    log.debug "Running amd capturing command \"#{command}\""
+    stdout_str, stderr_str, status = Open3.capture3 command
+    log.debug "Command \"#{command}\" has stdout:\n\"\"\"\n#{stdout_str}\"\"\""
+    log.debug "Command \"#{command}\" has stderr:\n\"\"\"\n#{stderr_str}\"\"\""
+    log.debug "Command \"#{command}\" has exit status: \"#{status.exitstatus}\""
+    [stdout_str, stderr_str, status.exitstatus]
+  end
+
   # Use Kernel#exec to replace the ruby process with a command.
   def run_and_exit(command)
     log.debug "Running command \"#{command}\" and exiting afterwards"

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

@@ -41,14 +41,28 @@ module MutagenCheckDaemon
   private
 
   # Check mutagen host connection
+  # rubocop:disable Metrics/MethodLength
   def _mutagen_check_daemon_host_connection
     check_host_connection = format(
       config.active['cmd_mutagen_check_daemon_host_connection'],
       hostlabel: @hostlabel
     )
-    host_connection = try check_host_connection
-    host_connection.exitstatus.zero?
+    stdout, _, exitstatus = run_and_capture check_host_connection
+
+    unless exitstatus.zero?
+      log.debug 'There is no mutagen forward connection to the host'
+      return false
+    end
+
+    unless stdout.include? 'Status: Forwarding connections'
+      log.debug 'The mutagen forward connection to the host ' \
+        'is not forwarding connections'
+      return false
+    end
+
+    true
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Check mutagen version
   def _mutagen_check_daemon_version

data/lib/takelage/version

@@ -1 +1 @@
-0.28.24
+0.28.26

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.24
+  version: 0.28.26
 platform: ruby
 authors:
 - Geospin