takeltau 0.36.3 → 0.37.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2465bad2b7f3f05a0989db146bcd4aeebccb1157c03ccd54a34e2dc6653ad46
-  data.tar.gz: 5a5a34f4ca5c59e66ef99e6814aea3c07f8f591f9511ee24484473462fe9083c
+  metadata.gz: 6e297c80af53f6afcb49ac3728e6c5833a53fdbaf745d1df9f2cc024da99a87e
+  data.tar.gz: 29593c7d300c8f960292a9527a778421a41a3b7bea203da4ec6acc25eac7113a
 SHA512:
-  metadata.gz: a2ce4ee0a6cbf779b3f0066f46e4ad4a9ec500b704661b9e93b3b27c230246a129552d9dedbafa1ee858bc9482ec13d03b499b915914593799fbd3616cd10f91
-  data.tar.gz: d1bc6aa9527413db818055b1f6aecc0654352a41fbca79d1c461329b71d2d5ea1d6d2427b0795b268da856c1eab217e3aefdef71b32f9129e68db5f8e708ff78
+  metadata.gz: 54d2ce13da764a2d7fa40c344ef139605eafc5e1d6559fdaeb7dea38ff9702b7f57fa99a7c520469dac89f55800aaf2c284fc014f0735ff920dde3397a639867
+  data.tar.gz: 0f4d384cfaba7ccb214cfb6a0e780f662703706e706898858a6663257f9d1af3d26cab3daf24b172d583b89936d32b8f44b0d33ff3aed86b81705e6663673d9b

data/README.md

