takelage 0.28.11 → 0.28.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a8b7bb0715a8126a3d09df70fca6e992c49abaed80e3ccfc8e79c6b3c480c66
-  data.tar.gz: 6a0290962d4a8cf2ec036b9a4ce925ba467f6163f2e0d9d37a02a37085356fe9
+  metadata.gz: 011a1f337984e2512deb1b67601fe20191a29d38d24b356c922f7c9e5e12a467
+  data.tar.gz: 5decfcfd262bfb3466baa3a38b7ae80bb9d314838751ae4a17777915cb90edde
 SHA512:
-  metadata.gz: e782f36cde89e04d2431c0232f4a9edc059c475ccce8216dad7db30842693bf72677ac9de79d08c98031c9434cfead8321261019e7d1723af1895bd2e8f6565c
-  data.tar.gz: 49fda45497cc158cd9ee10709deaf015e4d27e14ab486bd291b89c8fa5d5b4f18b56e49b487189bb57b43de1de08dfc143866662072f013165bb9fdacbf17041
+  metadata.gz: 279972fa01d7b84f786198d9abcd5f7757a3ef840b13d5d9f4de31032979ede3ab45ad5d21deb8d71f8ab806ac711e6cae17bf7389c8838e15efe68abd2aaba2
+  data.tar.gz: 1e0c9eb0a468ff8fd5f4adbd0c969e3c2f466a5fbcdb9e0eeb0ca592ad31bcc5f11b0a0454a1fd5c819e46c545ea402ad131ab6b7b7cabe68eb105b23f7a67ad

data/README.md

@@ -112,6 +112,7 @@ tau [mutagen check daemon](features/cucumber/features/mutagen/mutagen.check.daem
 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,10 @@ 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'
@@ -73,7 +75,6 @@ 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/daemon'
 require_relative 'takelage/mutagen/check/cli'
 require_relative 'takelage/mutagen/socket/check'
 require_relative 'takelage/mutagen/socket/list'

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

@@ -24,6 +24,7 @@ module Takelage
     include DockerSocketHost
     include DockerSocketScheme
     include DockerSocketStart
+    include MutagenCheckDaemon
     include MutagenSocketCreate
     include MutagenSocketTerminate
 

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 @mutagensock, @mutagensock
+    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 @mutagensock, @mutagensock
+    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 @mutagensock, @mutagensock
+    mutagen_socket_create @mutagensock, @mutagensock if mutagen_check_daemon
 
     run_and_exit _docker_container_login_enter_container @hostname
   end

data/lib/takelage/lib/system.rb

@@ -51,9 +51,10 @@ 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
 
@@ -76,8 +77,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
 

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

@@ -15,9 +15,14 @@ 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 mutagen socket
@@ -90,5 +95,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

@@ -7,6 +7,8 @@ module MutagenSocketCreate
     log.debug "Create the mutagen socket \"#{@socketname}\" in the container" \
       "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
 
+    return false unless mutagen_check_daemon
+
     socket_created = _mutagen_socket_create_socket(containersock, hostsock)
 
     unless socket_created.include? 'Created session'

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.11
+0.28.14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.11
+  version: 0.28.14
 platform: ruby
 authors:
 - Geospin
@@ -279,6 +279,7 @@ files:
 - 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