takeltau 0.45.6 → 0.45.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31fce71fd0ba4d101ed66b23703b7c4dc8877bcb45beb52bc632c576ad9976af
-  data.tar.gz: 72a1ab91250660ddb24b8899edb50c73bfe06c06403fdb24fe4be1d42c4f0e18
+  metadata.gz: 563c6169a25b3a9ec927e7a522985e857d16ada464053da7251f46cb2c13e83d
+  data.tar.gz: d8d7df3eafdb48fd85052b0fb473545e261d826c434f0c66ff20244588060cdc
 SHA512:
-  metadata.gz: eb9a22c1e05fd55f9d57719595f854783b693d065a922dab8f07f22eeacf334ce6483c4ff2791387a9238cb489cc5d52a350846b3270da87597ee1cf49acc3f2
-  data.tar.gz: 6a03a31c3ea73374798e6f10a7e84a1fe3f988770f91ef210b726ac6eafebd65dac978fa88d6e350fa15ec3a238a98d4bdcaa695c6a9403dc90a538610bb6596
+  metadata.gz: dd0f6529f6c94691b2b28daf0f5c5134a89eaff8130da3c230cad2350aa6044d070724bc8622839be60a515092f275fb6245819c5f8722ced4a9849edf4d6a1e
+  data.tar.gz: ffedfb934a6c3ab8035e9630aa1531c23c37929b8d746332ecc47fae17328757e12891307de7297cbbe55c87f0feaba9fb9274436a44d98c59108e80efc53f80

data/lib/takeltau/default.yml

@@ -94,6 +94,7 @@ ship_default_project: 'default'
 ship_docker_host: '32375'
 ship_env: ''
 ship_hostname: '%{ship_name}_%{unique}'
+ship_images_sync: 'true'
 ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'
 ship_repo: 'takelship'

data/lib/takeltau/lib/system.rb

@@ -172,7 +172,7 @@ module SystemModule
     true
   end
 
-  # Read yaml file.
+  # Read file.
   def _file_read(file)
     begin
       @content_file = File.read File.expand_path(file)
@@ -213,8 +213,7 @@ module SystemModule
     begin
       content = YAML.safe_load content_yaml
     rescue Psych::SyntaxError
-      log.debug "Invalid YAML file \"#{file}\""
-      log.debug "Try: yamllint #{file}"
+      log.debug 'Invalid YAML'
       return false
     end
     content

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

@@ -6,8 +6,7 @@ module ShipContainerLib
 
   # Run nonprivileged docker command
   def _ship_container_lib_docker_nonprivileged(command, args = '')
-    args_nonprivileged = config.active['ship_run_args_nonprivileged']
-    args = "#{args} #{args_nonprivileged}" if config.active['ship_run_args_nonprivileged']
+    args = _ship_container_lib_ship_args args, config.active['ship_run_args_nonprivileged']
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
       ship_docker: config.active['cmd_ship_docker'],
@@ -23,8 +22,7 @@ module ShipContainerLib
   def _ship_container_lib_docker_privileged(ports, command, args: '', ship_hostname_suffix: nil, publish_ports: true)
     suffix = "_#{ship_hostname_suffix}" unless ship_hostname_suffix.nil?
     ship_hostname = "#{_ship_container_lib_ship_hostname}#{suffix}"
-    args_privileged = config.active['ship_run_args_privileged']
-    args = "#{args} #{args_privileged}" if args_privileged
+    args = _ship_container_lib_ship_args args, config.active['ship_run_args_privileged']
     ship_env = _ship_container_lib_ship_env ports
     ports = _ship_container_lib_publish(ports, publish_ports)
     ship_data_dir = config.active['ship_data_dir']
@@ -57,6 +55,16 @@ module ShipContainerLib
     run_and_exit cmd_docker_run_command
   end
 
+  # Return privileged args
+  def _ship_container_lib_ship_args(args, config_args)
+    args = "#{args} #{config_args}" if config_args
+    args_debug = '--env TAKELSHIP_DEBUG=true'
+    args = "#{args} #{args_debug}" if log.level == Logger::DEBUG
+    args_sync = '--env TAKELSHIP_IMAGES_SYNC=false'
+    args = "#{args} #{args_sync}" unless config.active['ship_images_sync']
+    args
+  end
+
   # Return takelship image
   def _ship_container_lib_image
     ship_user = config.active['ship_user']

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

@@ -76,8 +76,15 @@ module ShipProjectStart
 
   # print ports after starting a takelship
   def _ship_project_start_print_ports(ports)
-    output = []
     max_length = _ship_project_start_get_maxlength ports
+    ports_list = _ship_project_start_get_ports_list ports, max_length
+    ports_list.sort_by! { |port| port[:port] }
+    say ports_list.map { |port| port[:string] }.join("\n")
+  end
+
+  # get a sortable list of port numbers and strings describing the ports
+  def _ship_project_start_get_ports_list(ports, max_length)
+    ports_list = []
     ports.each_value do |port|
       next unless port['localhost'].to_i.between? 1, 65_535
 
@@ -85,9 +92,12 @@ module ShipProjectStart
       service = "[#{port['service']} #{port['protocol']}]"
       description = port['description']
       description = " (#{description})" if port.key? 'description'
-      output << "#{url.ljust(max_length['url'])} #{service.ljust(max_length['service'])}#{description}"
+      ports_list << {
+        port: port['localhost'].to_i,
+        string: "#{url.ljust(max_length['url'])} #{service.ljust(max_length['service'])}#{description}"
+      }
     end
-    say output.join("\n")
+    ports_list
   end
 
   # get max length of left column

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.6
+0.45.9

metadata

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