takeltau 0.37.3 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e297c80af53f6afcb49ac3728e6c5833a53fdbaf745d1df9f2cc024da99a87e
-  data.tar.gz: 29593c7d300c8f960292a9527a778421a41a3b7bea203da4ec6acc25eac7113a
+  metadata.gz: 73f3cdc1423e876043ceea53b0e7209589e7b5474ad44b1213cbffa6336ad7af
+  data.tar.gz: 83a3dfa517ac84b8265a09b64b325184473fd0a22bf98fd241f4713e7e59c0ce
 SHA512:
-  metadata.gz: 54d2ce13da764a2d7fa40c344ef139605eafc5e1d6559fdaeb7dea38ff9702b7f57fa99a7c520469dac89f55800aaf2c284fc014f0735ff920dde3397a639867
-  data.tar.gz: 0f4d384cfaba7ccb214cfb6a0e780f662703706e706898858a6663257f9d1af3d26cab3daf24b172d583b89936d32b8f44b0d33ff3aed86b81705e6663673d9b
+  metadata.gz: 923b34a21ed9d509f88be302e3c4e8682adae221d60f59a6a092ba706501ed5de13125a0184e0d7d26130441aeb84c015be119ec9e5a313a4078c11bf17de7e0
+  data.tar.gz: 83eec4fbdd1c53604dce8d1d53fab8d3c94678f997611f294afd6d833dcabcf78315337e427af44234f2562d8c4006d76eb585cdd2ff09afbeef8077d44b168a

data/README.md

@@ -95,24 +95,26 @@ tau [info status bar](features/cucumber/features/info/info.status.bar.feature) |
 tau [info status git](features/cucumber/features/info/info.status.git.feature) | Check git status
 tau [info status gopass](features/cucumber/features/info/info.status.gopass.feature) | Check gopass status
 tau [info status gpg](features/cucumber/features/info/info.status.gpg.feature) | Check gpg status
+tau [info status hg](features/cucumber/features/info/info.status.hg.feature) | Check hg status
 tau [info status mutagen](features/cucumber/features/info/info.status.mutagen.feature) | Check mutagen status
 tau [info status ssh](features/cucumber/features/info/info.status.ssh.feature) | Check ssh status
-tau [init packer docker](features/cucumber/features/info/init.packer.docker.feature) | Initialize packer project for docker images
+tau [init packer docker](features/cucumber/features/init/init.packer.docker.feature) | Initialize packer project for docker images
+tau [init takelage rake](features/cucumber/features/init/init.takelage.rake.feature) | Initialize takelage rake project
 tau [mutagen check daemon](features/cucumber/features/mutagen/mutagen.check.daemon.feature)) | Check if mutagen host conenction is available
 tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.check.feature) [SOCKET] | Check if mutagen [SOCKET] exists
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [NAME] [IN] [OUT] | Create a mutagen socket [NAME] from [IN] to [OUT] of the container
 tau [mutagen socket list](features/cucumber/features/mutagen/mutagen.socket.list.feature) | List mutagen sockets
-tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
 tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) [SOCKET] | Terminate a mutagen [SOCKET]
+tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
+tau [self commands](features/cucumber/features/self/self.commands.feature) | List all commands
 tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration
 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 commands](features/cucumber/features/self/self.commands.feature) | List all commands
 tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number
 tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
-tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.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)
 tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature)
 tau project | Alias for tau [info project active](features/cucumber/features/info/info.project.active.feature)
 tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)

data/lib/takeltau/default.yml

@@ -37,6 +37,7 @@ cmd_info_status_lib_git_key_available: 'gpg --list-key %{key}'
 cmd_info_status_gopass_root_store: 'gopass config | grep "path" | cut -d " " -f 2'
 cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
+cmd_info_status_hg_username: 'hg config ui.username'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
 cmd_init_lib_git_init: 'git init && git checkout -b main'

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

@@ -9,18 +9,19 @@ module InfoStatusBar
     log.debug 'Get status info bar'
 
     @bar_list = []
+    @bar_status = true
 
     _info_status_bar_takelage
     _info_status_bar_tau
     _info_status_bar_git
     _info_status_bar_gopass
     _info_status_bar_gpg
+    _info_status_bar_hg
     _info_status_bar_mutagen
     _info_status_bar_ssh
 
-    bar = @bar_list.join(' | ')
-    log.debug "status info bar: #{bar}"
-    bar
+    say @bar_list.join(' | ')
+    @bar_status
   end
   # rubocop:enable Metrics/MethodLength
 
@@ -28,11 +29,10 @@ module InfoStatusBar
 
   # Add takelage version info to bar.
   def _info_status_bar_takelage
-    takelage_version_file = '/etc/takelage_version'
-    return unless _file_exists? takelage_version_file
+    # 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.
@@ -43,12 +43,14 @@ module InfoStatusBar
   # Add git status info to bar.
   def _info_status_bar_git
     @status_git = info_status_git
