takelage 0.26.3 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91da9d18bb559bbf8a1c4723d095b2b37503b76ffee8f57a7fb650976d849278
-  data.tar.gz: 0d3b8f683ee86ebd485bf9dc9af053a8a094f03c515e12477f3ab95e201ae5b1
+  metadata.gz: c9cbafaa5bcc3f8d74cf010208562a6a117e2051878031c723591ab3b11ec382
+  data.tar.gz: '087322623aab1f24da511744d2e5f28377077593bc48e10c433ac7f8406c413b'
 SHA512:
-  metadata.gz: a21535e16921afa69fb56a0d42b126eb6c7bd4f1bd0fba39bd60504958fb8338e22adcfa1e096805b941a1ae1bb494a7143f7d9dcc14d8550935011172faacf7
-  data.tar.gz: 174178c3f9ee7c1157d1079ee14aac647cb20b2291fcc1fb80132b398e329f68d380a678d5a6282215d15e5de72e67427b0fb8232b4390aab3ad5218b74bed35
+  metadata.gz: 5998e3c792f0173950380450329100d039802219b48d7b1d88f07985a3df6f3510f30943a7becbd78a966837a93a0927ae30cc8e32b940e785952b10094e7708
+  data.tar.gz: 8ec3aa7a7fb9737915ee4cbbeb541483aa2cb97871423f415df66213675fc86d7ba24c45bc53d4b666360397e5265f48a896bb9506aa127ab9470e4f98fb8af5

data/README.md

