takeltau 0.44.14 → 0.44.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3704d32de72d1e348d58f3a49ce6de49f9ceb38b3e00b0fadcc931cc1e6f22cc
-  data.tar.gz: e59db3cbfeef7f889e30490635bc674754c545ba8118713e65f8dcd10e06f84c
+  metadata.gz: b2bf72dba1a70d249a5b716a7e35489df7a27eee29371a2c02e232ad2fb6b825
+  data.tar.gz: cfe4d2c9092835f058934b24b7ebc231472be53b5e0f710f343a6703f879743b
 SHA512:
-  metadata.gz: c35ec4ed9d828710c9dea72ad6ddef5329c122ef9eb8ac500c74d75297f61fbb5adb6a78a331c8b95c4f28c755716cfec8b7c845b92b00d0b2b2598f91fa4b12
-  data.tar.gz: ade7f5feb06f8a529446005ab29c1af09062f295fe6241de2f8946e836d5a5002922f5772045dbe4a0e59a3c1870d29f845ff6c06dc6a2e8dbada99d85fb7b10
+  metadata.gz: 7c1379e557d982bf0f4b95a02e06f7f513746177b686b4e55cc0f0d9fcd89a53c031f6de4d07ba9eda568e41d8d1a84783f0063a9d92a30a8f5f5d9fcc89a65a
+  data.tar.gz: b2371e261a20852f750e9ac2613c971e53d9aa79d88a9af4b224474894f3cb566250980bb7a0c7a9638920f298af701ac4d4aee8dea372183febabb66fa7ebb8

data/README.md

@@ -67,14 +67,14 @@ You can list the *tau* commands by running
 or *tau commands*:
 
 Command	| Description
-------- | -----------
+- |-
 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 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
 tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) | Remove all docker containers
-tau [docker container command](features/cucumber/features/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
+tau [docker container command](features/cucumber/features/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container 
 tau [docker container daemon](features/cucumber/features/docker/docker.container.daemon.feature) | Run docker container in daemon mode
 tau [docker container list](features/cucumber/features/docker/docker.container.list.feature) | List docker containers
 tau [docker container login](features/cucumber/features/docker/docker.container.login.feature) | Log in to latest local docker container
@@ -82,23 +82,23 @@ tau [docker container prune](features/cucumber/features/docker/docker.container.
 tau [docker image tag check](features/cucumber/features/docker/docker.image.tag.check.feature) [TAG] | Check if local docker image [TAG] exists
 tau [docker image tag latest](features/cucumber/features/docker/docker.image.tag.latest.feature) | Print latest local docker image tag
 tau [docker image tag list](features/cucumber/features/docker/docker.image.tag.list.feature) | Print local docker image tags
-tau [docker image update](features/cucumber/features/docker/docker.image.update.feature) | Get latest remote docker container
+tau [docker image update](features/cucumber/features/docker/docker.image.update.feature) | Get latest remote docker container 
 tau [git check clean](features/cucumber/features/git/git.check.clean.feature) | Check if the git workspace is clean
 tau [git check hg](features/cucumber/features/git/git.check.hg.feature) | Check if we are on the git hg branch
-tau [git check workspace](features/cucumber/features/git/git.check.workspace.feature) | Check if a git workspace exists
+tau [git check workspace](features/cucumber/features/git/git.check.workspace.feature) | Check if a git workspace exists 
 tau [hg list](features/cucumber/features/hg/hg.list.feature) | List hg repos
 tau [hg pull](features/cucumber/features/hg/hg.pull.feature) | Pull hg repos
 tau [hg push](features/cucumber/features/hg/hg.push.feature) | Push hg repos
 tau [info project active](features/cucumber/features/info/info.project.active.feature) | Print active project info
 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 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 arch](features/cucumber/features/info/info.status.arch.feature) | Check arch status
 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 hg](features/cucumber/features/info/info.status.hg.feature) | Check hg status
+tau [info status hg](features/cucumber/features/info/info.status.hg.feature) | Check hg 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 [init packer docker](features/cucumber/features/init/init.packer.docker.feature) | Initialize packer project for docker images
@@ -108,34 +108,36 @@ tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.che
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [NAME] [IN] [OUT] | Create a mutagen socket [NAME] 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) [SOCKET] | Terminate a mutagen [SOCKET]
-tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
+tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files 
 tau [self commands](features/cucumber/features/self/self.commands.feature) | List all commands
 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
 tau [self config project](features/cucumber/features/self/self.config.project.feature) | Print takelage project config file configuration
 tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number
