takeltau 0.44.24 → 0.44.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb82fda940a4ff5a0a2bf71cc84bf813589c07eda38a3d2040f825738b1d443
-  data.tar.gz: d41134f25c52879dcba44f08a6fdd4b910a884a410f02728d5f2413ae70c5338
+  metadata.gz: 4af5fc9f1930e7b6b11e1ebf4d2af883e8db4637595392ab80856e214d96659a
+  data.tar.gz: f65c12c5676d3a4df61fe5fb90280446486af6bdd7ed8d47e5db4f546403f3b4
 SHA512:
-  metadata.gz: 2245845fa2cfe9ab835d416dc7502487cbedcc652a8e6191ddeb69267f9dc48d0e81a96d9f04ed985972e645da8da8fe861ac4695fff6f0a94f65ec8dcb85b80
-  data.tar.gz: 73b097fe9c5426567c53a2d7b1d95e92b7d0ca25817d6731f0cc32b9765efbf2016a96a7cd5d3d4d482e864d1d9844dae537cb58beb2f6c32ed463c0b5f999ab
+  metadata.gz: 89433fe5f3335b761215eeb7733757befb4bf7549ddd4caf78249f8f436199abd3876a045114eef09e0574380e8354d8f1fbafaaba2165f5de790753d90b4da8
+  data.tar.gz: 93800b4cf6a686a44777d91d3adf6c611fe29e016b74c30f813bf9347d2e79393a7e20e68ff7a8adc68e0c8a77d4e831c1099be3206b98af13220160f54a9633

data/README.md

@@ -127,7 +127,7 @@ or *tau commands*:
 | tau [ship container list](features/cucumber/features/ship/container/ship.container.list.feature) | List takelships |
 | tau [ship container hostname](features/cucumber/features/ship/container/ship.container.hostname.feature) | Print takelship hostname |
 | 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 logs](features/cucumber/features/ship/container/ship.container.logs.feature) [ARGS] | Print the takelship logs |
 | tau [ship container name](features/cucumber/features/ship/container/ship.container.name.feature) | Print the takelship name |
 | tau [ship container podman](features/cucumber/features/ship/container/ship.container.podman.feature) [CMD] | Run a podman command in a takelship |
 | tau [ship container shipdir](features/cucumber/features/ship/container/ship.container.shipdir.feature) | Print takelship shipdir |
@@ -148,7 +148,7 @@ or *tau commands*:
 | tau ship docker [CMD] | Alias for tau [ship container podman](features/cucumber/features/ship/container/ship.container.podman.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 | Alias for tau [ship container logs](features/cucumber/features/ship/container/ship.container.logs.feature) |
+| tau ship logs [ARGS] | 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 name | Alias for tau [ship container list](features/cucumber/features/ship/container/ship.container.name.feature) |
 | tau ship podman [CMD] | Alias for tau [ship container podman](features/cucumber/features/ship/container/ship.container.podman.feature) |

data/lib/takeltau/ship/cli.rb

@@ -52,7 +52,7 @@ module Takeltau
     LONGDESC
     # ship clean: {Takeltau::ShipProject#clean}
     def clean
-      Takeltau::ShipProject.new.clean
+      Takeltau::ShipContainer.new.clean
     end
 
     desc 'command [CMD]', 'Run a bash command in a takelship'
@@ -95,7 +95,7 @@ module Takeltau
       Takeltau::ShipContainer.new.login
     end
 
-    desc 'logs [OPTIONS]', 'Print the takelship logs'
+    desc 'logs [ARGS]', 'Print the takelship logs'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print the takelship logs.
     Alias for ship container logs.

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

@@ -83,7 +83,7 @@ module Takeltau
     #
     # ship container logs
     #
-    desc 'logs [OPTIONS]', 'Print the takelship logs'
+    desc 'logs [ARGS]', 'Print the takelship logs'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print the takelship logs.
     Accepts docker logs options.

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

@@ -44,7 +44,7 @@ module ShipContainerLib
       image: _ship_container_lib_image,
       command: command
     )
