takeltau 0.45.17 → 0.45.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a44c58a0f65c5af312f122d9045fa3fdcb2bb6cf1d18f9aea0fb78b849931e
-  data.tar.gz: c6403cd84660b3ab9a87cacec5e25922a24893c4325b448889cee17fd0563a2e
+  metadata.gz: c8e57d2af7188980db3e7454b42bb8aff22a0ee3c3dcaf731f94e8e639c9fb1d
+  data.tar.gz: 6019ab1b46d6e9fd93137ad4454f42deb0f0a0089b0cc6e9fec6d6b4be2b5ee7
 SHA512:
-  metadata.gz: 502b2a590318258ca0460b0c2384b2efb6676ff13d16ed19ff6d344c2490b17dd61aaacc1e4da07fdd0a6d83299a23e4ef41a026649c23849aece9ca39422ef6
-  data.tar.gz: f1eccb654f5ae730d28dfe034b2412f431d9cd54d383a97d889df2f766cd44127b447c70bc3fbb3665518897bb80e1f94da1dc24f15de4e6ec405d6a3454a91b
+  metadata.gz: 27c8140f1e2967baae32360f573787cadb475a489ef3d078ef4361f368a14b537d8505dee51e63b085380c0a57ea4e16a1a62a8abe4a7e06b96e1d67affb5b3c
+  data.tar.gz: 37a12bc9b55cbc55d07ff11514dad2e9073d9c6b7fd235ef0ae52254976419bce9d7ddb2f5136c6c5d228aaaa925333bb0c11ad6a587f9c1ad67b01609d080ee

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

@@ -23,6 +23,8 @@ module ShipInfoLib
   def _ship_info_lib_get_project(project, takelship)
     return '' if takelship.nil?
 
+    return '' unless takelship.instance_of?(Hash)
+
     return '' unless takelship.key? 'default_project'
 
     project = config.active['ship_default_project'] if project == 'default'

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

@@ -5,20 +5,7 @@ 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
+    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.17
+0.45.21

metadata

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