-tau [ship completion bash](features/cucumber/features/ship/completion/completion.bash.feature) | Print bash completion code for ship subcommand
+tau [ship completion bash](features/cucumber/features/ship/completion/completion.bash.feature) | Print bash completion code for ship subcommand 
 tau [ship container check existing](features/cucumber/features/ship/container/ship.container.check.existing.feature) | Check if a takelship is existing
 tau [ship container clean](features/cucumber/features/ship/container/ship.container.clean.feature) | Stop all takelships
 tau [ship container command](features/cucumber/features/ship/container/ship.container.command.feature) [COMMAND] | Run a [COMMAND] in a takelship container
-tau [ship container list](features/cucumber/features/ship/container/ship.container.list.feature) | List takelships
+tau [ship container list](features/cucumber/features/ship/container/ship.container.list.feature) | List takelships 
 tau [ship container login](features/cucumber/features/ship/container/ship.container.login.feature) | Log in to a takelship
+tau [ship container logs](features/cucumber/features/ship/container/ship.container.logs.feature) | Print the takelship logs
 tau [ship container podman](features/cucumber/features/ship/container/ship.container.podman.feature) [COMMAND] | Run a podman [COMMAND] in a takelship
 tau [ship container stop](features/cucumber/features/ship/container/ship.container.stop.feature) | Stop a takelship
 tau [ship container sudo](features/cucumber/features/ship/container/ship.container.sudo.feature) [COMMAND] | Run a sudo [COMMAND] in a takelship
 tau [ship container update](features/cucumber/features/ship/container/ship.container.update.feature) | Update takelship image
 tau [ship info takelconfig](features/cucumber/features/ship/info/ship.info.takelconfig.feature) | Print takelage config
 tau [ship info takelship](features/cucumber/features/ship/info/ship.info.takelship.feature) | Print takelship info
-tau [ship project list](features/cucumber/features/ship/project/ship.project.list.feature) | List takelship projects
-tau [ship project logs](features/cucumber/features/ship/project/ship.project.logs.feature) [PROJECT] | Follow logs of a takelship [PROJECT]
-tau [ship project start](features/cucumber/features/ship/project/ship.project.start.feature) [PROJECT] | Start a takelship [PROJECT]
+tau [ship project create](features/cucumber/features/ship/project/ship.project.create.feature) [PROJECT] | Create a takelship [PROJECT]
+tau [ship project list](features/cucumber/features/ship/project/ship.project.list.feature) | List takelship projects 
+tau [ship project start](features/cucumber/features/ship/project/ship.project.start.feature) [PROJECT] | Start a takelship [PROJECT] 
 tau [ship project stop](features/cucumber/features/ship/project/ship.project.stop.feature) | Stop a takelship project
-tau ship board | Alias for tau [ship container login](features/cucumber/features/ship/container/ship.container.login.feature)
+tau [ship project update](features/cucumber/features/ship/project/ship.project.create.feature) [PROJECT] | Update a takelship [PROJECT]
+tau ship board | Alias for tau [ship container login](features/cucumber/features/ship/container/ship.container.login.feature) 
 tau ship command [COMMAND] | Alias for tau [ship container command](features/cucumber/features/ship/container/ship.container.command.feature)
 tau ship list | Alias for tau [ship container list](features/cucumber/features/ship/container/ship.container.list.feature)
-tau ship login | Alias for tau [ship container login](features/cucumber/features/ship/container/ship.container.login.feature)
-tau ship logs [PROJECT] | Alias for tau [ship project logs](features/cucumber/features/ship/project/ship.project.logs.feature)
+tau ship login | Alias for tau [ship container login](features/cucumber/features/ship/container/ship.container.login.feature) 
+tau ship logs | Alias for [tau ship container logs](features/cucumber/features/ship/container/ship.container.logs.feature) 
 tau ship ls | Alias for tau [ship container list](features/cucumber/features/ship/container/ship.container.list.feature)
 tau ship podman [COMMAND] | Alias for tau [ship container podman](features/cucumber/features/ship/container/ship.container.podman.feature)
 tau ship sail [PROJECT] | Alias for tau [ship project start](features/cucumber/features/ship/project/ship.project.start.feature)
@@ -144,17 +146,17 @@ tau ship stop | Alias for tau [ship project stop](features/cucumber/features/shi
 tau ship sudo [COMMAND] | Alias for tau [ship container sudo](features/cucumber/features/ship/container/ship.container.sudo.feature)
 tau ship wreck | Alias for tau [ship project stop](features/cucumber/features/ship/project/ship.project.stop.feature)
 tau ship update | Alias for tau [ship container update](features/cucumber/features/ship/container/ship.container.update.feature)
-tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
+tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) 
 tau commands | Alias for tau [self commands](features/cucumber/features/self/self.commands.feature)
 tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature)
 tau list | Alias for tau [docker container list](features/cucumber/features/docker/docker.container.list.feature)
 tau ls | Alias for tau [docker container list](features/cucumber/features/docker/docker.container.list.feature)
-tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature)
+tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature) 
 tau project | Alias for tau [info project active](features/cucumber/features/info/info.project.active.feature)
-tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)
+tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.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)
+tau version | Alias for tau [self version](features/cucumber/features/self/self.version.feature) 
 
 **Warning: *tau update* will call *docker image prune* and remove all dangling images!**
 
@@ -170,9 +172,9 @@ or *tau config*.
 
 | Filename | Precedence | Description |
 |-|-|-|
-| *default.yml* | lowest | Shipped with *takelage-cli*. Sets defaults where applicable.                                                          |
-| *~/.takelage.yml* | normal | User-wide configuration file in your home directory. This is your normal custom configuration file.                   |
-| *takelage.yml* | highest | Project-specific configuration file next to your main Rakefile. Some projects need special configuration.             |
+| *default.yml* | lowest | Shipped with *takelage-cli*. Sets defaults where applicable.|
+| *~/.takelage.yml* | normal | User-wide configuration file in your home directory. This is your normal custom configuration file.|
+| *takelage.yml* | highest | Project-specific configuration file next to your main Rakefile. Some projects need special configuration.|
 | TAKELAGE_TAU_CONFIG_* | ultimate | Fileless configuration through TAKELAGE_TAU_CONFIG environment variables. |
 
 The tau command line tool is directory-aware so it is important that you can set the working directory of the tau command.
@@ -238,7 +240,7 @@ or *tau project*.
 
 | Default filename | Config key | Precedence | Description |
 | -------- | ---------- | ---------- | ----------- |
-| *project.yml* | info_project_main | normal | Main project file.  |
+| *project.yml* | info_project_main | normal | Main project file.|
 | *private/project.yml* | info_project_private | highest | Private project file. Should be in *.gitignore*. |
 
 ### Bash Completion
@@ -270,8 +272,8 @@ You need to whitelist it in your host's docker engine configuration:
 
 ```json
 {
-  "insecure-registries": [
-    "host.docker.internal:5005"
-  ]
+"insecure-registries": [
+"host.docker.internal:5005"
+]
 }
 ```

data/lib/takeltau/default.yml

@@ -58,12 +58,12 @@ cmd_mutagen_forward_socket_list: 'mutagen forward list --label-selector="%{takel
 cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
 cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
 cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
+cmd_ship_container_logs: '%{ship_docker} logs %{ship_hostname} %{args}'
 cmd_ship_container_login: 'bash'
 cmd_ship_docker: 'docker'
 cmd_ship_docker_check: 'docker --version'
-cmd_ship_project_follow_logs: 'pod --workdir /home/podman/takelship/compose/projects/%{project} podman-compose logs --follow'
-cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{image} %{command}'
-cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
+cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive  %{ship_run_args_nonprivileged} %{image} %{command}'
+cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume %{project_root_dir}/%{ship_data_dir}:/home/podman/takelship %{ship_run_args_privileged} %{image} %{command}'
 cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
 docker_container_check_matrjoschka: 'true'
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
@@ -98,6 +98,8 @@ ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'
 ship_port_expose_podman_socket: 'false'
 ship_repo: 'takelship'
+ship_run_args_nonprivileged: ''
+ship_run_args_privileged: ''
 ship_tag: 'latest'
 ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
 ship_user: 'takelwerk'

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

@@ -4,7 +4,6 @@
 module DockerCheckDaemon
   # Backend method for docker check daemon.
   # @return [Boolean] is the docker daemon running?
-  # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def docker_check_daemon(docker = 'cmd_docker', docker_check = 'cmd_docker_check')
     return false unless command_available_else_error? config.active[docker_check]
@@ -25,5 +24,4 @@ module DockerCheckDaemon
     true
   end
   # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 end

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

@@ -28,7 +28,6 @@ module Takeltau
 
     # 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
@@ -50,7 +49,6 @@ module Takeltau
       @sshsock_container = config.active['mutagen_socket_path_ssh_container']
       @sshsock_host = config.active['mutagen_socket_path_ssh_host']
     end
-    # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
 
     desc 'check [COMMAND]', 'Check docker container'

data/lib/takeltau/docker/container/lib.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 # tau docker container lib
-# rubocop:disable Metrics/ModuleLength
 # rubocop:disable Style/IfUnlessModifier
 module DockerContainerLib
   private
@@ -201,4 +200,3 @@ module DockerContainerLib
   end
 end
 # rubocop:enable Style/IfUnlessModifier
-# rubocop:enable Metrics/ModuleLength

data/lib/takeltau/docker/container/list.rb

@@ -12,8 +12,6 @@ module DockerContainerList
   private
 
   # Get the current inventory
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
   def _docker_container_list_get_inventory
     destination = '/project'
     docker = config.active['cmd_docker']
