takeltau 0.45.11 → 0.45.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d0dc8fc50e46b89c40119ed9df721ae735575f373f6bf81c06254f607e7cc3
-  data.tar.gz: 889e3812cf06a7cef93249f1bab664ae9155ac40ddc91b4f590a98474343b178
+  metadata.gz: 3c5a5d7fa8d4041c19febf3b718639ddfff60a3f755beb45b18d749a76ac455a
+  data.tar.gz: 41f7639790c45628afcac85a5f2b0aa84e58658dbc120d20c3998c509f5bc1b2
 SHA512:
-  metadata.gz: d499a4631282fbd0e72525d7e6b8a29f98417d1a31eaa6fe5e914963d5b48c9a56a9bff7dd68d660662ad78e62711333918a973cc6b6712e2f0f1efc1652faff
-  data.tar.gz: 985a4e83645af92ab6ed6a1600abdb0a6c6a7a6101f3191f9c12127260efa85ffb044083ff8eacc72d2527c0e191f0b3c7e217cb69b69aa9617ecdfdb6a472b4
+  metadata.gz: '0090b3a67cf72a6f570a5ac742686e516749e8ec28895971ab3d165df9f7f2d1569f04f270c7012e7a3231650aa9af36ea3754ced76cf88bc4216d74c93f6bcb'
+  data.tar.gz: a96cd7240688ae4183189f76191279e8801398043651ef5d427152a69fd2f50e85acb60011d035c7f24b9f899168cedb12becc92443b6e26de9ad63e1067266e

data/README.md

@@ -194,10 +194,10 @@ or *tau config*.
 | TAKELAGE_TAU_CONFIG_* | ultimate | Fileless configuration through TAKELAGE_TAU_CONFIG environment variables. |
 
 The tau command line tool is directory-aware so it is important that you can set the working directory of the tau command.
-The project directory is identified by the first match:
+The project directory is identified by precedence:
 
-| Method | Precedence | Description |
-|-|-|-|
+| Method | Precedence |
+|-|-|
 | Current working directory | lowest |
 | Main [`Rakefile`](Rakefile) | normal |
 | `TAKELAGE_WORKDIR` environment variable | highest |
@@ -267,6 +267,12 @@ Add this to your [bash startup files](https://www.gnu.org/software/bash/manual/h
 source <(tau completion bash)
 ```
 
+and/or
+
+```bash
+source <(ship completion bash)
+```
+
 ### Software Tests
 
 *takelage-cli* uses

data/lib/takeltau/completion/cli.rb

@@ -17,7 +17,7 @@ module Takeltau
     def bash
       completion_bash = Takeltau::CLI.new.bash_fylla
       exit false if completion_bash == false
-      say completion_bash
+      say completion_bash.strip.split("\n").grep_v(/"--help"/).grep_v(/"-h"/).join("\n")
       true
     end
   end

data/lib/takeltau/default.yml

@@ -64,7 +64,7 @@ cmd_ship_docker: 'docker'
 cmd_ship_docker_check: 'docker --version'
 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}'
-cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
+cmd_ship_project_start_docker_stop: '%{ship_docker} kill %{ship_hostname}'
 docker_container_check_matrjoschka: true
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: ''
@@ -98,7 +98,6 @@ ship_images_sync: true
 ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'
 ship_repo: 'takelship'
-ship_restart_sleep_seconds: '2'
 ship_run_args_nonprivileged: ''
 ship_run_args_privileged: ''
 ship_tag: 'latest'

data/lib/takeltau/ship/completion/bash.rb

@@ -29,6 +29,8 @@ module ShipCompletionBash
       .split(/_tau[^_]*/)
       .grep(/_ship/)
       .grep_v(/_ship\n/)
+      .grep_v(/"--help"/)
+      .grep_v(/"-h"/)
     functions.join
   end
 end

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

@@ -52,13 +52,6 @@ module Takeltau
     # ship restart: {Takeltau::ShipProject#restart}
     def restart(project = 'default')
       Takeltau::ShipProject.new.stop
-      begin
-        seconds = Integer(config.active['ship_restart_sleep_seconds'])
-      rescue ArgumentError
-        seconds = 2
-      end
-      log.debug "Sleeping for #{seconds} seconds"
-      sleep seconds
       Takeltau::ShipProject.new.start project
     end
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.11
+0.45.13

metadata

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