@@ -168,7 +168,21 @@ to overwrite defaults like:
 docker_repo: takelage-mock
 ```
 
-Furthermore, every external command can be reconfigured.
+- You may prefer to interact with 
+[mercurial](https://github.com/takelwerk/takelage-doc/blob/main/doc/tau/hg.md)
+through `tau hg`
+in a different branch than `main` in one project so you may add
+to your *takelage.yml*:
+
+
+```yaml
+---
+git_hg_repo: my_git_hg_branch
+```
+
+Furthermore, 
+[every external command](https://github.com/takelwerk/takelage-cli/blob/main/lib/takeltau/default.yml)
+can be reconfigured.
 
 ### Project Files
 

data/lib/takeltau/default.yml

@@ -23,14 +23,13 @@ cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_hg_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
-cmd_git_lib_git_add_all: 'git add --all'
 cmd_git_lib_git_add_hg_dirs: 'git add \*/.hg/\*'
 cmd_git_lib_git_commit: 'git commit --message="%{message}"'
 cmd_git_lib_git_pull_origin: 'git pull origin %{main}'
 cmd_git_lib_git_push_origin: 'git push origin %{main}'
-cmd_hg_list_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k hg paths default -R {//} -T "hg\ clone\ {url}\ " \; echo {//}'
-cmd_hg_pull_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k echo \; cd {//} \; pwd \; hg pull --update'
-cmd_hg_push_repos: 'cd %{root}; find * -type d -name ".hg" | parallel -k echo \; cd {//} \; pwd \; hg commit --addremove --message "Update\ hg\ repos" \; hg bookmark -f main \; hg push'
+cmd_hg_list_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order hg paths default --repository {//} --template "hg\ clone\ {url}\ " \; echo {//}'
+cmd_hg_pull_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg pull --update'
+cmd_hg_push_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg commit --addremove --message "Update\ hg\ repos" \; hg bookmarks --force main \; hg push'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
 cmd_info_status_lib_git_email: 'git -C %{root} config user.email'
 cmd_info_status_lib_git_signingkey: 'git -C %{root} config user.signingKey'
@@ -65,7 +64,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/git/lib.rb

@@ -2,57 +2,54 @@
 
 # tau git lib
 module GitLib
-  # Pull git workspace.
-  def git_lib_pull_workspace
-    log.info 'Pulling git workspace'
+  # Prepare git workspace.
+  # rubocop:disable Metrics/MethodLength
+  def git_lib_prepare_git_workspace
+    log.debug 'Prepare git workspace'
 
-    _git_lib_git_pull_origin_hg
-  end
+    return false unless configured? %w[project_root_dir]
 
-  # Push git workspace.
-  def git_lib_push_workspace(message)
-    log.info 'Pushing git workspace'
+    unless git_check_hg
+      log.error 'Not on git hg branch'
+      return false
+    end
 
-    return false unless _git_lib_git_add_all
-    return false unless _git_lib_git_commit message
-    return false unless _git_lib_git_pull_origin_hg
+    unless git_check_clean
+      log.error 'No clean git workspace'
+      return false
+    end
 
-    _git_lib_git_push_origin_hg
+    return true if _git_lib_git_pull_origin_hg
+
+    log.error 'Unable to pull git workspace'
+    false
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Push git workspace.
   def git_lib_push_hg_dirs
     log.info 'Pushing git workspace'
 
-    message = '"Update .hg mercurial directories'
+    message = 'Update .hg mercurial directories'
 
     return false unless _git_lib_git_add_hg_dirs
     return false unless _git_lib_git_commit message
 
-    _git_lib_git_push_origin_hg
-  end
-
-  private
-
-  # git add all.
-  def _git_lib_git_add_all
-    log.debug 'Adding all files to git'
-
-    cmd_git_add_all = config.active['cmd_git_lib_git_add_all']
+    return true if _git_lib_git_push_origin_hg
 
-    return true if try cmd_git_add_all
-
-    log.error 'Unable to add all files to git'
+    log.error 'Unable to git push .hg mercurial directories'
     false
   end
 
+  private
+
   # git add hg dirs.
   def _git_lib_git_add_hg_dirs
     log.debug 'Adding all .hg mercurial dirs to git'
 
     cmd_git_add_hg_dirs = config.active['cmd_git_lib_git_add_hg_dirs']
 
-    return true if try cmd_git_add_hg_dirs
+    return true if (try cmd_git_add_hg_dirs).exitstatus.zero?
 
     log.error 'Unable to add all .hg mercurial dirs to git'
     false
@@ -67,7 +64,7 @@ module GitLib
       message: message
     )
 
-    return true if try cmd_git_commit
+    return true if (try cmd_git_commit).exitstatus.zero?
 
     log.error 'Unable to commit to git'
     false

data/lib/takeltau/hg/pull.rb

@@ -3,37 +3,18 @@
 # tau hg pull
 module HgPull
   # Backend method for hg pull.
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
   def hg_pull
     log.debug 'Pull hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_pull_hg_pull_repos
+      log.error 'Unable to tau hg pull'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    unless git_lib_pull_workspace
-      log.error 'Unable to pull git workspace'
-      return false
-    end
-
-    log.info _hg_pull_hg_pull_repos
-
-    return true if git_lib_push_hg_dirs
-
-    log.error 'Unable to push .hg mercurial directories'
-    false
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
 
   private
 
@@ -44,6 +25,8 @@ module HgPull
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_pull_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_pull_repos
+    log.info stdout
+    exitstatus.zero?
   end
 end

data/lib/takeltau/hg/push.rb

@@ -3,30 +3,18 @@
 # tau hg push
 module HgPush
   # Backend method for hg push.
-  # rubocop:disable Metrics/MethodLength
   def hg_push
     log.debug 'Push hg repos'
 
-    return false unless configured? %w[project_root_dir]
+    return false unless git_lib_prepare_git_workspace
 
-    unless git_check_hg
-      log.error 'Not on git hg branch'
+    unless _hg_push_hg_push_repos
+      log.error 'Unable to tau hg push'
       return false
     end
 
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    log.info _hg_push_hg_push_repos
-
-    return true if git_lib_push_workspace 'tau hg push'
-
-    log.error 'Unable to push git workspace'
-    false
+    git_lib_push_hg_dirs
   end
-  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -37,6 +25,8 @@ module HgPush
       root: config.active['project_root_dir']
     )
 
-    run cmd_hg_push_repos
+    stdout, _, exitstatus = run_and_capture cmd_hg_push_repos
+    log.info stdout
+    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/version

@@ -1 +1 @@
-0.36.3
+0.37.3

metadata

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