@@ -29,8 +27,6 @@ module DockerContainerList
     end
     inventory
   end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
 
   # Create a new inventory
   def _docker_container_list_new_inventory

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

@@ -23,7 +23,6 @@ module DockerImageTagCheck
   private
 
   # Check if image exists.
-  # rubocop:disable Metrics/MethodLength
   def _docker_image_check_image?(image)
     cmd_docker_images =
       format(
@@ -39,5 +38,4 @@ module DockerImageTagCheck
 
     true
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/lib/takeltau/git/lib.rb

@@ -3,7 +3,6 @@
 # tau git lib
 module GitLib
   # Prepare git workspace.
-  # rubocop:disable Metrics/MethodLength
   def git_lib_prepare_git_workspace
     log.debug 'Prepare git workspace'
 
@@ -24,7 +23,6 @@ module GitLib
     log.error 'Unable to pull git workspace'
     false
   end
-  # rubocop:enable Metrics/MethodLength
 
   # Push git workspace.
   def git_lib_push_hg_dirs

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

@@ -4,7 +4,6 @@
 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'
 
@@ -24,7 +23,6 @@ module InfoStatusBar
     say @bar_list.join(' | ')
     @bar_status
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 

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

@@ -4,7 +4,6 @@
 module InfoStatusGopass
   # Backend method for info status gopass.
   # @return [Boolean] is gopass available?
-  # rubocop:disable Metrics/MethodLength
   def info_status_gopass
     log.debug 'Check gopass status'
 
@@ -25,7 +24,6 @@ module InfoStatusGopass
     log.debug 'gopass is available'
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 

data/lib/takeltau/info/status/gpg.rb

@@ -4,7 +4,6 @@
 module InfoStatusGPG
   # Backend method for info status gpg.
   # @return [Boolean] is GPG available?
-  # rubocop:disable Metrics/MethodLength
   def info_status_gpg
     log.debug 'Check gpg status'
 
@@ -21,7 +20,6 @@ module InfoStatusGPG
     log.debug 'gpg is available'
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 

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

@@ -4,7 +4,6 @@
 module InfoStatusSSH
   # Backend method for info status ssh.
   # @return [Boolean] is ssh available?
-  # rubocop:disable Metrics/MethodLength
   def info_status_ssh
     log.debug 'Check ssh status'
 
@@ -29,7 +28,6 @@ module InfoStatusSSH
     log.debug 'ssh is available'
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 

data/lib/takeltau/init/takelage/cli.rb

@@ -16,7 +16,6 @@ module Takeltau
     argument :name
 
     # Define templates
-    # rubocop:disable Metrics/MethodLength
     def initialize(args = [], local_options = {}, configuration = {})
       # initialize thor parent class
       super args, local_options, configuration
@@ -38,7 +37,6 @@ module Takeltau
         template: '../templates/Rakefile.tt'
       }
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Provide template path for Thor:Actions
     def self.source_root

data/lib/takeltau/lib/config.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 # tau config module
-# rubocop:disable Metrics/ModuleLength
 module ConfigModule
   # tau config class.
   class TakeltauConfig
@@ -23,7 +22,7 @@ module ConfigModule
   # Initialize config
   # rubocop:disable Metrics/AbcSize
   def initialize_config(workdir)
-    project_root_dir = _get_project_root_dir workdir
+    project_root_dir = File.expand_path _get_project_root_dir workdir
 
     log.debug "takelage version: #{Takeltau::VERSION}"
     log.debug "Current working directory: #{Dir.pwd}"
@@ -119,7 +118,6 @@ module ConfigModule
   end
 
   # Merge active config.
-  # rubocop:disable Metrics/AbcSize
   def _config_merge_active
     # make a clone or else we'll change the original hash
     default = TakeltauConfig.instance.default.clone
@@ -133,12 +131,9 @@ module ConfigModule
     project_over_home = home.merge!(envvars_over_project)
     default.merge!(project_over_home).sort.to_h
   end
-  # rubocop:enable Metrics/AbcSize
 
   # Get project root directory.
   # @return [String] project root directory
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def _get_project_root_dir(workdir)
     tau_workdir_root_dir = _get_workdir_root_dir workdir
     unless tau_workdir_root_dir.empty?
@@ -161,8 +156,6 @@ module ConfigModule
     log.debug "Setting root dir to current working dir \"#{Dir.pwd}\""
     Dir.pwd
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 
   # Return a command line workdir
   def _get_workdir_root_dir(workdir)
@@ -177,4 +170,3 @@ module ConfigModule
     path_rakefile
   end
 end
-# rubocop:enable Metrics/ModuleLength

data/lib/takeltau/lib/system.rb

@@ -69,12 +69,14 @@ module SystemModule
   # Run a command and return the standard output.
   # @return [String] stdout of command
   def run(command)
