takeltau 0.43.19 → 0.43.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b433846c95247973be471defc8590126e5271d13069fa300f0abbd1f5c5e580
-  data.tar.gz: a94d442031c78bddb68f2789732f5f98ddbbbcd7819b59053becc20a218d5ded
+  metadata.gz: 179f0b7a1f0a55cb3a19d640fae0e44172943941112cf79ffa3b676e08424bee
+  data.tar.gz: d33e64ed86c368e1c60a82e026f24d8214f1aa426eaa88db0764c4e02ab7b517
 SHA512:
-  metadata.gz: 8e334b9e260c0cc13ac64dd0dc1caa0aff76bcb8d9d67ce4ca5143bacb6447ee9e17c5ae20718b6532ffb226c66397048a26cd08b0b0462f1a88bb5b49f4a243
-  data.tar.gz: c7059141332e62277af38fabb1aa411f1e260470cea3bee256d4812e053a26d94e155c37ae5829bc176cc37576cf70a00c40704214bed5163205108509c792fd
+  metadata.gz: 7ecfd4990c4bbb84cd1715218d78bef5aac178b487c9abe8cf0c0d802097fd3fa400cd887210878ed392e2f17afad6060c9b2b671124641cb7687cb5a42f067b
+  data.tar.gz: 0401d8bd721ae94f4e15abcd861934c8423b1b513f5ad409938df7def79db972a6ad0197bd6ad71a86071f4ea31fc82986910b41d2ca01e721fd778b92841ea8

data/lib/takeltau/default.yml

@@ -64,6 +64,7 @@ cmd_ship_docker_check: 'docker --version'
 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_stop: '%{ship_docker} stop %{ship_hostname}'
+cmd_ship_project_follow_logs: 'pod --workdir /home/podman/takelship/compose/projects/%{project} podman-compose logs --follow'
 docker_container_check_matrjoschka: 'true'
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: ''

data/lib/takeltau/ship/cli.rb

@@ -38,6 +38,12 @@ module Takeltau
       Takeltau::ShipContainer.new.list
     end
 
+    desc 'logs [PROJECT]', 'Alias for tau ship project logs'
+    # ship logs: {Takeltau::ShipProject#logs}
+    def logs(project = 'default')
+      Takeltau::ShipProject.new.logs(project)
+    end
+
     desc 'ls', 'Alias for tau ship container list'
     # ship list: {Takeltau::ShipContainer#list}
     def ls
@@ -56,6 +62,18 @@ module Takeltau
       Takeltau::ShipContainer.new.podman args
     end
 
+    desc 'command [ARGS]', 'Alias for tau ship container command'
+    # ship command: {Takeltau::ShipContainer#command}
+    def command(*args)
+      Takeltau::ShipContainer.new.command args
+    end
+
+    desc 'sudo [ARGS]', 'Alias for tau ship container sudo'
+    # ship sudo: {Takeltau::ShipContainer#sudo}
+    def sudo(*args)
+      Takeltau::ShipContainer.new.sudo args
+    end
+
     desc 'start [PROJECT]', 'Alias for tau ship project start'
     # ship start: {Takeltau::ShipProject#start}
     def start(project = 'default')

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

@@ -14,6 +14,8 @@ module Takeltau
     include ShipContainerList
     include ShipContainerLogin
     include ShipContainerPodman
+    include ShipContainerCommand
+    include ShipContainerSudo
     include ShipContainerStop
     include ShipContainerUpdate
 
@@ -25,19 +27,31 @@ module Takeltau
     #
     desc 'clean', 'Stop all takelship containers'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Stop all takelship containers
+    Stop all takelship containers
     LONGDESC
     # Stop all takelship containers.
     def clean
       ship_container_clean
     end
 
+    #
+    # ship container command
+    #
+    desc 'command', 'Run a command in a takelship container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Run a command in a takelship container
+    LONGDESC
+    # Run a command in a takelship container.
+    def command(*args)
+      say ship_container_command args
+    end
+
     #
     # ship container list
     #
     desc 'list', 'List takelship containers'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      List takelage containers
+    List takelage containers
     LONGDESC
     # List takelage containers.
     def list
@@ -49,7 +63,7 @@ module Takeltau
     #
     desc 'login', 'Log in to a takelship'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Log in to a takelship
+    Log in to a takelship
     LONGDESC
     # Log in to a takelship.
     def login
@@ -61,19 +75,31 @@ module Takeltau
     #
     desc 'podman', 'Run podman command'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Run podman command
+    Run podman command
     LONGDESC
     # Run podman command.
     def podman(*args)
       say ship_container_podman args
     end
 
+    #
+    # ship container sudo
+    #
+    desc 'sudo', 'Run a sudo command in a takelship container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Run a sudo command in a takelship container
+    LONGDESC
+    # Run a sudo command in a takelship container.
+    def sudo(*args)
+      say ship_container_sudo args
+    end
+
     #
     # ship container stop
     #
     desc 'stop', 'Stop takelship container'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Stop takelship container
+    Stop takelship container
     LONGDESC
     # Stop takelship container.
     def stop
@@ -85,7 +111,7 @@ module Takeltau
     #
     desc 'update', 'Update takelship image'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Update takelship image
