takelage 0.28.7 → 0.28.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13748db4d561a884f90dcf21e4f43296fcaec2377ebb602b0407139d6218986
-  data.tar.gz: e0c2075cc8fab7ab3057477baaee7fe2aa3f4304c139b38f1ab6432f9adf4366
+  metadata.gz: 1d001b2320ee31a8a1418fa2148f2b57e188161a77462d743664ba65fee9f9c9
+  data.tar.gz: 1029b8f87e5a2ca62dabb569393b9882728555c36a3a474a8c4d8a07284aab00
 SHA512:
-  metadata.gz: 1b7ac8428fa4c5f4278f58c9ae26a77656c967503d7a10c8bfe892aca274d32129cfb81a40a2434126940b52f0756a93a6c6c01a6a18ba21c98306f8eda1ab92
-  data.tar.gz: ae774fe3212f1712097c6476f186e1cdff6ee63f043aeec7d4b29b4862e75ecf3c4251cac00ecb83677dbaf71e01dc7ebb202947f5c6a7a704792ac93865e4da
+  metadata.gz: 9edf2460fba247d5cca26952aba78c223c86b13a796dfc88e2cf586e910e3d2b451ac920d5ea1f597d1ba282b1a65c90e19d89e5e2bb2ded707916db908b4368
+  data.tar.gz: e6678614002f51c2e712aaa0a9a4578fb6ace913de6d6c0561728a21ae53f048140ef9bbe58439c1da9791b1a86f73bfaa957fe39ce45ff875f37d5f0c1b8df6

data/README.md

@@ -106,7 +106,9 @@ 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

data/lib/takelage.rb

@@ -44,6 +44,8 @@ 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/socket/create'
+require_relative 'takelage/mutagen/socket/terminate'
 require_relative 'takelage/docker/check/daemon'
 require_relative 'takelage/docker/check/socat'
 require_relative 'takelage/docker/check/cli'
@@ -59,8 +61,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 +73,12 @@ 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'
+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

@@ -66,6 +66,7 @@ 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_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/container/cli.rb

@@ -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
 
     _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
 
     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
 
     run_and_exit _docker_container_login_enter_container @hostname
   end

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

@@ -6,7 +6,15 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckDaemon
+    include DockerCheckSocat
+    include DockerContainerCheckExisting
+    include DockerContainerCheckNetwork
+    include DockerContainerCommand
+    include DockerContainerLib
+    include DockerSocketLib
     include DockerSocketScheme
+    include DockerSocketStart
     include GitCheckWorkspace
     include InfoStatusLib
     include InfoStatusGit
@@ -14,6 +22,17 @@ 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
+
+      inside = _docker_container_lib_check_matrjoschka
+      @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
+      @hostlabel = "hostname=#{@hostname}"
+    end
 
     #
     # info status bar
@@ -63,6 +82,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

@@ -85,7 +85,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 +95,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

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage mutagen check
+  class MutagenCheck < SubCommandBase
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+    include DockerCheckSocat
+    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
+
+      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,37 @@
+# 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
+  def mutagen_check_daemon
+    log.debug 'Check mutagen status'
+
+    unless _file_exists? config.active['mutagen_socket_path']
+      log.error 'mutagen socket is not available'
+      return false
+    end
+
+    unless _mutagen_check_daemon_host_connection
+      log.error 'mutagen host connection is not available'
+      return false
+    end
+
+    log.debug 'mutagen is available'
+    true
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  private
+
+  # Check mutagen host connection
+  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?
+  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/cli.rb

@@ -20,7 +20,7 @@ module Takelage
     include MutagenSocketList
     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 +28,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
 

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

@@ -4,18 +4,17 @@
 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)
+    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 +22,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/version

@@ -1 +1 @@
-0.28.7
+0.28.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.7
+  version: 0.28.8
 platform: ruby
 authors:
 - Geospin
@@ -271,6 +271,8 @@ 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