-    log.debug "Running 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
+    Dir.chdir(config.active['project_root_dir']) do
+      log.debug "Running 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
+    end
   end
 
   # Run a command and return the standard output
@@ -82,25 +84,31 @@ module SystemModule
   # @return [[String, String, Integer]] array of
   # stdout, stderr, exitstatus of command
   def run_and_capture(command)
-    log.debug "Running and 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]
+    Dir.chdir(config.active['project_root_dir']) do
+      log.debug "Running and 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
   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"
-    exec command
+    Dir.chdir(config.active['project_root_dir']) do
+      log.debug "Running command \"#{command}\" and exiting afterwards"
+      exec command
+    end
   end
 
   # Use Kernel#fork and Kernel#exec to run a command as a background process.
   def run_and_fork(command)
     log.debug "Running command \"#{command}\" as a background process"
     job = fork do
-      exec command
+      Dir.chdir(config.active['project_root_dir']) do
+        exec command
+      end
     end
     Process.detach(job)
   end
@@ -108,25 +116,28 @@ module SystemModule
   # Run a command and return the result.
   # @return [Boolean] success of command run
   def try(command)
-    log.debug "Running 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}\""
-    status
+    Dir.chdir(config.active['project_root_dir']) do
+      log.debug "Running 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}\""
+      status
+    end
   end
 
   private
 
   # Check if command is available
-  # rubocop:disable Metrics/MethodLength
   def _command_available?(command)
     return true if _command_already_checked command
 
     log.debug "Check if the command \"#{command}\" is available"
     begin
-      status = try command
-      return false unless status.exitstatus.zero?
+      Dir.chdir(config.active['project_root_dir']) do
+        status = try command
+        return false unless status.exitstatus.zero?
+      end
     rescue Errno::ENOENT => e
       log.debug 'The command failed with an error.'
       log.debug "Class of error: #{e.class}"
@@ -135,7 +146,6 @@ module SystemModule
     end
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   # Check if command has already been checked
   def _command_already_checked(command)

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

@@ -4,7 +4,6 @@
 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'
@@ -36,12 +35,10 @@ module MutagenCheckDaemon
     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'],
@@ -62,5 +59,4 @@ module MutagenCheckDaemon
 
     true
   end
-  # rubocop:enable Metrics/MethodLength
 end

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

@@ -3,7 +3,6 @@
 # tau mutagen socket create
 module MutagenSocketCreate
   # Backend method for mutagen socket create.
-  # rubocop:disable Metrics/MethodLength
   def mutagen_socket_create(name, containersock, hostsock)
     # See DockerContainerLib::_docker_container_lib_hostname
     socketname = "#{@hostname[-11..]}-#{name}"
@@ -22,12 +21,10 @@ module MutagenSocketCreate
     log.debug "Created the mutagen socket \"#{socketname}\""
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   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'],
@@ -41,5 +38,4 @@ module MutagenSocketCreate
     )
     run cmd_create_socket
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/lib/takeltau/mutagen/socket/docker.rb

@@ -3,7 +3,6 @@
 # tau mutagen socket docker
 module MutagenSocketDocker
   # Backend method for mutagen socket docker.
-  # rubocop:disable Metrics/MethodLength
   def mutagen_socket_docker(hostsock)
     # See DockerContainerLib::_docker_container_lib_hostname
     socketname = "#{@hostname[-11..]}-docker"
@@ -22,7 +21,6 @@ module MutagenSocketDocker
     log.debug "Created the mutagen docker socket \"#{socketname}\""
     true
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 

data/lib/takeltau/ship/cli.rb

@@ -53,7 +53,7 @@ module Takeltau
     LONGDESC
     # ship command: {Takeltau::ShipContainer#command}
     def command(*args)
-      Takeltau::ShipContainer.new.command args
+      Takeltau::ShipContainer.new.command(*args)
     end
 
     desc 'list', 'List takelships'
@@ -66,14 +66,24 @@ module Takeltau
       Takeltau::ShipContainer.new.list
     end
 
-    desc 'logs [PROJECT]', 'Follow logs of takelship [PROJECT]'
+    desc 'login', 'Log in to a takelship'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Log in to a takelship as root.
+    Alias for ship container login.
+    LONGDESC
+    # ship login: {Takeltau::ShipContainer#login}
+    def login
+      Takeltau::ShipContainer.new.login
+    end
+
+    desc 'logs [OPTIONS]', 'Print the takelship logs'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Follow logs of project [PROJECT] in a takelship project.
-    Alias for ship project logs.
+    Print the takelship logs.
+    Alias for ship container logs.
     LONGDESC
