takelage 0.28.7 → 0.28.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13748db4d561a884f90dcf21e4f43296fcaec2377ebb602b0407139d6218986
-  data.tar.gz: e0c2075cc8fab7ab3057477baaee7fe2aa3f4304c139b38f1ab6432f9adf4366
+  metadata.gz: c5b24cafbddb28d0bc465c9b464a02d6d08c14639dfe5c58cc891828680143dc
+  data.tar.gz: 7743c6e2f629e35838820ab439c72a6b659c674f852fe7a114e9016d771011af
 SHA512:
-  metadata.gz: 1b7ac8428fa4c5f4278f58c9ae26a77656c967503d7a10c8bfe892aca274d32129cfb81a40a2434126940b52f0756a93a6c6c01a6a18ba21c98306f8eda1ab92
-  data.tar.gz: ae774fe3212f1712097c6476f186e1cdff6ee63f043aeec7d4b29b4862e75ecf3c4251cac00ecb83677dbaf71e01dc7ebb202947f5c6a7a704792ac93865e4da
+  metadata.gz: 4135b0857fbbff72ce697309745232b1433352cd7b3a884486044aa761b9a66f15b29ab896a5406cabab35c1b8c941fed2c91c0d2344bd604cbde99ef22fbb5f
+  data.tar.gz: 773c9fdfa99690acc118f837ddbdc343e51f1962f05bd740c312ae7b125713734eb1b591c2f411499f76728e009bc4b175ec128747319a53b614ff88b5c7e071

data/README.md

@@ -78,7 +78,6 @@ tau [bit scope list](features/cucumber/features/bit/bit.scope.list.feature) | Li
 tau [bit scope new](features/cucumber/features/bit/bit.scope.new.feature) [SCOPE] | Init a new bit [SCOPE]
 tau [completion bash](features/cucumber/features/completion/completion.bash.feature) | Print bash completion code
 tau [docker check daemon](features/cucumber/features/docker/docker.check.daemon.feature) | Check if docker daemon is running
-tau [docker check socat](features/cucumber/features/docker/docker.check.socat.feature) | Check if socat command is available
 tau [docker container check existing](features/cucumber/features/docker/docker.container.check.existing.feature) [CONTAINER] | Check if docker [CONTAINER] is existing
 tau [docker container check network](features/cucumber/features/docker/docker.container.check.network.feature) [NETWORK] | Check if docker [NETWORK] is existing
 tau [docker container check orphaned](features/cucumber/features/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned
@@ -106,10 +105,13 @@ tau [info status bar](features/cucumber/features/info/info.status.bar.feature) |
 tau [info status git](features/cucumber/features/info/info.status.git.feature) | Check git status
 tau [info status gopass](features/cucumber/features/info/info.status.gopass.feature) | Check gopass status
 tau [info status gpg](features/cucumber/features/info/info.status.gpg.feature) | Check gpg status
+tau [info status mutagen](features/cucumber/features/info/info.status.mutagen.feature) | Check mutagen status
 tau [info status ssh](features/cucumber/features/info/info.status.ssh.feature) | Check ssh status
+tau [mutagen check daemon](features/cucumber/features/mutagen/mutagen.check.daemon.feature)) | Check if mutagen host conenction is available
 tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.check.feature) [SOCKET] | Check if mutagen [SOCKET] exists
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [IN] [OUT] | Create a mutagen socket from [IN] to [OUT] of the container
 tau [mutagen socket list](features/cucumber/features/mutagen/mutagen.socket.list.feature) | List mutagen sockets
+tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
 tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) | Terminate a mutagen socket
 tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration
 tau [self config default](features/cucumber/features/self/self.config.default.feature) | Print takelage default configuration

data/lib/takelage.rb

@@ -44,8 +44,11 @@ require_relative 'takelage/bit/require/import'
 require_relative 'takelage/bit/require/cli'
 require_relative 'takelage/bit/cli'
 require_relative 'takelage/completion/cli'
