takeltau 0.37.1 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293a71b537a49394f198b0a1479285f57e43d899ccaffdcf64f18e91a95a4445
-  data.tar.gz: 00e04f3a868ac61e81660b4e37e74a83d055c72d591ca53be88e04c48b32e488
+  metadata.gz: 3cdad12eeefa3b06fdce78f798f07ddae95be2cd83e14e8bfc9159df38480a3e
+  data.tar.gz: 4f4be3e7401333306784e7f343cfd049633a3998d08871ceabd137af582f7243
 SHA512:
-  metadata.gz: 4f259593b1df8171bcd2400ba152a55c430b3c535e8c8f5abe6cbc3e66c4484947e32472d0ff612e848f0429ee96424306329f0a7abc063f116c9610396fb628
-  data.tar.gz: b71b36fcba29683483fa39e35e46293dac09c61c6b1603977605ab0eacf16eefe12867058160544ac21774b05a0f34b95c24baf7b915c18530a60cebb3fe3dcc
+  metadata.gz: 858ce1e3ace8d154329c0be1420a939116fc38cd8e56a9f73e431dac27bd43338a42db045bf32aed92d306d62a32328cd1fa6eae6f49c7cb5c192fa77b30cc29
+  data.tar.gz: fcd3ad170d599873e11803450f26b3065a593b1826cbc8b156caeee1e8659fc98523ca4668edec0cfd743a961d35586c374ddb13182fb95d7dd74faab8837042

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'
@@ -64,7 +65,10 @@ git_hg_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'
-mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
-mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'
-mutagen_socket_path_ssh: '~/.gnupg/S.gpg-agent.ssh'
+mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
+mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
 mutagen_socket_takelage_label: 'type=takelage'

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

@@ -40,9 +40,12 @@ module Takeltau
       @hostname = _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"
       @takellabel = config.active['mutagen_socket_takelage_label']
-      @mutagensock = config.active['mutagen_socket_path_mutagen']
-      @gpgsock = config.active['mutagen_socket_path_gpg']
-      @sshsock = config.active['mutagen_socket_path_ssh']
+      @mutagensock_container = config.active['mutagen_socket_path_mutagen_container']
+      @mutagensock_host = config.active['mutagen_socket_path_mutagen_host']
+      @gpgsock_container = config.active['mutagen_socket_path_gpg_container']
+      @gpgsock_host = config.active['mutagen_socket_path_gpg_host']
+      @sshsock_container = config.active['mutagen_socket_path_ssh_container']
+      @sshsock_host = config.active['mutagen_socket_path_ssh_host']
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize

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

@@ -10,9 +10,9 @@ module DockerContainerLib
   def _docker_container_lib_start_sockets
     return false unless mutagen_check_daemon
 
-    mutagen_socket_create 'mutagen', @mutagensock, @mutagensock
-    mutagen_socket_create 'gpg', @gpgsock, @gpgsock
-    mutagen_socket_create 'ssh', @sshsock, @sshsock
+    mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
+    mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host
+    mutagen_socket_create 'ssh', @sshsock_container, @sshsock_host
   end
 
   # Create unique docker hostname

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
 
@@ -29,7 +30,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
+    unless _file_exists? takelage_version_file
+      @bar_status = false
+      return false
+    end
 
     _file_read takelage_version_file
     @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
@@ -43,12 +47,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 +65,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/mutagen/check/daemon.rb

@@ -5,14 +5,13 @@ module MutagenCheckDaemon
   # Backend method for mutagen check daemon.
   # @return [Boolean] is mutagen available?
   # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def mutagen_check_daemon
     return true if @mutagen_daemon_available
 
-    return false unless command_available_else_warn? config.active['cmd_mutagen']
-
     log.debug 'Check mutagen status'
 
+    return false unless _mutagen_check_check_prerequisites
+
     # are we outside of a takelage container?
     unless _docker_container_lib_check_matrjoschka
       unless _mutagen_check_daemon_version
@@ -25,11 +24,6 @@ module MutagenCheckDaemon
       return true
     end
 
-    unless _file_exists? config.active['mutagen_socket_path_mutagen']
-      log.error 'The mutagen socket is not available'
-      return false
-    end
-
     unless _mutagen_check_daemon_host_connection
       log.error 'A mutagen host connection is not available'
       return false
@@ -39,11 +33,25 @@ module MutagenCheckDaemon
     @mutagen_daemon_available = true
     true
   end
-  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
 
+  # Check mutagen prerequisites
+  def _mutagen_check_check_prerequisites
+    unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
+      log.error 'The mutagen socket path in the container is not available'
+      return false
+    end
+
+    unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
+      log.error 'The mutagen socket path on the host is not available'
+      return false
+    end
+
+    command_available_else_error? config.active['cmd_mutagen']
+  end
+
   # Check mutagen host connection
   # rubocop:disable Metrics/MethodLength
   def _mutagen_check_daemon_host_connection

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.1
+0.38.2

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.1
+  version: 0.38.2
 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