-    # ship logs: {Takeltau::ShipProject#logs}
-    def logs(project = 'default')
-      Takeltau::ShipProject.new.logs(project)
+    # ship logs: {Takeltau::ShipContainer#logs}
+    def logs(*args)
+      Takeltau::ShipContainer.new.logs(*args)
     end
 
     desc 'ls', 'List takelships'
@@ -86,16 +96,6 @@ module Takeltau
       Takeltau::ShipContainer.new.list
     end
 
-    desc 'login', 'Log in to a takelship'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Log in to a takelship as root.
-    Alias for ship container login.
-    LONGDESC
-    # ship login: {Takeltau::ShipContainer#login}
-    def login
-      Takeltau::ShipContainer.new.login
-    end
-
     desc 'podman [COMMAND]', 'Run a podman [COMMAND] in a takelship'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Run a podman command as user podman in a takelship container.
@@ -103,7 +103,7 @@ module Takeltau
     LONGDESC
     # ship podman: {Takeltau::ShipContainer#podman}
     def podman(*args)
-      Takeltau::ShipContainer.new.podman args
+      Takeltau::ShipContainer.new.podman(*args)
     end
 
     desc 'sudo [COMMAND]', 'Run a sudo [COMMAND] in a takelship'
@@ -113,7 +113,7 @@ module Takeltau
     LONGDESC
     # ship sudo: {Takeltau::ShipContainer#sudo}
     def sudo(*args)
-      Takeltau::ShipContainer.new.sudo args
+      Takeltau::ShipContainer.new.sudo(*args)
     end
 
     desc 'start [PROJECT]', 'Start takelship [PROJECT]'

data/lib/takeltau/ship/container/clean.rb

@@ -10,7 +10,6 @@ module ShipContainerClean
   private
 
   # Remove all takelship containers
-  # rubocop:disable Metrics/MethodLength
   def _ship_container_clean_remove_containers
     ship_name = config.active['ship_name']
     log.debug "Getting all #{ship_name} containers"
@@ -26,5 +25,4 @@ module ShipContainerClean
       _ship_container_lib_remove_container container
     end
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/lib/takeltau/ship/container/cli.rb

@@ -13,6 +13,7 @@ module Takeltau
     include ShipContainerClean
     include ShipContainerList
     include ShipContainerLogin
+    include ShipContainerLogs
     include ShipContainerPodman
     include ShipContainerCommand
     include ShipContainerSudo
@@ -66,6 +67,19 @@ module Takeltau
       ship_container_login
     end
 
+    #
+    # ship container logs
+    #
+    desc 'logs [OPTIONS]', 'Print the takelship logs'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print the takelship logs.
+    Accepts docker logs options.
+    See: docker help logs
+    LONGDESC
+    def logs(*args)
+      ship_container_logs args
+    end
+
     #
     # ship container podman
     #

data/lib/takeltau/ship/container/lib.rb

@@ -5,10 +5,13 @@ module ShipContainerLib
   private
 
   # Run nonprivileged docker command
-  def _ship_container_lib_docker_nonprivileged(command)
+  def _ship_container_lib_docker_nonprivileged(command, args = '')
+    args_nonprivileged = config.active['ship_run_args_nonprivileged']
+    args = "#{args} #{args_nonprivileged}" if config.active['ship_run_args_nonprivileged']
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
       ship_docker: config.active['cmd_ship_docker'],
+      ship_run_args_nonprivileged: args,
       image: _ship_container_lib_image,
       command: command
     )
@@ -18,7 +21,9 @@ module ShipContainerLib
   # Run privileged docker command
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
-  def _ship_container_lib_docker_privileged(ports, command)
+  def _ship_container_lib_docker_privileged(ports, command, args = '')
+    args_privileged = config.active['ship_run_args_privileged']
+    args = "#{args} #{args_privileged}" if config.active['ship_run_args_privileged']
     ship_data_dir = config.active['ship_data_dir']
     ship_env = [config.active['ship_env']]
     ports.each do |key, port|
@@ -33,7 +38,9 @@ module ShipContainerLib
       ship_hostname: _ship_container_lib_ship_hostname,
       ship_env: ship_env.join(' '),
       ports: ports,
+      project_root_dir: config.active['project_root_dir'],
       ship_data_dir: ship_data_dir,
+      ship_run_args_privileged: args,
       image: _ship_container_lib_image,
       command: command
     )
@@ -66,7 +73,7 @@ module ShipContainerLib
   # Create unique docker hostname
   def _ship_container_lib_ship_hostname
     ship_name = config.active['ship_name']
-    workdir = Dir.getwd
+    workdir = config.active['project_root_dir']
     unique_name = "#{ship_name}_#{workdir}"
     digest = Digest::SHA256.bubblebabble unique_name
     unique = digest[0..10]