+require_relative 'takelage/mutagen/check/daemon'
+require_relative 'takelage/mutagen/socket/create'
+require_relative 'takelage/mutagen/socket/terminate'
+require_relative 'takelage/mutagen/socket/tidy'
 require_relative 'takelage/docker/check/daemon'
-require_relative 'takelage/docker/check/socat'
 require_relative 'takelage/docker/check/cli'
 require_relative 'takelage/docker/socket/lib'
 require_relative 'takelage/docker/socket/host'
@@ -59,8 +62,6 @@ require_relative 'takelage/docker/image/tag/check'
 require_relative 'takelage/docker/image/tag/cli'
 require_relative 'takelage/docker/image/update'
 require_relative 'takelage/docker/image/cli'
-require_relative 'takelage/mutagen/socket/create'
-require_relative 'takelage/mutagen/socket/terminate'
 require_relative 'takelage/docker/container/check/existing'
 require_relative 'takelage/docker/container/check/network'
 require_relative 'takelage/docker/container/check/orphaned'
@@ -73,6 +74,11 @@ require_relative 'takelage/docker/container/clean'
 require_relative 'takelage/docker/container/prune'
 require_relative 'takelage/docker/container/cli'
 require_relative 'takelage/docker/cli'
+require_relative 'takelage/mutagen/check/cli'
+require_relative 'takelage/mutagen/socket/check'
+require_relative 'takelage/mutagen/socket/list'
+require_relative 'takelage/mutagen/socket/cli'
+require_relative 'takelage/mutagen/cli'
 require_relative 'takelage/info/status/lib'
 require_relative 'takelage/info/status/git'
 require_relative 'takelage/info/status/gopass'
@@ -82,10 +88,6 @@ require_relative 'takelage/info/status/bar'
 require_relative 'takelage/info/status/cli'
 require_relative 'takelage/info/project/cli'
 require_relative 'takelage/info/cli'
-require_relative 'takelage/mutagen/socket/check'
-require_relative 'takelage/mutagen/socket/list'
-require_relative 'takelage/mutagen/socket/cli'
-require_relative 'takelage/mutagen/cli'
 require_relative 'takelage/self/config/cli'
 require_relative 'takelage/self/list'
 require_relative 'takelage/self/cli'

data/lib/takelage/default.yml

@@ -30,7 +30,6 @@ cmd_bit_scope_list_find_scopes: 'find -L %{root} -name scope.json'
 cmd_bit_scope_new_bit_init: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
 cmd_docker_check_daemon_docker_info: 'docker info'
-cmd_docker_check_socat_which_socat: 'which socat'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
@@ -66,6 +65,8 @@ cmd_info_status_gopass_root_store: 'gopass config | grep "path" | cut -d " " -f
 cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
+cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
+cmd_mutagen_check_daemon_version: 'mutagen version'
 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_check: 'mutagen forward list %{socketname}'
 cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
@@ -85,3 +86,5 @@ docker_user: 'takelage'
 git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
+mutagen_socket_path: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_takelage_label: 'type=takelage-socket'

data/lib/takelage/docker/check/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
 
     #
     # docker check daemon
@@ -20,17 +19,5 @@ module Takelage
     def daemon
       exit docker_check_daemon
     end
-
-    #
-    # docker check socat
-    #
-    desc 'socat', 'Check if socat command is available'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if socat command is available
-    LONGDESC
-    # Check if socat command is available.
-    def socat
-      exit docker_check_socat
-    end
   end
 end

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

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
-# takelage docker check running
+# takelage docker check daemon
 module DockerCheckDaemon
-  # Backend method for docker check running.
+  # Backend method for docker check daemon.
   # @return [Boolean] is the docker daemon running?
+  # rubocop:disable Metrics/MethodLength
   def docker_check_daemon
     return true if @docker_daemon_running
 
+    return false unless command_available? 'docker'
+
     log.debug 'Check if the docker daemon is running'
 
     status = try config.active['cmd_docker_check_daemon_docker_info']
