takeltau 0.38.2 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cdad12eeefa3b06fdce78f798f07ddae95be2cd83e14e8bfc9159df38480a3e
-  data.tar.gz: 4f4be3e7401333306784e7f343cfd049633a3998d08871ceabd137af582f7243
+  metadata.gz: 73f3cdc1423e876043ceea53b0e7209589e7b5474ad44b1213cbffa6336ad7af
+  data.tar.gz: 83a3dfa517ac84b8265a09b64b325184473fd0a22bf98fd241f4713e7e59c0ce
 SHA512:
-  metadata.gz: 858ce1e3ace8d154329c0be1420a939116fc38cd8e56a9f73e431dac27bd43338a42db045bf32aed92d306d62a32328cd1fa6eae6f49c7cb5c192fa77b30cc29
-  data.tar.gz: fcd3ad170d599873e11803450f26b3065a593b1826cbc8b156caeee1e8659fc98523ca4668edec0cfd743a961d35586c374ddb13182fb95d7dd74faab8837042
+  metadata.gz: 923b34a21ed9d509f88be302e3c4e8682adae221d60f59a6a092ba706501ed5de13125a0184e0d7d26130441aeb84c015be119ec9e5a313a4078c11bf17de7e0
+  data.tar.gz: 83eec4fbdd1c53604dce8d1d53fab8d3c94678f997611f294afd6d833dcabcf78315337e427af44234f2562d8c4006d76eb585cdd2ff09afbeef8077d44b168a

data/lib/takeltau/docker/container/lib.rb

@@ -122,7 +122,6 @@ module DockerContainerLib
     end
 
     log.debug 'We are inside a takelage container'
-
     true
   end
 
@@ -145,9 +144,7 @@ module DockerContainerLib
     )
 
     name = (run cmd_get_container_name_by_id).chomp
-
     log.debug "Container #{container} has name \"#{name}\""
-
     name
   end
 

data/lib/takeltau/info/status/bar.rb

@@ -29,14 +29,10 @@ module InfoStatusBar
 
   # Add takelage version info to bar.
   def _info_status_bar_takelage
-    takelage_version_file = '/etc/takelage_version'
-    unless _file_exists? takelage_version_file
-      @bar_status = false
-      return false
-    end
+    # Check if we are inside a takelage docker container
+    return unless _docker_container_lib_check_matrjoschka
 
-    _file_read takelage_version_file
-    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
+    @bar_list << _info_status_lib_get_channel_and_version
   end
 
   # Add tau version info to bar.

data/lib/takeltau/info/status/lib.rb

@@ -43,4 +43,18 @@ module InfoStatusLib
       )
     try cmd_git_key_available
   end
+
+  # Get takelage environment string
+  def _info_status_lib_get_channel_and_version
+    takelage_version_file = '/etc/takelage_version'
+    return '' unless _file_exists? takelage_version_file
+
+    _file_read takelage_version_file
+
+    channel = config.active['docker_repo']
+    version = @content_file.chomp
+
+    log.debug "#{channel}: #{version.green}"
+    "#{channel}: #{version.green}"
+  end
 end

data/lib/takeltau/version

@@ -1 +1 @@
-0.38.2
+0.39.0

metadata

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