takeltau 0.43.14 → 0.43.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a4925af8567894bdbcc0b0e983fce78e29ef2980d17bdfcc4fdbc3141313f3
-  data.tar.gz: ace590b944abfbbdbe620d3cabd7a16d2593f47287702148c623ede6ca677e98
+  metadata.gz: aa3550300f915f6a1a05dc9249f80d11638662bca1be39f73b3bff520c284f6e
+  data.tar.gz: 43e6b6e14a75cbdcf77e314c03203d419ae938c6b7b0cf0064050bdaf59efd42
 SHA512:
-  metadata.gz: f9a323d95e42e6679e51360d53b24636dd3243b538e46b06f38efe0b09cb4017525f07443db8dcd791eaaa1e9ae7df759a9c6fd4ee1327044e66542878eedd6b
-  data.tar.gz: 61620c4054fcf13cf2c15583a5478c07a30a11cb9340ecf5363ae72578f4bfc8ca83cf58c471131e2e19d4e814e18711918ef8131c6b41d930a7921c64de83f4
+  metadata.gz: fa2a089bf563ad78fe96f858e14dd4e04757e0f59de0bf76ac76f32c4e1d7d379e078ef73054b25ca955869c12bceab04155ce6e63759ab32ff09685e655752b
+  data.tar.gz: 25ee8bc050a0a49d4e757d743bbafb45a4dffde9e1d2f827cd74e9b28a644eab7d21101fbbc137d05f98591a803446d44cc22b40948e3a66dbe600b003be37a6

data/lib/takeltau/default.yml

@@ -1,6 +1,6 @@
 ---
 cmd_docker: 'docker'
-cmd_docker_check_daemon_docker_info: '%{docker} info'
+cmd_docker_check_daemon_docker_version: '%{docker} --version'
 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'
@@ -94,3 +94,4 @@ cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
 cmd_ship_container_check_existing_docker_ps: '%{ship_docker} ps --filter name=^%{ship_name}$ --quiet'
 cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
 cmd_ship_container_login: 'bash'
+cmd_docker_container_get_mounted_dir: '%{ship_docker} container inspect %{ship_hostname} --format "{{ (index .Mounts 0).Source }}"'

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

@@ -14,7 +14,7 @@ module DockerCheckDaemon
     log.debug 'Check if the docker daemon is running'
 
     cmd_docker_info = format(
-      config.active['cmd_docker_check_daemon_docker_info'],
+      config.active['cmd_docker_check_daemon_docker_version'],
       docker: config.active[docker]
     )
     status = try cmd_docker_info

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

@@ -2,7 +2,7 @@
 
 # tau docker container list
 module DockerContainerList
-  # Backend method for docker container prune.
+  # List docker containers.
   def docker_container_list
     log.debug 'List docker containers'
 

data/lib/takeltau/ship/cli.rb

@@ -25,6 +25,18 @@ module Takeltau
       Takeltau::SelfConfig.new.active
     end
 
+    desc 'list', 'Alias for tau ship container list'
+    # ship list: {Takeltau::ShipContainer#list}
+    def list
+      Takeltau::ShipContainer.new.list
+    end
+
+    desc 'ls', 'Alias for tau ship container list'
+    # ship list: {Takeltau::ShipContainer#list}
+    def ls
+      Takeltau::ShipContainer.new.list
+    end
+
     desc 'login', 'Alias for tau ship container login'
     # ship login: {Takeltau::ShipContainer#login}
     def login

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

@@ -7,9 +7,11 @@ module Takeltau
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
+    include DockerContainerLib
     include ShipInfoLib
     include ShipContainerCheckExisting
     include ShipContainerLib
+    include ShipContainerList
     include ShipContainerLogin
     include ShipContainerPodman
     include ShipContainerUpdate
@@ -17,14 +19,26 @@ module Takeltau
     desc 'check [COMMAND]', 'Check takelship container'
     subcommand 'check', ShipContainerCheck
 
+    #
+    # ship container list
+    #
+    desc 'list', 'list command'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+      Run list command
+    LONGDESC
+    # Run list command.
+    def list
+      say ship_container_list
+    end
+
     #
     # ship container login
     #
-    desc 'login', 'Run login command'
+    desc 'login', 'Log in to a takelship'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Run login command
+      Log in to a takelship
     LONGDESC
-    # Run login command.
+    # Log in to a takelship.
     def login
       ship_container_login
     end

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

@@ -39,6 +39,7 @@ module ShipContainerLib
     )
     run cmd_docker_run_command
   end
+
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize
 
@@ -100,4 +101,36 @@ module ShipContainerLib
     end
     publish.join(' ')
   end
+
+  # Get all takelship containers.
+  # @return [Array] list of takelship containers
+  def _ship_container_lib_get_containers
+    ship_name = config.active['ship_name']
+    log.debug "Getting all #{ship_name} containers"
+
+    cmd_docker_get = format(
+      config.active['cmd_docker_container_get_containers'],
+      docker: config.active['cmd_docker'],
+      docker_repo: ship_name
+    )
+
+    # convert stdout lines to array and return array
+    (run cmd_docker_get).split(/\n+/)
+  end
+
+  # Get the mounted takelship directory
+  def _ship_container_lib_get_mounted_dir
+    ship_hostname = _ship_container_lib_ship_hostname
+    log.debug 'Getting mounted directory from ' \
+                "takelship container \"#{ship_hostname}\""
+
+    cmd_get_mounted_dir = format(
+      config.active['cmd_docker_container_get_mounted_dir'],
+      ship_docker: config.active['cmd_ship_docker'],
+      docker: config.active['cmd_ship_docker'],
+      ship_hostname: ship_hostname
+    )
+
+    run cmd_get_mounted_dir
+  end
 end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# tau ship container list
+module ShipContainerList
+  # List takelship containers.
+  def ship_container_list
+    log.debug 'List takelship containers'
+
+    return false unless docker_check_daemon 'cmd_ship_docker'
+
+    _ship_container_list_get_inventory.to_yaml
+  end
+
+  private
+
+  # Get the current inventory
+  def _ship_container_list_get_inventory
+    ship_name = config.active['ship_name']
+    inventory = _ship_container_list_new_inventory ship_name
+    _ship_container_lib_get_containers.each do |container|
+      name = _docker_container_lib_get_container_name_by_id container
+      dir = _ship_container_lib_get_mounted_dir.strip
+      inventory[ship_name]['hosts'] << { name => dir }
+    end
+    inventory
+  end
+
+  # Create a new inventory
+  def _ship_container_list_new_inventory(ship_name)
+    {
+      ship_name => {
+        'hosts' => []
+      }
+    }
+  end
+end

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.14
+0.43.16

data/lib/takeltau.rb

@@ -88,6 +88,7 @@ require_relative 'takeltau/ship/container/lib'
 require_relative 'takeltau/ship/container/check/existing'
 require_relative 'takeltau/ship/container/check/cli'
 require_relative 'takeltau/ship/info/lib'
+require_relative 'takeltau/ship/container/list'
 require_relative 'takeltau/ship/container/login'
 require_relative 'takeltau/ship/container/podman'
 require_relative 'takeltau/ship/container/update'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.43.14
+  version: 0.43.16
 platform: ruby
 authors:
 - Takelwerk
@@ -290,6 +290,7 @@ files:
 - lib/takeltau/ship/container/check/existing.rb
 - lib/takeltau/ship/container/cli.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/update.rb