-    run cmd_docker_run_command
+    run_and_capture cmd_docker_run_command
   end
 
   # rubocop:enable Metrics/MethodLength

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

@@ -6,7 +6,8 @@ module ShipPortsLib
 
   # get the ports of a takelship
   def _ship_ports_lib_get_ports(takelship, takelproject)
-    ports = _ship_ports_lib_get_ports_docker(takelship)
+    ports = _ship_ports_lib_get_port_docker(takelship)
+    ports = ports.merge _ship_ports_lib_get_port_takelship_registry
     takelship['projects'].each do |project|
       next unless project['name'] == takelproject
 
@@ -15,7 +16,8 @@ module ShipPortsLib
 
         service['ports'].each do |port|
           key = _ship_ports_lib_generate_key port, service
-          ports[key] = _ship_ports_lib_get_port key, port, service
+          port = _ship_ports_lib_get_port key, port, service
+          ports = ports.merge port
         end
       end
     end
@@ -45,8 +47,7 @@ module ShipPortsLib
   end
 
   # map the podman socket port (aka "DOCKER_HOST")
-  # returns a hash unlike the get_port method
-  def _ship_ports_lib_get_ports_docker(takelship)
+  def _ship_ports_lib_get_port_docker(takelship)
     takel_docker = takelship['docker_host']
     docker_key = "ship_ports_docker_host_docker_#{takel_docker}"
     local_docker = _ship_ports_lib_get_localhost_port docker_key, takel_docker
@@ -62,24 +63,42 @@ module ShipPortsLib
     }
   end
 
+  # map the internal registry port
+  def _ship_ports_lib_get_port_takelship_registry
+    registry_key = 'ship_ports_takelship_registry_http_5555'
+    registry_port = _ship_ports_lib_get_localhost_port(registry_key, 35_555)
+    {
+      registry_key => {
+        'service' => 'takelship-registry',
+        'protocol' => 'http',
+        'takelship' => 5555,
+        'localhost' => registry_port.to_i
+      }
+    }
+  end
+
   # map a takelship port
   def _ship_ports_lib_get_port(key, port, service)
     localhost = _ship_ports_lib_get_localhost_port key, port['port']
     unless port.key?('description')
       return {
-        'service' => service['name'],
-        'protocol' => port['protocol'],
-        'takelship' => port['port'],
-        'localhost' => localhost
+        key => {
+          'service' => service['name'],
+          'protocol' => port['protocol'],
+          'takelship' => port['port'],
+          'localhost' => localhost
+        }
       }
     end
 
     {
-      'service' => service['name'],
-      'protocol' => port['protocol'],
-      'takelship' => port['port'],
-      'localhost' => localhost,
-      'description' => port['description']
+      key => {
+        'service' => service['name'],
+        'protocol' => port['protocol'],
+        'takelship' => port['port'],
+        'localhost' => localhost,
+        'description' => port['description']
+      }
     }
   end
 

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

@@ -17,7 +17,9 @@ module ShipProjectStart
     _ship_ports_lib_write_ports(ports, project)
 
     log.debug "Starting takelship project \"#{project}\""
-    _ship_container_lib_docker_privileged ports, project
+    ship_status = _ship_container_lib_docker_privileged ports, project
+    return false unless _ship_container_lib_started? ship_status
+
     _ship_project_start_print_banner project
     _ship_project_start_print_ports ports
     true
@@ -51,6 +53,15 @@ module ShipProjectStart
     false
   end
 
+  # check if the ship started successfully
+  def _ship_container_lib_started?(ship_status)
+    return true if ship_status[2].zero?
+
+    say 'Unable to start the takelship. The error message was:'
+    say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"')
+    false
+  end
+
   # print banner with status information
   def _ship_project_start_print_banner(project)
     ship_hostname = _ship_container_lib_ship_hostname

data/lib/takeltau/version

@@ -1 +1 @@
-0.44.24
+0.44.29

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.44.24
+  version: 0.44.29
 platform: ruby
 authors:
 - Takelwerk