@@ -20,4 +23,5 @@ module DockerCheckDaemon
     @docker_daemon_running = true
     true
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/lib/takelage/docker/container/check/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCheckOrphaned

data/lib/takelage/docker/container/clean.rb

@@ -10,9 +10,9 @@ module DockerContainerClean
 
     return false if _docker_container_clean_harakiri?
 
+    mutagen_socket_terminate "--label-selector='#{@takellabel}'"
     networks = _docker_container_clean_kill_existing_containers
     _docker_container_lib_remove_networks networks
-    mutagen_socket_terminate "--label-selector='#{@takellabel}'"
   end
 
   private

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCheckOrphaned
@@ -24,6 +23,7 @@ module Takelage
     include DockerSocketHost
     include DockerSocketScheme
     include DockerSocketStart
+    include MutagenCheckDaemon
     include MutagenSocketCreate
     include MutagenSocketTerminate
 
@@ -42,9 +42,10 @@ module Takelage
       @workdir = Dir.getwd
       @hostname = _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"
-      @takellabel = 'type=takelage-socket'
+      @takellabel = config.active['mutagen_socket_takelage_label']
       @socket_host = docker_socket_host
       @sockets = docker_socket_scheme
+      @mutagensock = config.active['mutagen_socket_path']
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize

data/lib/takelage/docker/container/command.rb

@@ -11,7 +11,7 @@ module DockerContainerCommand
     docker_socket_start
     return false unless _docker_container_lib_create_net_and_ctr @hostname
 
-    mutagen_socket_create '~/.mutagen/daemon/daemon.sock', '~/.mutagen/daemon/daemon.sock'
+    mutagen_socket_create @mutagensock, @mutagensock if mutagen_check_daemon
 
     _docker_container_command_run_command @hostname, command
   end

data/lib/takelage/docker/container/daemon.rb

@@ -10,7 +10,7 @@ module DockerContainerDaemon
 
     result = _docker_container_lib_create_net_and_ctr @hostname
 
-    mutagen_socket_create '~/.mutagen/daemon/daemon.sock', '~/.mutagen/daemon/daemon.sock'
+    mutagen_socket_create @mutagensock, @mutagensock if mutagen_check_daemon
 
     result
   end

data/lib/takelage/docker/container/login.rb

@@ -12,7 +12,7 @@ module DockerContainerLogin
 
     return false unless _docker_container_lib_create_net_and_ctr @hostname
 
-    mutagen_socket_create '~/.mutagen/daemon/daemon.sock', '~/.mutagen/daemon/daemon.sock'
+    mutagen_socket_create @mutagensock, @mutagensock if mutagen_check_daemon
 
     run_and_exit _docker_container_login_enter_container @hostname
   end

data/lib/takelage/docker/socket/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerSocketLib
     include DockerSocketHost
     include DockerSocketScheme

data/lib/takelage/docker/socket/start.rb

@@ -8,7 +8,7 @@ module DockerSocketStart
 
     return false unless docker_check_daemon
 
-    return false unless docker_check_socat
+    return false unless command_available? 'socat'
 
     cmds_start_socket = _docker_socket_lib_get_socket_start_commands 'start'
 

data/lib/takelage/docker/socket/stop.rb

@@ -8,7 +8,7 @@ module DockerSocketStop
 
     return false unless docker_check_daemon
 
-    return false unless docker_check_socat
+    return false unless command_available? 'socat'
 
     # get process list
     # assuming format: "pid command"

data/lib/takelage/info/status/cli.rb

@@ -6,7 +6,14 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckDaemon
+    include DockerContainerCheckExisting
+    include DockerContainerCheckNetwork
+    include DockerContainerCommand
+    include DockerContainerLib
+    include DockerSocketLib
     include DockerSocketScheme
+    include DockerSocketStart
     include GitCheckWorkspace
     include InfoStatusLib
     include InfoStatusGit
@@ -14,6 +21,19 @@ module Takelage
     include InfoStatusGPG
     include InfoStatusSSH
     include InfoStatusBar
