takeltau 0.45.14 → 0.45.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c88546f57b7641ceeb01f2aca88a18ec553343c5ff822406fdc88105965274c
-  data.tar.gz: 5430e736adc4fb7055deff87733c78be352c74cdb3e2d96511119603c1f5dbbe
+  metadata.gz: 29a44c58a0f65c5af312f122d9045fa3fdcb2bb6cf1d18f9aea0fb78b849931e
+  data.tar.gz: c6403cd84660b3ab9a87cacec5e25922a24893c4325b448889cee17fd0563a2e
 SHA512:
-  metadata.gz: e22aa5ce53cc93437c91edc3066280d29e6a1de3075266c208cf6bcb02ef97832e482ed22af5a3eff5a834b477bfd9b63141ada90e87300071cef3743966de3f
-  data.tar.gz: df592a803fbec57a22b6f037311a19134a1775f3a1c2b71d955e2f41181d5ab13357ca4cb2d9a985ac865a5869a39a505d118d11d704f3e9e4df9fe309e1b6b9
+  metadata.gz: 502b2a590318258ca0460b0c2384b2efb6676ff13d16ed19ff6d344c2490b17dd61aaacc1e4da07fdd0a6d83299a23e4ef41a026649c23849aece9ca39422ef6
+  data.tar.gz: f1eccb654f5ae730d28dfe034b2412f431d9cd54d383a97d889df2f766cd44127b447c70bc3fbb3665518897bb80e1f94da1dc24f15de4e6ec405d6a3454a91b

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/info/lib.rb

@@ -7,26 +7,12 @@ module ShipInfoLib
   # Gather takelship information
   def _ship_info_lib_get_takelshipinfo
     log.debug 'Gathering takelship info'
-    takelshipinfo = _ship_info_lib_get_info_from_file
-    takelshipinfo = _ship_info_lib_get_info_from_docker if takelshipinfo.empty?
-
+    takelshipinfo = _ship_info_lib_get_info_from_docker
     return false if takelshipinfo.nil?
 
     takelshipinfo
   end
 
-  # Read takelship info from file
-  def _ship_info_lib_get_info_from_file
-    log.debug 'Reading takelship info from file'
-    ship_data_dir = config.active['ship_data_dir']
-    yaml_file = format(
-      config.active['ship_takelship_yml'],
-      pwd: Dir.getwd,
-      ship_data_dir: ship_data_dir
-    )
-    read_yaml_file(yaml_file) || {}
-  end
-
   # Read takelship info from docker run
   def _ship_info_lib_get_info_from_docker
     log.debug 'Reading takelship info from takelship container'
@@ -35,6 +21,8 @@ module ShipInfoLib
   end
 
   def _ship_info_lib_get_project(project, takelship)
+    return '' if takelship.nil?
+
     return '' unless takelship.key? 'default_project'
 
     project = config.active['ship_default_project'] if project == 'default'

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/restart.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# tau ship project restart
+module ShipProjectRestart
+  # Restart a takelship
+  def ship_project_restart(project)
+    say ship_container_stop
+    _ship_project_restart_wait
+    ship_project_start project
+  end
+
+  private
+
+  # Wait until a takelship container is stopped
+  def _ship_project_restart_wait
+    cmd_ship_docker_wait = format(
+      config.active['cmd_ship_docker_wait'],
+      ship_docker: config.active['cmd_ship_docker'],
+      ship_hostname: _ship_container_lib_ship_hostname
+    )
+
+    run cmd_ship_docker_wait
+  end
+end

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

@@ -7,6 +7,11 @@ module ShipProjectStart
     return false unless _ship_project_start_matrjoschka?
 
     takelship = _ship_info_lib_get_takelshipinfo
+    unless takelship
+      log.debug 'Unable to gather takelship info'
+      return false
+    end
+
     project = _ship_info_lib_get_project project, takelship
     return false unless _ship_project_start_valid_project? takelship, project
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.14
+0.45.17

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.14
+  version: 0.45.17
 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