+    @bar_status &&= @status_git
     @bar_list << ("git: #{@status_git ? 'ok'.green : 'no'.red}")
   end
 
   # Add gopass status info to bar.
   def _info_status_bar_gopass
     @status_gopass = info_status_gopass
+    @bar_status &&= @status_gopass
     @bar_list << ("gopass: #{@status_gopass ? 'ok'.green : 'no'.red}")
   end
 
@@ -59,17 +61,30 @@ module InfoStatusBar
       return
     end
 
-    @bar_list << ("gpg: #{info_status_gpg ? 'ok'.green : 'no'.red}")
+    status_gpg = info_status_gpg
+    @bar_status &&= status_gpg
+    @bar_list << ("gpg: #{status_gpg ? 'ok'.green : 'no'.red}")
+  end
+
+  # Add git status info to bar.
+  def _info_status_bar_hg
+    @status_hg = info_status_hg
+    @bar_status &&= @status_hg
+    @bar_list << ("hg: #{@status_hg ? 'ok'.green : 'no'.red}")
   end
 
   # Add mutagen status info to bar.
   def _info_status_bar_mutagen
-    @bar_list << ("mutagen: #{mutagen_check_daemon ? 'ok'.green : 'no'.red}")
+    status_mutagen = mutagen_check_daemon
+    @bar_status &&= status_mutagen
+    @bar_list << ("mutagen: #{status_mutagen ? 'ok'.green : 'no'.red}")
   end
 
   # Add ssh status info to bar.
   def _info_status_bar_ssh
-    @bar_list << ("ssh: #{info_status_ssh ? 'ok'.green : 'no'.red}")
+    status_ssh = info_status_ssh
+    @bar_status &&= status_ssh
+    @bar_list << ("ssh: #{status_ssh ? 'ok'.green : 'no'.red}")
   end
 end
 

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

@@ -16,6 +16,7 @@ module Takeltau
     include InfoStatusGit
     include InfoStatusGopass
     include InfoStatusGPG
+    include InfoStatusHg
     include InfoStatusSSH
     include InfoStatusBar
     include MutagenCheckDaemon
@@ -41,7 +42,7 @@ module Takeltau
     LONGDESC
     # Print status info bar.
     def bar
-      say info_status_bar
+      exit info_status_bar
     end
 
     #
@@ -80,6 +81,18 @@ module Takeltau
       exit info_status_gpg
     end
 
+    #
+    # info status hg
+    #
+    desc 'hg', 'Check hg status info'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check hg status info
+    LONGDESC
+    # Check hg status info.
+    def hg
+      exit info_status_hg
+    end
+
     #
     # info status mutagen
     #

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# tau info status hg
+module InfoStatusHg
+  # Backend method for info status hg.
+  # @return [Boolean] has mercurial been configured?
+  def info_status_hg
+    log.debug 'Check hg status'
+
+    unless _info_status_hg_username
+      log.error 'hg ui.username is not configured'
+      return false
+    end
+
+    log.debug 'hg config is available'
+    true
+  end
+
+  private
+
+  # Check hg username
+  def _info_status_hg_username
+    status_username = try config.active['cmd_info_status_hg_username']
+    status_username.exitstatus.zero?
+  end
+end

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/self/commands.rb

@@ -27,7 +27,7 @@ module SelfCommands
   # Manipulate output of thor list command.
   def _manipulate_output_(thor_list)
     tau_commands = thor_list.gsub("takeltau\n", '')
-    tau_commands.gsub!("------\n", '')
+    tau_commands.gsub!("--------\n", '')
     tau_commands.gsub!('thor ', 'tau ')
     tau_commands.gsub!(/(.*)takeltau:c_l_i:(.*)#(.*)/, '\1\2               #\3')
     tau_commands.gsub!(/.*COMMAND.*\n/, '')

data/lib/takeltau/version

@@ -1 +1 @@
-0.37.3
+0.39.0

data/lib/takeltau.rb

@@ -70,6 +70,7 @@ require_relative 'takeltau/info/status/lib'
 require_relative 'takeltau/info/status/git'
 require_relative 'takeltau/info/status/gopass'
 require_relative 'takeltau/info/status/gpg'
+require_relative 'takeltau/info/status/hg'
 require_relative 'takeltau/info/status/ssh'
 require_relative 'takeltau/info/status/bar'
 require_relative 'takeltau/info/status/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.37.3
+  version: 0.39.0
 platform: ruby
 authors:
 - Takelwerk
@@ -244,6 +244,7 @@ files:
 - lib/takeltau/info/status/git.rb
 - lib/takeltau/info/status/gopass.rb
 - lib/takeltau/info/status/gpg.rb
+- lib/takeltau/info/status/hg.rb
 - lib/takeltau/info/status/lib.rb
 - lib/takeltau/info/status/ssh.rb
 - lib/takeltau/init/cli.rb