data/lib/takeltau/ship/container/logs.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# tau ship container logs
+module ShipContainerLogs
+  # Start a takelship
+  def ship_container_logs(args)
+    ship_hostname = _ship_container_lib_ship_hostname
+
+    unless ship_container_check_existing
+      say "The takelship #{ship_hostname} is not sailing."
+      return false
+    end
+
+    log.debug 'Printing docker logs'
+    _ship_container_logs_print(ship_hostname, args.join(' '))
+  end
+
+  private
+
+  def _ship_container_logs_print(ship_hostname, args)
+    cmd_follow_logs = format(
+      config.active['cmd_ship_container_logs'],
+      ship_docker: config.active['cmd_ship_docker'],
+      ship_hostname: ship_hostname,
+      args: args
+    )
+    run_and_exit cmd_follow_logs
+  end
+end

data/lib/takeltau/ship/ports/lib.rb

@@ -5,7 +5,6 @@ module ShipPortsLib
   private
 
   # get the ports of a takelship
-  # rubocop:disable Metrics/MethodLength
   def _ship_ports_lib_get_ports(takelship, takelproject)
     ports = _ship_ports_lib_get_ports_docker(takelship)
     takelship['projects'].each do |project|
@@ -22,7 +21,6 @@ module ShipPortsLib
     end
     ports
   end
-  # rubocop:enable Metrics/MethodLength
 
   # write ports to project takelage.yml
   def _ship_ports_lib_write_ports(ports, project)
@@ -48,7 +46,6 @@ module ShipPortsLib
 
   # map the podman socket port (aka "DOCKER_HOST")
   # returns a hash unlike the get_port method
-  # rubocop:disable Metrics/MethodLength
   def _ship_ports_lib_get_ports_docker(takelship)
     takel_docker = takelship['docker_host']
     docker_key = "ship_ports_docker_host_docker_#{takel_docker}"
@@ -64,10 +61,8 @@ module ShipPortsLib
       }
     }
   end
-  # rubocop:enable Metrics/MethodLength
 
   # map a takelship port
-  # rubocop:disable Metrics/MethodLength
   def _ship_ports_lib_get_port(key, port, service)
     localhost = _ship_ports_lib_get_localhost_port key, port['port']
     unless port.key?('description')
@@ -87,7 +82,6 @@ module ShipPortsLib
       'description' => port['description']
     }
   end
-  # rubocop:enable Metrics/MethodLength
 
   # get new port on localhost for takelport
   def _ship_ports_lib_get_localhost_port(key, port)

data/lib/takeltau/ship/project/cli.rb

@@ -13,34 +13,36 @@ module Takeltau
     include ShipContainerStop
     include ShipInfoLib
     include ShipPortsLib
+    include ShipProjectCreate
     include ShipProjectList
-    include ShipProjectLogs
     include ShipProjectStart
 
     #
-    # ship container list
+    # ship project dump
     #
-    desc 'list', 'List takelship projects'
+    desc 'create [PROJECT]', 'Create a takelship [PROJECT]'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    List all available takelship projects.
+    Create a takelship [PROJECT].
+    This command will create the configuration files of a takelship [PROJECT].
+    It will neither run the [PROJECT] in a takelship nor create service data.
     LONGDESC
-    def list
-      ship_project_list
+    def create(project = 'default')
+      say ship_project_create project
     end
 
     #
-    # ship container logs
+    # ship project list
     #
-    desc 'logs [PROJECT]', 'Follow logs of [PROJECT]'
+    desc 'list', 'List takelship projects'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Follow logs of project [PROJECT] in a takelship project.
+    List all available takelship projects.
     LONGDESC
-    def logs(project = 'default')
-      ship_project_logs project
+    def list
+      ship_project_list
     end
 
     #
-    # ship container start
+    # ship project start
     #
     desc 'start [PROJECT]', 'Start takelship [PROJECT]'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
@@ -61,5 +63,18 @@ module Takeltau
     def stop
       say ship_container_stop
     end
+
+    #
+    # ship project update
+    #
+    desc 'update [PROJECT]', 'Update a takelship [PROJECT]'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Update a takelship [PROJECT].
+    This command will update the configuration files of a takelship [PROJECT].
+    It will neither run the [PROJECT] in a takelship nor touch the service data.
+    LONGDESC
+    def update(project = 'default')
+      say ship_project_create project, 'Updated'
+    end
   end
 end

data/lib/takeltau/ship/project/create.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# tau ship project create
+module ShipProjectCreate
+  # Start a takelship
+  def ship_project_create(project, verb = 'Created')
+    takelship = _ship_info_lib_get_takelshipinfo
+    project = _ship_info_lib_get_project project, takelship
+    return false unless _ship_project_start_valid_project? takelship, project
+
+    log.debug "Dumping takelship project \"#{project}\""
+    ports = _ship_ports_lib_get_ports(takelship, project)
+    project_root_dir = config.active['project_root_dir']
+    ship_data_dir = config.active['ship_data_dir']
+    args = []
+    args << "--volume #{project_root_dir}/#{ship_data_dir}:/home/podman/takelship"
+    args << '--env TAKELSHIP_DUMP=true'
+    _ship_container_lib_docker_privileged ports, project, args.join(' ')
+    "#{verb} takelship project \"#{project}\"."
+  end
+end