@@ -1,4 +1,7 @@
-![takelage image](https://github.com/geospin-takelage/takelage-cli/actions/workflows/test_project_nightly.yml/badge.svg)
+[![license](https://img.shields.io/github/license/geospin-takelage/takelage-cli?color=blueviolet)](https://github.com/geospin-takelage/takelage-cli/blob/main/LICENSE)
+[![rubygems.org](https://img.shields.io/gem/v/takelage?label=rubygems.org&color=blue)](https://rubygems.org/gems/takelage)
+[![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-cli/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-cli/actions/workflows/build_test_deploy_project_on_push.yml)
+[![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-cli/Test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-cli/actions/workflows/test_project_nightly.yml)
 
 # takelage-cli
 
@@ -12,17 +15,30 @@ The *takelage-cli* executable *tau* is a
 command line script using the 
 [thor](http://whatisthor.com/) toolkit.
 
-## Framework
-
-The takelage devops framework consists of these projects:
-
-| App | Description |
-| --- | ----------- |
-| *[takelage-doc](https://github.com/geospin-takelage/takelage-doc)* | takelage documentation |
-| *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | takelage development environment |
-| *[takelage-var](https://github.com/geospin-takelage/takelage-var)* | takelage test plugin |
-| *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | takelage command line interface |
-| *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | takelage bit server | 
+## Framework Versions
+
+| App | Artifact |
+| --- | -------- |
+| *[takelage-doc](https://github.com/geospin-takelage/takelage-doc)* | [![License](https://img.shields.io/github/license/geospin-takelage/takelage-doc?color=blueviolet)](https://github.com/geospin-takelage/takelage-doc/blob/main/LICENSE) |
+| *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelage/latest?label=hub.docker.com&sort=semver&color=blue)](https://hub.docker.com/r/takelage/takelage) |
+| *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | [![rubygems.org](https://img.shields.io/gem/v/takelage?label=rubygems.org&color=blue)](https://rubygems.org/gems/takelage) |
+| *[takelage-var](https://github.com/geospin-takelage/takelage-var)* | [![pypi,org](https://img.shields.io/pypi/v/takeltest?label=pypi.org&color=blue)](https://pypi.org/project/takeltest/) |
+| *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/bitboard/latest?label=hub.docker.com&sort=semver&color=blue)](https://hub.docker.com/r/takelage/bitboard) | 
+| *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelslim/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelslim) | 
+| *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelbase/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelbase) | 
+| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/multipostgres/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/multipostgres) | 
+
+## Framework Status
+
+| App | Deploy project | Test project | Test roles |
+| --- | -------------- | ------------ | ---------- |
+| *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-dev/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-dev/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-dev/Build%20and%20test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-dev/actions/workflows/build_test_project_nightly.yml) | [![test roles](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-dev/Test%20roles?label=test%20roles)](https://github.com/geospin-takelage/takelage-dev/actions/workflows/build_test_roles_nightly.yml) |
+| *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-cli/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-cli/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-cli/Test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-cli/actions/workflows/test_project_nightly.yml) |
+| *[takelage-var](https://github.com/geospin-takelage/takelage-var)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-var/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-var/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-var/Build%20and%20test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-var/actions/workflows/build_test_project_nightly.yml) |
+| *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build%20and%20test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_project_nightly.yml) | [![test roles](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Test%20roles?label=test%20roles)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_roles_nightly.yml) |
+| *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelslim/Build%20and%20deploy%20takelslim?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelslim/actions/workflows/build_deploy_takelslim_nightly.yml) |
+| *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelbase/Build%20and%20deploy%20takelbase?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelbase/actions/workflows/build_deploy_takelbase_nightly.yml) |
+| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-multipostgres/Build%20and%20deploy%20multipostgres?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-multipostgres/actions/workflows/build_deploy_multipostgres_nightly.yml) |
 
 ## Installation
 
@@ -86,6 +102,15 @@ tau [info project active](features/cucumber/features/info/info.project.active.fe
 tau [info project dir](features/cucumber/features/info/info.project.dir.feature) | Print project root directory
 tau [info project main](features/cucumber/features/info/info.project.main.feature) | Print main project info
 tau [info project private](features/cucumber/features/info/info.project.private.feature) | Print private project info
+tau [info status bar](features/cucumber/features/info/info.status.bar.feature) | Print status bar
+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 ssh](features/cucumber/features/info/info.status.ssh.feature) | Check ssh status
+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 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
 tau [self config home](features/cucumber/features/self/self.config.home.feature) | Print takelage home config file configuration
@@ -102,6 +127,7 @@ tau project | Alias for tau [info project active](features/cucumber/features/inf
 tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)
 tau pull | Alias for tau [bit clipboard pull](features/cucumber/features/bit/bit.clipboard.pull.feature)
 tau push | Alias for tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.feature)
+tau status | Alias for tau [docker info status bar](features/cucumber/features/info/info.status.bar.feature)
 tau update | Alias for tau [docker image update](features/cucumber/features/docker/docker.image.update.feature)
 tau version | Alias for tau [self version](features/cucumber/features/self/self.version.feature)
 
@@ -138,15 +164,6 @@ bit_remote: 'ssh://bit@bit.example.com:222:/bit'
 bit_ssh: 'ssh -p 222 bit@bit.example.com'
 ```
 
-- By default, takelage uses bright prompt colors which are best viewed on a
-dark background. If you prefer a light background (or want less bright colors)
-you can add an option to your *~/.takelage.yml*:
-
-```yaml
----
-docker_daynight: 'day'
-```
-
 - If you want to pin a specific docker tag for one of your projects
 then create an *takelage.yml* file with:
 

data/lib/takelage.rb

@@ -59,6 +59,8 @@ 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'
@@ -76,10 +78,14 @@ require_relative 'takelage/info/status/git'
 require_relative 'takelage/info/status/gopass'
 require_relative 'takelage/info/status/gpg'
 require_relative 'takelage/info/status/ssh'
-require_relative 'takelage/info/status/header'
+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'
@@ -143,6 +149,9 @@ module Takelage
     desc 'info [COMMAND] ', 'Get information'
     subcommand 'info', Info
 
+    desc 'mutagen [COMMAND] ', 'Manage mutagen'
+    subcommand 'mutagen', Mutagen
+
     desc 'self [COMMAND] ', 'Manage takelage tools'
     subcommand 'self', Self
 
@@ -210,10 +219,10 @@ module Takelage
       Takelage::BitClipboard.new.push
     end
 
-    desc 'status', 'Alias for tau info status header'
-    # takelage status: {takelage::InfoStatus#header}
+    desc 'status', 'Alias for tau info status bar'
+    # takelage status: {takelage::InfoStatus#bar}
     def status
-      Takelage::InfoStatus.new.header
+      Takelage::InfoStatus.new.bar
     end
 
     desc 'update', 'Alias for tau docker image update'

data/lib/takelage/bit/check/workspace.rb

@@ -32,6 +32,6 @@ module BitCheckWorkspace
 
     stdout_str_dir = run cmd_pwd
 
-    stdout_str_dir.strip
+    stdout_str_dir.chomp
   end
 end

data/lib/takelage/bit/scope/cli.rb

@@ -55,7 +55,7 @@ module Takelage
     def list
       scopes = bit_scope_list
       exit false if scopes == false
-      say scopes unless scopes.to_s.strip.empty?
+      say scopes unless scopes.to_s.chomp.empty?
       true
     end
 

data/lib/takelage/default.yml

@@ -34,7 +34,7 @@ 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'
-cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
 cmd_docker_container_create_network: 'docker network create %{network}'
 cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
@@ -56,7 +56,7 @@ cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
-cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
+cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
 cmd_info_status_lib_git_email: 'git -C %{root} config user.email'
@@ -66,6 +66,11 @@ 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_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}'
+cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
+cmd_mutagen_forward_socket_list: 'mutagen forward list --label-selector="%{takellabel}"'
 docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
 docker_entrypoint_extra: '.config/gcloud'
 docker_entrypoint_options: ''

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

@@ -11,7 +11,7 @@ module DockerContainerCheckExisting
 
     stdout_str = run _docker_container_cmd_check_existing container
 
-    if stdout_str.to_s.strip.empty?
+    if stdout_str.to_s.chomp.empty?
       log.debug "Container \"#{container}\" is not existing"
       return false
     end

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

@@ -11,7 +11,7 @@ module DockerContainerCheckNetwork
 
     stdout_str = run _docker_container_cmd_check_network network
 
-    if stdout_str.to_s.strip.empty?
+    if stdout_str.to_s.chomp.empty?
       log.debug "Network \"#{network}\" is not existing"
       return false
     end

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

@@ -12,6 +12,7 @@ module DockerContainerClean
 
     networks = _docker_container_clean_kill_existing_containers
     _docker_container_lib_remove_networks networks
+    mutagen_socket_terminate @takellabel
   end
 
   private

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

@@ -24,9 +24,12 @@ module Takelage
     include DockerSocketHost
     include DockerSocketScheme
     include DockerSocketStart
+    include MutagenSocketCreate
+    include MutagenSocketTerminate
 
     # Initialize docker container
     # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def initialize(args = [], local_options = {}, configuration = {})
       # initialize thor parent class
       super args, local_options, configuration
@@ -38,9 +41,12 @@ module Takelage
       @username = ENV['USER'] || 'noname'
       @workdir = Dir.getwd
       @hostname = _docker_container_lib_hostname
+      @hostlabel = "hostname=#{@hostname}"
+      @takellabel = 'type=takelage-socket'
       @socket_host = docker_socket_host
       @sockets = docker_socket_scheme
     end
+    # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
 
     desc 'check [COMMAND]', 'Check docker container'

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

@@ -11,6 +11,8 @@ 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'
+
     _docker_container_command_run_command @hostname, command
   end
 

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

@@ -8,6 +8,10 @@ module DockerContainerDaemon
 
     return false unless docker_check_daemon
 
-    _docker_container_lib_create_net_and_ctr @hostname
+    result = _docker_container_lib_create_net_and_ctr @hostname
+
+    mutagen_socket_create '~/.mutagen/daemon/daemon.sock', '~/.mutagen/daemon/daemon.sock'
+
+    result
   end
 end

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

@@ -16,7 +16,10 @@ module DockerContainerLib
 
   # Create docker container and network.
   def _docker_container_lib_create_net_and_ctr(name)
-    return false if _docker_container_lib_check_matrjoschka
+    if _docker_container_lib_check_matrjoschka
+      log.error 'You cannot log in to takelage from within takelage'
+      return false
+    end
 
     unless docker_container_check_network name
       _docker_container_lib_create_network name
@@ -108,6 +111,7 @@ module DockerContainerLib
 
     try cmd_docker_create
   end
+
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
@@ -117,7 +121,7 @@ module DockerContainerLib
 
     return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
 
-    log.error 'You cannot log in to takelage from within takelage'
+    log.debug 'We are already inside a takelage container'
 
     # wait or the github workflow will fail
     sleep 1

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

@@ -9,8 +9,11 @@ module DockerContainerLogin
     return false unless docker_check_daemon
 
     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'
+
     run_and_exit _docker_container_login_enter_container @hostname
   end
 

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

@@ -23,6 +23,7 @@ module DockerContainerPrune
 
       name = _docker_container_lib_get_container_name_by_id container
       _docker_container_lib_stop_container container
+      mutagen_socket_terminate "hostname=#{container}"
       networks << name unless networks.include? name
     end
     networks

data/lib/takelage/docker/image/tag/check.rb

@@ -9,7 +9,7 @@ module DockerImageTagCheck
 
     return false unless docker_check_daemon
 
-    if tag.to_s.strip.empty?
+    if tag.to_s.chomp.empty?
       log.warn 'No docker image tag specified'
       return false
     end
@@ -32,7 +32,7 @@ module DockerImageTagCheck
         image: image
       )
 
-    if (run cmd_docker_images).to_s.strip.empty?
+    if (run cmd_docker_images).to_s.chomp.empty?
       log.debug "No docker image \"#{image}\" found"
       return false
     end

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

@@ -31,7 +31,7 @@ module DockerSocketStop
   # Stop process.
   def _docker_socket_stop_kill_process(process, cmds_start_socket)
     # split processes in process id and process command
-    pid_command = process.strip.split(/ /, 2)
+    pid_command = process.chomp.split(/ /, 2)
     pid = pid_command[0]
     command = pid_command[1]
 

data/lib/takelage/git/check/main.rb

@@ -21,6 +21,6 @@ module GitCheckMain
   def _git_check_main_get_branch
     cmd_get_branch =
       config.active['cmd_git_check_main_git_branch']
-    (run cmd_get_branch).strip.split('/')[-1]
+    (run cmd_get_branch).chomp.split('/')[-1]
   end
 end

data/lib/takelage/git/check/workspace.rb

@@ -4,10 +4,9 @@
 module GitCheckWorkspace
   # Backend method for git check workspace.
   # @return [Boolean] is this a git workspace?
-  def git_check_workspace
-    log.debug 'Check if this is a git workspace'
-    status_repo = _git_check_workspace_get_status_repo
-    dir = _git_check_workspace_get_dir
+  def git_check_workspace(dir = _git_check_workspace_get_dir)
+    log.debug "Check if \"#{dir}\" is a git workspace"
+    status_repo = _git_check_workspace_get_status_repo(dir)
     unless status_repo.exitstatus.zero?
       log.debug "No git workspace found in \"#{dir}\""
       return false
@@ -18,8 +17,11 @@ module GitCheckWorkspace
   private
 
   # Get git repository status.
-  def _git_check_workspace_get_status_repo
-    cmd_git_repo = config.active['cmd_git_check_workspace_git_repo']
+  def _git_check_workspace_get_status_repo(dir)
+    cmd_git_repo = format(
+      config.active['cmd_git_check_workspace_git_repo'],
+      dir: dir
+    )
     try cmd_git_repo
   end
 
@@ -27,6 +29,6 @@ module GitCheckWorkspace
   def _git_check_workspace_get_dir
     cmd_pwd =
       config.active['cmd_git_check_workspace_pwd']
-    (run cmd_pwd).strip
+    (run cmd_pwd).chomp
   end
 end

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

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+# takelage info status bar
+module InfoStatusBar
+  # Backend method for info status bar.
+  # @return [String] status info bar
+  # rubocop:disable Metrics/MethodLength
+  def info_status_bar
+    log.debug 'Get status info bar'
+
+    @bar_list = []
+
+    _info_status_bar_takelage
+    _info_status_bar_tau
+    _info_status_bar_git
+    _info_status_bar_gopass
+    _info_status_bar_gpg
+    _info_status_bar_ssh
+
+    bar = @bar_list.join(' | ')
+    log.debug "status info bar: #{bar}"
+    bar
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  private
+
+  # Add takelage version info to bar
+  def _info_status_bar_takelage
+    takelage_version_file = '/etc/takelage_version'
+    return unless _file_exists? takelage_version_file
+
+    _file_read takelage_version_file
+    @bar_list << "takelage: #{@content_file.chomp.green}"
+  end
+
+  # Add tau version info to bar
+  def _info_status_bar_tau
+    @bar_list << "tau: #{Takelage::VERSION.green}"
+  end
+
+  # Add git status info to bar
+  def _info_status_bar_git
+    @status_git = info_status_git
+    @bar_list << ("git: #{@status_git ? 'ok'.green : 'no'.red}")
+  end
+
+  # Add gopass status info to bar
+  def _info_status_bar_gopass
+    @status_gopass = info_status_gopass
+    @bar_list << ("gopass: #{@status_gopass ? 'ok'.green : 'no'.red}")
+  end
+
+  # Add gpg status info to bar
+  def _info_status_bar_gpg
+    if @status_git || @status_gopass
+      @bar_list << "gpg: #{'ok'.green}"
+      return
+    end
+
+    @bar_list << ("gpg: #{info_status_gpg ? 'ok'.green : 'no'.red}")
+  end
+
+  # Add ssh status info to bar
+  def _info_status_bar_ssh
+    @bar_list << ("ssh: #{info_status_ssh ? 'ok'.green : 'no'.red}")
+  end
+end
+
+# Amend String class with colorization
+class String
+  # Colorize strings
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  # String color red
+  def red
+    colorize(31)
+  end
+
+  # String color green
+  def green
+    colorize(32)
+  end
+
+  # String color yellow
+  def yellow
+    colorize(33)
+  end
+
+  # String color blue
+  def blue
+    colorize(34)
+  end
+
+  # String color pink
+  def pink
+    colorize(35)
+  end
+
+  # String color light_blue
+  def light_blue
+    colorize(36)
+  end
+end

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

@@ -7,12 +7,25 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerSocketScheme
+    include GitCheckWorkspace
     include InfoStatusLib
     include InfoStatusGit
     include InfoStatusGopass
     include InfoStatusGPG
     include InfoStatusSSH
-    include InfoStatusHeader
+    include InfoStatusBar
+
+    #
+    # info status bar
+    #
+    desc 'bar', 'Print status info bar'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print status info bar
+    LONGDESC
+    # Print status info bar.
+    def bar
+      say info_status_bar
+    end
 
     #
     # info status git
@@ -50,18 +63,6 @@ module Takelage
       exit info_status_gpg
     end
 
-    #
-    # info status header
-    #
-    desc 'header', 'Print status info header'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print status info header
-    LONGDESC
-    # Print status info header.
-    def header
-      say info_status_header
-    end
-
     #
     # info status ssh
     #

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

@@ -11,18 +11,23 @@ module InfoStatusGit
 
     root = config.active['project_root_dir']
 
-    if root.strip.empty?
+    if root.chomp.empty?
       log.error 'Cannot determine project root directory'
       log.info 'Is there a Rakefile in the project root directory?'
       return false
     end
 
-    if _info_status_lib_git_name(root).strip.empty?
+    unless git_check_workspace(root)
+      log.error 'Project root directory is not a git workspace'
+      return false
+    end
+
+    if _info_status_lib_git_name(root).chomp.empty?
       log.error 'git config user.name is not available'
       return false
     end
 
-    if _info_status_lib_git_email(root).strip.empty?
+    if _info_status_lib_git_email(root).chomp.empty?
       log.error 'git config user.email is not available'
       return false
     end

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

@@ -8,9 +8,9 @@ module InfoStatusGopass
   def info_status_gopass
     log.debug 'Check gopass status'
 
-    root = _info_status_gopass_root_store.chomp
+    root = _info_status_gopass_root_store
 
-    if root.strip.empty?
+    if root.chomp.empty?
       log.error 'gopass root store not found'
       return false
     end
@@ -32,6 +32,6 @@ module InfoStatusGopass
   # Get gopass root store
   def _info_status_gopass_root_store
     cmd_gopass_root_store = config.active['cmd_info_status_gopass_root_store']
-    run cmd_gopass_root_store
+    (run cmd_gopass_root_store).chomp
   end
 end

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

@@ -31,7 +31,7 @@ module InfoStatusLib
         config.active['cmd_info_status_lib_git_signingkey'],
         root: root
       )
-    run cmd_git_signingkey
+    (run cmd_git_signingkey).chomp
   end
 
   # Check if git key is available

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

@@ -8,14 +8,15 @@ module InfoStatusSSH
   def info_status_ssh
     log.debug 'Check ssh status'
 
-    ssh_socket_path = _socket_get_agent_ssh_socket_path
+    ssh_auth_sock = ENV['SSH_AUTH_SOCK']
+    gpg_ssh_socket = _socket_get_agent_ssh_socket_path
 
-    unless ENV['SSH_AUTH_SOCK'] == ssh_socket_path
-      log.error 'gpg ssh socket is misconfigured'
+    unless ssh_auth_sock == gpg_ssh_socket
+      log.error 'ssh does not use gpg ssh socket'
       return false
     end
 
-    unless _file_exists? ssh_socket_path
+    unless _file_exists? gpg_ssh_socket
       log.error 'gpg ssh socket is not available'
       return false
     end

data/lib/takelage/lib/system.rb

@@ -51,8 +51,9 @@ module SystemModule
   # @return [String] stdout of command
   def run(command)
     log.debug "Running command \"#{command}\""
-    stdout_str, = Open3.capture3 command
+    stdout_str, stderr_str = Open3.capture3 command
     log.debug "Command \"#{command}\" has stdout:\n\"\"\"\n#{stdout_str}\"\"\""
+    log.debug "Command \"#{command}\" has stderr:\n\"\"\"\n#{stderr_str}\"\"\""
     stdout_str
   end
 

data/lib/takelage/mutagen/cli.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage git
+  class Mutagen < SubCommandBase
+    desc 'socket [COMMAND]', 'Manage mutagen socket'
+    subcommand 'socket', MutagenSocket
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# takelage mutagen socket check
+module MutagenSocketCheck
+  # Backend method for mutagen socket check.
+  # @return [Boolean] Does a mutagen socket exist?
+  def mutagen_socket_check(socket)
+    log.debug "Check if the mutagen socket \"#{socket}\" exists"
+
+    socket_exists = _mutagen_socket_check_socket(socket)
+
+    unless socket_exists.exitstatus.zero?
+      log.debug "A mutagen socket \"#{socket}\" does not exist"
+      return false
+    end
+
+    log.debug "The mutagen socket \"#{socket}\" does exist"
+    true
+  end
+
+  private
+
+  # Get git branch.
+  def _mutagen_socket_check_socket(socketname)
+    cmd_check_socket = format(
+      config.active['cmd_mutagen_forward_socket_check'],
+      socketname: socketname
+    )
+    try cmd_check_socket
+  end
+end

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage mutagen socket
+  class MutagenSocket < 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 MutagenSocketCheck
+    include MutagenSocketCreate
+    include MutagenSocketList
+    include MutagenSocketTerminate
+
+    # Initialize mtagen socket
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @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
+      @hostlabel = "hostname=#{@hostname}"
+      @takellabel = 'type=takelage-socket'
+      @sockets = docker_socket_scheme
+    end
+
+    #
+    # mutagen socket check
+    #
+    desc 'check [SOCKET]', 'Check if mutagen [SOCKET] exists'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if mutagen [SOCKET] exists
+    LONGDESC
+    # Check if mutagen [SOCKET] exists.
+    def check(socket)
+      exit mutagen_socket_check socket
+    end
+
+    #
+    # mutagen socket create
+    #
+    desc 'create [IN] [OUT]', 'Create a mutagen socket from [IN] to [OUT] of the container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Create a mutagen socket from [IN] to [OUT] of the container
+    LONGDESC
+    # Create a mutagen socket from [IN] to [OUT] of the container.
+    def create(containersock, hostsock)
+      exit mutagen_socket_create containersock, hostsock
+    end
+
+    #
+    # mutagen socket list
+    #
+    desc 'list', 'List mutagen sockets'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    List mutagen sockets
+    LONGDESC
+    # List mutagen sockets.
+    def list
+      socket_list = mutagen_socket_list
+      exit false if socket_list == false
+      say socket_list
+      true
+    end
+
+    #
+    # mutagen socket terminate
+    #
+    desc 'terminate', 'Terminate a mutagen socket'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Terminate a mutagen socket
+    LONGDESC
+    # Terminate a mutagen socket.
+    def terminate(socket)
+      exit mutagen_socket_terminate socket
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# takelage mutagen socket create
+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" \
+      "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
+
+    socket_created = _mutagen_socket_create_socket(socketname, containersock, hostsock)
+
+    unless socket_created.include? 'Created session'
+      log.debug "Unable to create mutagen socket \"#{socketname}\""
+      return false
+    end
+
+    log.debug "Created the mutagen socket \"#{socketname}\""
+    true
+  end
+
+  private
+
+  # Get git branch.
+  # rubocop:disable Metrics/MethodLength
+  def _mutagen_socket_create_socket(socketname, containersock, hostsock)
+    cmd_create_socket = format(
+      config.active['cmd_mutagen_forward_socket_create'],
+      socketname: socketname,
+      containersock: containersock,
+      hostsock: hostsock,
+      username: @username,
+      container: @hostname,
+      hostlabel: @hostlabel,
+      takellabel: @takellabel
+    )
+    run cmd_create_socket
+  end
+  # rubocop:enable Metrics/MethodLength
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# takelage mutagen socket list
+module MutagenSocketList
+  # Backend method for mutagen socket list.
+  # @return [String] List of takelage sockets
+  def mutagen_socket_list
+    log.debug 'List the mutagen takelage sockets'
+
+    sockets = _mutagen_socket_list
+
+    if sockets.to_s.empty?
+      log.debug 'No mutagen takelage sockets found'
+      return false
+    end
+
+    log.debug "Found mutagen takelage sockets: \n\"\"\"\n#{sockets}\"\"\""
+    sockets.to_s
+  end
+
+  private
+
+  # Get git branch.
+  def _mutagen_socket_list
+    cmd_list_socket = format(
+      config.active['cmd_mutagen_forward_socket_list'],
+      takellabel: @takellabel
+    )
+    run cmd_list_socket
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# takelage mutagen socket terminate
+module MutagenSocketTerminate
+  # Backend method for mutagen socket terminate.
+  def mutagen_socket_terminate(socket)
+    log.debug "Terminate the mutagen socket \"#{socket}\""
+
+    socket_terminated = _mutagen_socket_terminate_socket socket
+
+    cmd_remove = config.active['cmd_mutagen_forward_socket_remove']
+    docker_container_command cmd_remove if cmd_remove && socket_terminated.exitstatus.zero?
+
+    unless socket_terminated.exitstatus.zero?
+      log.debug "Unable to terminated mutagen socket \"#{socket}\""
+      return false
+    end
+
+    log.debug "Terminated the mutagen socket \"#{socket}\""
+    true
+  end
+
+  private
+
+  # Get git branch.
+  def _mutagen_socket_terminate_socket(socketname)
+    cmd_terminate_socket = format(
+      config.active['cmd_mutagen_forward_socket_terminate'],
+      socketname: socketname
+    )
+    try cmd_terminate_socket
+  end
+end

data/lib/takelage/version

@@ -1 +1 @@
-0.26.3
+0.28.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.28.5
 platform: ruby
 authors:
 - Geospin
@@ -259,11 +259,11 @@ files:
 - lib/takelage/git/cli.rb
 - lib/takelage/info/cli.rb
 - lib/takelage/info/project/cli.rb
+- lib/takelage/info/status/bar.rb
 - lib/takelage/info/status/cli.rb
 - lib/takelage/info/status/git.rb
 - lib/takelage/info/status/gopass.rb
 - lib/takelage/info/status/gpg.rb
-- lib/takelage/info/status/header.rb
 - lib/takelage/info/status/lib.rb
 - lib/takelage/info/status/ssh.rb
 - lib/takelage/lib/config.rb
@@ -271,6 +271,12 @@ files:
 - lib/takelage/lib/project.rb
 - lib/takelage/lib/subcmd.rb
 - lib/takelage/lib/system.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/self/cli.rb
 - lib/takelage/self/config/cli.rb
 - lib/takelage/self/list.rb

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

@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-# takelage info status header
-module InfoStatusHeader
-  # Backend method for info status header.
-  # @return [String] status info header
-  # rubocop:disable Metrics/MethodLength
-  def info_status_header
-    log.debug 'Get status info header'
-
-    @header_list = []
-
-    _info_status_header_takelage
-    _info_status_header_tau
-    _info_status_header_git
-    _info_status_header_gopass
-    _info_status_header_gpg
-    _info_status_header_ssh
-
-    header = @header_list.join(' | ')
-    log.debug "status info header: #{header}"
-    header
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  private
-
-  # Add takelage version info to header
-  def _info_status_header_takelage
-    takelage_version_file = '/etc/takelage_version'
-    return unless _file_exists? takelage_version_file
-
-    _file_read takelage_version_file
-    @header_list << "takelage: #{@content_file.chomp.green}"
-  end
-
-  # Add tau version info to header
-  def _info_status_header_tau
-    @header_list << "tau: #{Takelage::VERSION.green}"
-  end
-
-  # Add git status info to header
-  def _info_status_header_git
-    @status_git = info_status_git
-    @header_list << ("git: #{@status_git ? 'ok'.green : 'no'.red}")
-  end
-
-  # Add gopass status info to header
-  def _info_status_header_gopass
-    @status_gopass = info_status_gopass
-    @header_list << ("gopass: #{@status_gopass ? 'ok'.green : 'no'.red}")
-  end
-
-  # Add gpg status info to header
-  def _info_status_header_gpg
-    if @status_git || @status_gopass
-      @header_list << "gpg: #{'ok'.green}"
-      return
-    end
-
-    @header_list << ("gpg: #{info_status_gpg ? 'ok'.green : 'no'.red}")
-  end
-
-  # Add ssh status info to header
-  def _info_status_header_ssh
-    @header_list << ("ssh: #{info_status_ssh ? 'ok'.green : 'no'.red}")
-  end
-end
-
-# Amend String class with colorization
-class String
-  # Colorize strings
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
-
-  # String color red
-  def red
-    colorize(31)
-  end
-
-  # String color green
-  def green
-    colorize(32)
-  end
-
-  # String color yellow
-  def yellow
-    colorize(33)
-  end
-
-  # String color blue
-  def blue
-    colorize(34)
-  end
-
-  # String color pink
-  def pink
-    colorize(35)
-  end
-
-  # String color light_blue
-  def light_blue
-    colorize(36)
-  end
-end