takeltau 0.44.37 → 0.44.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd398d4914a9ffb46f47698084ee7052c5a7729ce7978f78b5ff1399745dad2
-  data.tar.gz: 60356487d2a7387dd511ce512ce22b4c44aaaab1832fa53b99133e50f3092549
+  metadata.gz: 4ba68a908eb9fc2892702047e2bab32fed4f094ce05a78132dffebcafe3b06af
+  data.tar.gz: 982ac70933014a8be6b08348c1e62d244fa43b22e04f1cd951c017c761c931c1
 SHA512:
-  metadata.gz: aeceb5fe37284bb62712b3958c347ff9e0f1da846fbbcfa64b57f90ef27a666287fb852136bbfffd392ddb6492614d3cbba2e399b42a6f1fe228f04b0f29649b
-  data.tar.gz: d769d5d59b60bb5e4149b0388f59f6be01d657cf8f5bf6a648c4d300c047ddf1cb1f56cb5339dc2b81506bbe7c5c9d1a7b0a7cd99ac6fdc0738f8440ea200cab
+  metadata.gz: e66a3149146dcd4a3a892984ab6fb67a7ef0062a7ac7a0fc164af4f80ea1438ec4c46ba0fd51042d4bce264b0f3197c056ee7ad8c4b80010617e6258ebdc664a
+  data.tar.gz: a62b1f02afae211d2ce17272c8d5a9daea8d312885d80310814e3151f3869dbf8a447a50d219af4aa083c27dff72cbe9c7ca0534ef4652a5d66e333da02c2ee2

data/README.md

@@ -119,6 +119,7 @@ or *tau commands*:
 | tau [self config default](features/cucumber/features/self/self.config.default.feature) | Print takelage default configuration |
 | tau [self config home](features/cucumber/features/self/self.config.home.feature) | Print takelage home config file configuration |
 | tau [self config project](features/cucumber/features/self/self.config.project.feature) | Print takelage project config file configuration |
+| tau [self config envvars](features/cucumber/features/self/self.config.envvars.feature) | Print env vars takeltau configuration |
 | tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number |
 | tau [ship completion bash](features/cucumber/features/ship/completion/completion.bash.feature) | Print bash completion code for ship subcommand |
 | tau [ship container check existing](features/cucumber/features/ship/container/ship.container.check.existing.feature) | Check if a takelship is existing |
@@ -136,6 +137,7 @@ or *tau commands*:
 | tau [ship container update](features/cucumber/features/ship/container/ship.container.update.feature) | Update takelship image |
 | tau [ship info takelconfig](features/cucumber/features/ship/info/ship.info.takelconfig.feature) | Print takelage config |
 | tau [ship info takelship](features/cucumber/features/ship/info/ship.info.takelship.feature) | Print takelship info |
+| tau [ship info version](features/cucumber/features/ship/info/ship.info.version.feature) | Print ship version |
 | tau [ship project create](features/cucumber/features/ship/project/ship.project.create.feature) [PROJECT] | Create a takelship [PROJECT] |
 | tau [ship project list](features/cucumber/features/ship/project/ship.project.list.feature) | List takelship projects |
 | tau [ship project restart](features/cucumber/features/ship/project/ship.project.restart.feature) [PROJECT] | Restart a takelship [PROJECT] |
@@ -159,6 +161,7 @@ or *tau commands*:
 | tau ship sudo [CMD] | Alias for tau [ship container sudo](features/cucumber/features/ship/container/ship.container.sudo.feature) |
 | tau ship wreck | Alias for tau [ship project stop](features/cucumber/features/ship/project/ship.project.stop.feature) |
 | tau ship update | Alias for tau [ship container update](features/cucumber/features/ship/container/ship.container.update.feature) |
+| tau ship version | Alias for tau [ship info version](features/cucumber/features/ship/container/ship.info.version.feature) |
 | tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) |
 | tau commands | Alias for tau [self commands](features/cucumber/features/self/self.commands.feature) |
 | tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature) |
@@ -195,10 +198,10 @@ The project directory is identified by the first match:
 
 | Method | Precedence | Description |
 |-|-|-|
-| `--workdir`/`-w` command line option | ultimate |
-| `TAKELAGE_WORKDIR` environment variable | highest |
-| Main [`Rakefile`](Rakefile) | normal |
 | Current working directory | lowest |
+| Main [`Rakefile`](Rakefile) | normal |
+| `TAKELAGE_WORKDIR` environment variable | highest |
+| `--workdir`/`-w` command line option | ultimate |
 
 ### Configuration Examples
 

data/lib/takeltau/default.yml

@@ -97,6 +97,7 @@ ship_hostname: '%{ship_name}_%{unique}'
 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/lib/system.rb

@@ -5,7 +5,6 @@ require 'open3'
 require 'yaml'
 
 # Interaction with the operating system
-# rubocop:disable Metrics/ModuleLength
 module SystemModule
   # Check if a command is available else log error message
   # @return [Boolean] is the command available?
@@ -228,4 +227,3 @@ module SystemModule
     plural
   end
 end
-# rubocop:enable Metrics/ModuleLength

data/lib/takeltau/self/config/cli.rb

@@ -20,7 +20,6 @@ module Takeltau
 
     tau self config defaults > ~/.takelage.yml
     LONGDESC
-    # Print takeltau default configuration.
     def default
       config_default_yaml = hash_to_yaml(config.default)
       exit false if config_default_yaml == false
@@ -28,6 +27,23 @@ module Takeltau
       true
     end
 
+    #
+    # config active
+    #
+    desc 'active', 'Print active takeltau configuration'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print active takeltau configuration
+    This command will print the configuration read from the takeltau
+    configuration file (which is by default ~/.takeltau.yml).
+    LONGDESC
+    # Print active takeltau configuration.
+    def active
+      config_active_yaml = hash_to_yaml(config.active)
+      exit false if config_active_yaml == false
+      say config_active_yaml
+      true
+    end
+
     #
     # config home
     #
@@ -78,22 +94,5 @@ module Takeltau
       say config_envvars_yaml
       true
     end
-
-    #
-    # config active
-    #
-    desc 'active', 'Print active takeltau configuration'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print active takeltau configuration
-    This command will print the configuration read from the takeltau
-    configuration file (which is by default ~/.takeltau.yml).
-    LONGDESC
-    # Print active takeltau configuration.
-    def active
-      config_active_yaml = hash_to_yaml(config.active)
-      exit false if config_active_yaml == false
-      say config_active_yaml
-      true
-    end
   end
 end

data/lib/takeltau/ship/cli.rb

@@ -176,6 +176,15 @@ module Takeltau
       Takeltau::ShipProject.new.stop
     end
 
+    desc 'version', 'Print ship version'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print ship semantic version number.
+    Alias for ship info version.
+    LONGDESC
+    def version
+      Takeltau::ShipInfo.new.version
+    end
+
     desc 'wreck', 'Stop a takelship'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Stop a takelship container.

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

@@ -36,5 +36,17 @@ module Takeltau
     def takelship
       say _ship_info_lib_get_takelshipinfo.to_yaml
     end
+
+    #
+    # ship info version
+    #
+    desc 'version', 'Print ship version'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print ship semantic version number.
+    LONGDESC
+    def version
+      say VERSION
+      true
+    end
   end
 end

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

@@ -52,6 +52,13 @@ 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.44.37
+0.44.41

metadata

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