+    include MutagenCheckDaemon
+
+    # Initialize info status
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @workdir = Dir.getwd
+
+      inside = _docker_container_lib_check_matrjoschka
+      @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
+      @hostlabel = "hostname=#{@hostname}"
+    end
 
     #
     # info status bar
@@ -63,6 +83,18 @@ module Takelage
       exit info_status_gpg
     end
 
+    #
+    # info status mutagen
+    #
+    desc 'mutagen', 'Check mutagen status info'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check mutagen status info
+    LONGDESC
+    # Check mutagen status info.
+    def mutagen
+      exit mutagen_check_daemon
+    end
+
     #
     # info status ssh
     #

data/lib/takelage/lib/system.rb

@@ -5,7 +5,26 @@ require 'open3'
 require 'yaml'
 
 # Interaction with the operating system
+# rubocop:disable Metrics/ModuleLength
 module SystemModule
+  # Check if a command is available
+  # @return [Boolean] is the command available?
+  def command_available?(command)
+    return true if instance_variable_get("@command_available_#{command}")
+
+    log.debug "Check if the command \"#{command}\" is available"
+
+    status = try "which #{command}"
+
+    unless status.exitstatus.zero?
+      log.debug "The command \"#{command}\" is not available"
+      return false
+    end
+
+    log.debug "The command \"#{command}\" is available"
+    instance_variable_set("@command_available_#{command}", true)
+  end
+
   # Convert hash to yaml.
   # @return [String] yaml of hash
   def hash_to_yaml(hash)
@@ -51,12 +70,26 @@ module SystemModule
   # @return [String] stdout of command
   def run(command)
     log.debug "Running command \"#{command}\""
-    stdout_str, stderr_str = Open3.capture3 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
   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"
@@ -76,8 +109,10 @@ module SystemModule
   # @return [Boolean] success of command run
   def try(command)
     log.debug "Running command \"#{command}\""
-    _, _, status = Open3.capture3 command
-    log.debug "Command \"#{command}\" has exit status \"#{status.exitstatus}\""
+    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}\""
     status
   end
 
@@ -85,7 +120,7 @@ module SystemModule
 
   # Check if file exists.
   def _file_exists?(file)
-    unless File.exist? file
+    unless File.exist? File.expand_path(file)
       log.debug "File \"#{file}\" doesn't exist"
       return false
     end
@@ -95,7 +130,7 @@ module SystemModule
   # Read yaml file.
   def _file_read(file)
     begin
-      @content_file = File.read file
+      @content_file = File.read File.expand_path(file)
     rescue SystemCallError
       log.debug "Unable to read file \"#{file}\""
       return false
@@ -128,3 +163,4 @@ module SystemModule
     true
   end
 end
+# rubocop:enable Metrics/ModuleLength

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage mutagen check
+  class MutagenCheck < SubCommandBase
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+    include DockerContainerCheckExisting
+    include DockerContainerCheckNetwork
+    include DockerContainerCommand
+    include DockerContainerLib
+    include DockerSocketLib
+    include DockerSocketScheme
+    include DockerSocketStart
+    include MutagenCheckDaemon
+
+    # Initialize mutagen check
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @workdir = Dir.getwd
+
+      inside = _docker_container_lib_check_matrjoschka
+      @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
+      @hostlabel = "hostname=#{@hostname}"
+    end
+
+    #
+    # mutagen check daemon
+    #
+    desc 'daemon', 'Check if mutagen host conenction is available'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if mutagen host conenction is available
+    LONGDESC
+    # Check if mutagen host conenction is available.
+    def daemon
+      exit mutagen_check_daemon
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# takelage info status mutagen
+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
+    log.debug 'Check mutagen status'
+
+    return false unless command_available? 'mutagen'
+
+    # 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'
+        return false
+      end
+
+      log.debug 'The mutagen daemon is available'
+      return true
+    end
+
+    unless _file_exists? config.active['mutagen_socket_path']
+      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
+    end
+
+    log.debug 'The mutagen daemon is available'
+    true
+  end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/MethodLength
+
+  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
+    )
+    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
+    version = try config.active['cmd_mutagen_check_daemon_version']
+    version.exitstatus.zero?
+  end
+end

