takeltau 0.45.16 → 0.45.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e11c018e6993f4bbb2699c699f52f73512d200ac177c2b2ca6b4e56e0108ef5
-  data.tar.gz: f32c777e36e4997749d9a2aa10913dd7496b5e5d1b56c5abb2c84898bdb88a0b
+  metadata.gz: 83e83d1198f3013bc8dccd2cf87482a1c4a4fbead2db74c243ce1a12465c2fb2
+  data.tar.gz: c439865666c24e03d1f3a8349cb1e8c82c31137c09365d1987cbb545506c6ad5
 SHA512:
-  metadata.gz: 5fb8aa14337a2dceffe46b0c77042d5bb55cdaf614cb4b3b84f10a30bfc4a28c2eab0ecc66695221d7688d53f93a10aa843d51c08f875fcc9a5853821b9d6235
-  data.tar.gz: b26feddd04a79042f36287cf4f61c434989b0175da221b5ee92e61e32ce7a89b99eb29566c9fae0962e7f6d394a754d1f44116a2d46cd753b78fc67364e39c71
+  metadata.gz: 7e38db0e1a20a6613d08d721d8e7ae6e1b88b59deedb2cc451ccb29bbf5e182319a79d7dca49f86f3adca3a4db33fbbe18c9da65ec69c33ea5d30bfe2f157831
+  data.tar.gz: b213d047e992ade91debbf52a743eaac0d5c196f36babc13d4878f739d7dcb1fd27931a720d95f85a762731f8afc61d3c41675608bede6e6fd3fc4e790056a01

data/lib/takeltau/default.yml

@@ -62,6 +62,7 @@ cmd_ship_container_login: 'bash'
 cmd_ship_container_logs: '%{ship_docker} logs %{ship_hostname} %{args}'
 cmd_ship_docker: 'docker'
 cmd_ship_docker_check: 'docker --version'
+cmd_ship_docker_wait: '%{ship_docker} wait %{ship_hostname}'
 cmd_ship_docker_stop: '%{ship_docker} kill %{ship_hostname}'
 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}'

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

@@ -15,6 +15,7 @@ module Takeltau
     include ShipPortsLib
     include ShipProjectCreate
     include ShipProjectList
+    include ShipProjectRestart
     include ShipProjectStart
 
     #
@@ -51,8 +52,7 @@ module Takeltau
     LONGDESC
     # ship restart: {Takeltau::ShipProject#restart}
     def restart(project = 'default')
-      Takeltau::ShipProject.new.stop
-      Takeltau::ShipProject.new.start project
+      exit ship_project_restart project
     end
 
     #

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

@@ -17,7 +17,7 @@ module ShipProjectCreate
       ship_hostname_suffix: 'dump',
       publish_ports: false
     )
-    return false unless _ship_container_lib_started? ship_status
+    return false unless _ship_container_lib_started?(ship_status, false)
 
     say "#{verb} takelship project \"#{project}\"."
     true

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# tau ship project restart
+module ShipProjectRestart
+  # Restart a takelship
+  def ship_project_restart(project)
+    say ship_container_stop
+    sleep 1 until ship_project_start project, mute: true
+    true
+  end
+end

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

@@ -3,7 +3,7 @@
 # tau ship project start
 module ShipProjectStart
   # Start a takelship
-  def ship_project_start(project)
+  def ship_project_start(project, mute: false)
     return false unless _ship_project_start_matrjoschka?
 
     takelship = _ship_info_lib_get_takelshipinfo
@@ -23,7 +23,7 @@ module ShipProjectStart
 
     log.debug "Starting takelship project \"#{project}\""
     ship_status = _ship_container_lib_docker_privileged ports, project
-    return false unless _ship_container_lib_started? ship_status
+    return false unless _ship_container_lib_started?(ship_status, mute)
 
     _ship_project_start_print_banner project
     say
@@ -62,11 +62,11 @@ module ShipProjectStart
   end
 
   # check if the ship started successfully
-  def _ship_container_lib_started?(ship_status)
+  def _ship_container_lib_started?(ship_status, mute)
     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('"')
+    say 'Unable to start the takelship. The error message was:' unless mute
+    say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"') unless mute
     false
   end
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.16
+0.45.19

data/lib/takeltau.rb

@@ -104,6 +104,7 @@ 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/restart'
 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.45.16
+  version: 0.45.19
 platform: ruby
 authors:
 - Takelwerk
@@ -307,6 +307,7 @@ files:
 - lib/takeltau/ship/project/cli.rb
 - lib/takeltau/ship/project/create.rb
 - lib/takeltau/ship/project/list.rb
+- lib/takeltau/ship/project/restart.rb
 - lib/takeltau/ship/project/start.rb
 - lib/takeltau/version
 homepage: https://github.com/takelwerk/takelage-cli