+    Update takelship image
     LONGDESC
     # Update takelship image.
     def update

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# tau ship container command
+module ShipContainerCommand
+  # Run a command in a takelship
+  def ship_container_command(args)
+    return false unless ship_container_check_existing
+
+    _ship_container_lib_docker_exec "pod #{args.join(' ')}"
+  end
+end

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

@@ -40,7 +40,7 @@ module ShipContainerLib
   # rubocop:enable Metrics/AbcSize
 
   # Run a docker command in a takelship container
-  def _ship_container_lib_docker(command, tty = '--tty')
+  def _ship_container_lib_docker_exec(command, tty = '--tty')
     cmd_docker_run_command = format(
       config.active['cmd_ship_container_docker'],
       ship_docker: config.active['cmd_ship_docker'],

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

@@ -7,6 +7,6 @@ module ShipContainerLogin
     return false unless ship_container_check_existing
 
     command_after_login = config.active['cmd_ship_container_login']
-    _ship_container_lib_docker command_after_login, '--tty'
+    _ship_container_lib_docker_exec command_after_login, '--tty'
   end
 end

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

@@ -6,6 +6,6 @@ module ShipContainerPodman
   def ship_container_podman(args)
     return false unless ship_container_check_existing
 
-    _ship_container_lib_docker "pod podman #{args.join(' ')}"
+    _ship_container_lib_docker_exec "pod podman #{args.join(' ')}"
   end
 end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# tau ship container sudo
+module ShipContainerSudo
+  # Run a sudo command in a takelship
+  def ship_container_sudo(args)
+    return false unless ship_container_check_existing
+
+    _ship_container_lib_docker_exec args.join(' ')
+  end
+end

data/lib/takeltau/ship/info/lib.rb

@@ -33,6 +33,14 @@ module ShipInfoLib
     _parse_yaml _ship_container_lib_docker_nonprivileged(command) || {}
   end
 
+  def _ship_info_lib_get_project(project, takelship)
+    return '' unless takelship.key? 'default_project'
+
+    project = config.active['ship_default_project'] if project == 'default'
+    project = takelship['default_project'] if project == 'default'
+    project
+  end
+
   def _ship_info_lib_valid_project?(takelship, project)
     valid_project = false
     takelship_projects = takelship['projects']

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

@@ -13,6 +13,7 @@ module Takeltau
     include ShipContainerStop
     include ShipInfoLib
     include ShipProjectList
+    include ShipProjectLogs
     include ShipProjectStart
 
     #
@@ -20,19 +21,31 @@ module Takeltau
     #
     desc 'list', 'List projects'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      List projects
+    List projects
     LONGDESC
     # List projects.
     def list
       ship_project_list
     end
 
+    #
+    # ship container logs
+    #
+    desc 'logs [PROJECT]', 'Follow logs of project [PROJECT]'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Follow logs of project [PROJECT]
+    LONGDESC
+    # logs projects.
+    def logs(project = 'default')
+      ship_project_logs project
+    end
+
     #
     # ship container start
     #
     desc 'start [PROJECT]', 'Start project [PROJECT] in a takelship container'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Start project [PROJECT] in a takelship container
+    Start project [PROJECT] in a takelship container
     LONGDESC
     # Run command in docker container.
     def start(project = 'default')
@@ -44,7 +57,7 @@ module Takeltau
     #
     desc 'stop', 'Stop a takelship container'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Stop a takelship container
+    Stop a takelship container
     LONGDESC
     # Stop a takelship container.
     def stop

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

@@ -0,0 +1,27 @@
+# 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

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

@@ -9,11 +9,7 @@ module ShipProjectStart
     return false if ship_container_check_existing
 
     takelship = _ship_info_lib_get_takelshipinfo
-
-    return false unless takelship.key? 'default_project'
-
-    project = config.active['ship_default_project'] if project == 'default'
-    project = takelship['default_project'] if project == 'default'
+    project = _ship_info_lib_get_project(project, takelship)
 
     return false unless _ship_info_lib_valid_project? takelship, project
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.19
+0.43.23

data/lib/takeltau.rb

@@ -90,13 +90,16 @@ require_relative 'takeltau/ship/container/check/cli'
 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/login'
 require_relative 'takeltau/ship/container/podman'
+require_relative 'takeltau/ship/container/sudo'
 require_relative 'takeltau/ship/container/stop'
 require_relative 'takeltau/ship/container/update'
 require_relative 'takeltau/ship/container/cli'
 require_relative 'takeltau/ship/info/cli'
 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.43.19
+  version: 0.43.23
 platform: ruby
 authors:
 - Takelwerk
@@ -290,16 +290,19 @@ files:
 - lib/takeltau/ship/container/check/existing.rb
 - lib/takeltau/ship/container/clean.rb
 - lib/takeltau/ship/container/cli.rb
+- lib/takeltau/ship/container/command.rb
 - lib/takeltau/ship/container/lib.rb
 - lib/takeltau/ship/container/list.rb
 - lib/takeltau/ship/container/login.rb
 - lib/takeltau/ship/container/podman.rb
 - lib/takeltau/ship/container/stop.rb
+- lib/takeltau/ship/container/sudo.rb
 - lib/takeltau/ship/container/update.rb
 - lib/takeltau/ship/info/cli.rb
 - lib/takeltau/ship/info/lib.rb
 - lib/takeltau/ship/project/cli.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