data/lib/takelage/mutagen/cli.rb

@@ -3,6 +3,9 @@
 module Takelage
   # takelage git
   class Mutagen < SubCommandBase
+    desc 'check [COMMAND]', 'Check mutagen'
+    subcommand 'check', MutagenCheck
+
     desc 'socket [COMMAND]', 'Manage mutagen socket'
     subcommand 'socket', MutagenSocket
   end

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

@@ -7,6 +7,8 @@ module MutagenSocketCheck
   def mutagen_socket_check(socket)
     log.debug "Check if the mutagen socket \"#{socket}\" exists"
 
+    return false unless mutagen_check_daemon
+
     socket_exists = _mutagen_socket_check_socket(socket)
 
     unless socket_exists.exitstatus.zero?

data/lib/takelage/mutagen/socket/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCommand
@@ -15,12 +14,17 @@ module Takelage
     include DockerSocketLib
     include DockerSocketScheme
     include DockerSocketStart
+    include DockerImageTagLatest
+    include DockerImageTagList
+    include DockerImageTagCheck
+    include MutagenCheckDaemon
     include MutagenSocketCheck
     include MutagenSocketCreate
     include MutagenSocketList
+    include MutagenSocketTidy
     include MutagenSocketTerminate
 
-    # Initialize mtagen socket
+    # Initialize mutagen socket
     def initialize(args = [], local_options = {}, configuration = {})
       # initialize thor parent class
       super args, local_options, configuration
@@ -28,10 +32,15 @@ module Takelage
       @docker_repo = config.active['docker_repo']
       @username = ENV['USER'] || 'noname'
       @workdir = Dir.getwd
+
       inside = _docker_container_lib_check_matrjoschka
       @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
+      # See DockerContainerLib::_docker_container_lib_hostname
+      @socketname = @hostname[-11..-1]
+
       @hostlabel = "hostname=#{@hostname}"
-      @takellabel = 'type=takelage-socket'
+      @takellabel = config.active['mutagen_socket_takelage_label']
+
       @sockets = docker_socket_scheme
     end
 
@@ -85,5 +94,17 @@ module Takelage
     def terminate(socket)
       exit mutagen_socket_terminate socket
     end
+
+    #
+    # mutagen socket tidy
+    #
+    desc 'tidy', 'Remove mutagen daemon files'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Remove mutagen daemon files
+    LONGDESC
+    # Remove mutagen daemon files.
+    def tidy
+      exit mutagen_socket_tidy
+    end
   end
 end

data/lib/takelage/mutagen/socket/create.rb

@@ -4,18 +4,19 @@
 module MutagenSocketCreate
   # Backend method for mutagen socket create.
   def mutagen_socket_create(containersock, hostsock)
-    socketname = @hostname[-11..-1]
-    log.debug "Create the mutagen socket \"#{socketname}\" in the container" \
+    log.debug "Create the mutagen socket \"#{@socketname}\" in the container" \
       "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
 
-    socket_created = _mutagen_socket_create_socket(socketname, containersock, hostsock)
+    return false unless mutagen_check_daemon
+
+    socket_created = _mutagen_socket_create_socket(containersock, hostsock)
 
     unless socket_created.include? 'Created session'
-      log.debug "Unable to create mutagen socket \"#{socketname}\""
+      log.debug "Unable to create mutagen socket \"#{@socketname}\""
       return false
     end
 
-    log.debug "Created the mutagen socket \"#{socketname}\""
+    log.debug "Created the mutagen socket \"#{@socketname}\""
     true
   end
 
@@ -23,10 +24,10 @@ module MutagenSocketCreate
 
   # Get git branch.
   # rubocop:disable Metrics/MethodLength