data/lib/takeltau/ship/project/start.rb

@@ -3,17 +3,14 @@
 # tau ship project start
 module ShipProjectStart
   # Start a takelship
-  # rubocop:disable Metrics/MethodLength
   def ship_project_start(project)
     return false unless _ship_project_start_matrjoschka?
 
     takelship = _ship_info_lib_get_takelshipinfo
     project = _ship_info_lib_get_project project, takelship
-
     return false unless _ship_project_start_valid_project? takelship, project
 
     ports = _ship_ports_lib_get_ports(takelship, project)
-
     return false unless _ship_project_start_sailing? project, ports
 
     log.debug 'Writing port configuration to takelage.yml'
@@ -24,7 +21,6 @@ module ShipProjectStart
     say "Started project \"#{project}\" on takelship \"#{_ship_container_lib_ship_hostname}\".\n\n"
     _ship_project_start_print_ports ports
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -55,8 +51,6 @@ module ShipProjectStart
   end
 
   # print ports after starting a takelship
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def _ship_project_start_print_ports(ports)
     output = []
     max_length = _ship_project_start_get_maxlength ports
@@ -71,12 +65,8 @@ module ShipProjectStart
     end
     output.join("\n")
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 
   # get max length of left column
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def _ship_project_start_get_maxlength(ports)
     max_length = {}
     max_length['url'] = 0
@@ -93,6 +83,4 @@ module ShipProjectStart
     end
     max_length
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 end

data/lib/takeltau/version

@@ -1 +1 @@
-0.44.14
+0.44.15

data/lib/takeltau.rb

@@ -91,6 +91,7 @@ require_relative 'takeltau/ship/info/lib'
 require_relative 'takeltau/ship/container/list'
 require_relative 'takeltau/ship/container/clean'
 require_relative 'takeltau/ship/container/command'
+require_relative 'takeltau/ship/container/logs'
 require_relative 'takeltau/ship/container/login'
 require_relative 'takeltau/ship/container/podman'
 require_relative 'takeltau/ship/container/sudo'
@@ -101,8 +102,8 @@ require_relative 'takeltau/ship/info/cli'
 require_relative 'takeltau/ship/ports/lib'
 require_relative 'takeltau/ship/ports/list'
 require_relative 'takeltau/ship/ports/cli'
+require_relative 'takeltau/ship/project/create'
 require_relative 'takeltau/ship/project/list'
-require_relative 'takeltau/ship/project/logs'
 require_relative 'takeltau/ship/project/start'
 require_relative 'takeltau/ship/project/cli'
 require_relative 'takeltau/ship/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.44.14
+  version: 0.44.15
 platform: ruby
 authors:
 - Takelwerk
@@ -294,6 +294,7 @@ files:
 - lib/takeltau/ship/container/lib.rb
 - lib/takeltau/ship/container/list.rb
 - lib/takeltau/ship/container/login.rb
+- lib/takeltau/ship/container/logs.rb
 - lib/takeltau/ship/container/podman.rb
 - lib/takeltau/ship/container/stop.rb
 - lib/takeltau/ship/container/sudo.rb
@@ -304,8 +305,8 @@ files:
 - lib/takeltau/ship/ports/lib.rb
 - lib/takeltau/ship/ports/list.rb
 - lib/takeltau/ship/project/cli.rb
+- lib/takeltau/ship/project/create.rb
 - lib/takeltau/ship/project/list.rb
-- lib/takeltau/ship/project/logs.rb
 - lib/takeltau/ship/project/start.rb
 - lib/takeltau/version
 homepage: https://github.com/takelwerk/takelage-cli

data/lib/takeltau/ship/project/logs.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# tau ship project logs
-module ShipProjectLogs
-  # Start a takelship
-  def ship_project_logs(project)
-    return unless ship_container_check_existing
-
-    takelship = _ship_info_lib_get_takelshipinfo
-    project = _ship_info_lib_get_project(project, takelship)
-
-    return false unless _ship_info_lib_valid_project? takelship, project
-
-    log.debug "Following logs of takelship project \"#{project}\""
-    _ship_project_logs_follow_logs project
-  end
-
-  private
-
-  def _ship_project_logs_follow_logs(project)
-    cmd_follow_logs = format(
-      config.active['cmd_ship_project_follow_logs'],
-      project: project
-    )
-    _ship_container_lib_docker_exec cmd_follow_logs
-  end
-end