-  def _mutagen_socket_create_socket(socketname, containersock, hostsock)
+  def _mutagen_socket_create_socket(containersock, hostsock)
     cmd_create_socket = format(
       config.active['cmd_mutagen_forward_socket_create'],
-      socketname: socketname,
+      socketname: @socketname,
       containersock: containersock,
       hostsock: hostsock,
       username: @username,

data/lib/takelage/mutagen/socket/list.rb

@@ -7,6 +7,8 @@ module MutagenSocketList
   def mutagen_socket_list
     log.debug 'List the mutagen takelage sockets'
 
+    return false unless mutagen_check_daemon
+
     sockets = _mutagen_socket_list
 
     if sockets.to_s.empty?

data/lib/takelage/mutagen/socket/terminate.rb

@@ -6,10 +6,9 @@ module MutagenSocketTerminate
   def mutagen_socket_terminate(socket)
     log.debug "Terminate the mutagen socket \"#{socket}\""
 
-    socket_terminated = _mutagen_socket_terminate_socket socket
+    return false unless mutagen_check_daemon
 
-    cmd_remove = config.active['cmd_mutagen_forward_socket_remove']
-    docker_container_command cmd_remove if cmd_remove && socket_terminated.exitstatus.zero?
+    socket_terminated = _mutagen_socket_terminate_socket socket
 
     unless socket_terminated.exitstatus.zero?
       log.debug "Unable to terminated mutagen socket \"#{socket}\""

data/lib/takelage/mutagen/socket/tidy.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# takelage mutagen socket tidy
+module MutagenSocketTidy
+  # Backend method for mutagen socket tidy.
+  def mutagen_socket_tidy
+    log.debug "Remove the mutagen daemon files in container \"#{@hostname}\""
+
+    container_existing = docker_container_check_existing @hostname
+    cmd_remove = config.active['cmd_mutagen_forward_socket_remove']
+    return false unless container_existing && cmd_remove.empty?
+
+    unless docker_container_command cmd_remove
+      log.error "Unable to remove the mutagen daemon files in container \"#{@hostname}\""
+      return false
+    end
+
+    log.debug "Removed the mutagen daemon files in container \"#{@hostname}\""
+    true
+  end
+end

data/lib/takelage/version

@@ -1 +1 @@
-0.28.7
+0.28.26

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.7
+  version: 0.28.26
 platform: ruby
 authors:
 - Geospin
@@ -227,7 +227,6 @@ files:
 - lib/takelage/default.yml
 - lib/takelage/docker/check/cli.rb
 - lib/takelage/docker/check/daemon.rb
-- lib/takelage/docker/check/socat.rb
 - lib/takelage/docker/cli.rb
 - lib/takelage/docker/container/check/cli.rb
 - lib/takelage/docker/container/check/existing.rb
@@ -271,12 +270,15 @@ files:
 - lib/takelage/lib/project.rb
 - lib/takelage/lib/subcmd.rb
 - lib/takelage/lib/system.rb
+- lib/takelage/mutagen/check/cli.rb
+- lib/takelage/mutagen/check/daemon.rb
 - lib/takelage/mutagen/cli.rb
 - lib/takelage/mutagen/socket/check.rb
 - lib/takelage/mutagen/socket/cli.rb
 - lib/takelage/mutagen/socket/create.rb
 - lib/takelage/mutagen/socket/list.rb
 - lib/takelage/mutagen/socket/terminate.rb
+- lib/takelage/mutagen/socket/tidy.rb
 - lib/takelage/self/cli.rb
 - lib/takelage/self/config/cli.rb
 - lib/takelage/self/list.rb

data/lib/takelage/docker/check/socat.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker check running
-module DockerCheckSocat
-  # Backend method for docker check socat.
-  # @return [Boolean] is the socat command available?
-  def docker_check_socat
-    return true if @socat_command_available
-
-    log.debug 'Check if the socat command is available'
-
-    status = try config.active['cmd_docker_check_socat_which_socat']
-
-    unless status.exitstatus.zero?
-      log.debug 'The socat command is not available'
-      return false
-    end
-
-    log.debug 'The socat command is available'
-    @socat_command_available = true
-    true
-  end
-end