takeltau 0.39.11 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80673a82149249c7b16503717deb9938a88f2f8b9a689c6f336a89a5709ed300
-  data.tar.gz: d07eb8a444b0c1e7ccefccdbb26aa9a19d7812f1f339e17a992588cf977ac748
+  metadata.gz: 46854647c09d7c6cbb355a6ced92549702101bd8cee88d4696836f615b76ce78
+  data.tar.gz: 5941fd6d52c83b8f08b51d4622196582c0e8f001b48a0069adff0269e456fb25
 SHA512:
-  metadata.gz: 169bf5afcc740f79acd671d220b9833305651214b44a1da98ea58b17dcd15b6e72ab118b6bbeedb575ce738bdd9bb3673d40fffaaa2bbabd7734e83512eb13df
-  data.tar.gz: 0ee76be9d69bfb7a702366600ef26af1299a8ee9d4b04bd1da63f7f9123905ec0347d0d39e3fdccf47287a3257f75d94cf8c269af881f6e48198ed6e7f7cd93b
+  metadata.gz: d2bdee38bb9d591d3f7ac6abd014c7c19cab47e38e7a87ffcc006460208db226a4b713211eb7b6f5c66ae4dd3212e1cf5c0c84e780e9fbd4abbe85c4dbce4ad7
+  data.tar.gz: 0b98a5637ac3c79256eec09ff53ec2bf73d410c9a7e9596d64bb846f9172c4cef70213b0a95879e8fce5511738c73e50d12cd3956483074bd445741285b0e4ed

data/lib/takeltau/default.yml

@@ -14,7 +14,7 @@ cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "L
 cmd_docker_container_stop_container: 'docker stop %{container}'
 cmd_docker_image_tag_check_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
-cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:latest'
+cmd_docker_image_update_docker_pull: 'docker pull %{docker_user}/%{docker_repo}:%{docker_tag}'
 cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
 cmd_git: 'git'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
@@ -46,7 +46,6 @@ cmd_init_lib_git_commit_initial: 'git commit -m "Initial commit"'
 cmd_init_lib_hg_clone: 'bash hgclone'
 cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
-cmd_mutagen_check_daemon_start_daemon: 'mutagen daemon start'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
 cmd_mutagen_forward_socket_docker: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --socket-group-source=docker --socket-permission-mode=0660 docker://root@%{container}:unix:/var/run/docker.sock unix:%{hostsock}'
 cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
@@ -66,11 +65,11 @@ git_hg_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'
-mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
-mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_docker_host: '/var/run/docker.sock'
 mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
 mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
 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/lib.rb

@@ -8,8 +8,6 @@ module DockerContainerLib
 
   # Create mutagen sockets
   def _docker_container_lib_start_sockets
-    return false unless mutagen_check_daemon
-
     mutagen_socket_docker @dockersock_host
     mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
     mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host

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

@@ -16,6 +16,7 @@ module Takeltau
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
+      @docker_tag = config.active['docker_tag']
       @docker_registry = config.active['docker_registry']
     end
 

data/lib/takeltau/docker/image/update.rb

@@ -6,22 +6,23 @@ module DockerImageUpdate
   def docker_image_update
     return false unless docker_check_daemon
 
-    cmd_docker_pull_latest = _docker_image_update_cmd_docker_pull_latest
+    cmd_docker_pull = _docker_image_update_cmd_docker_pull
 
     cmd_docker_remove_dangling =
       config.active['cmd_docker_image_update_docker_remove_dangling']
 
-    run_and_exit "#{cmd_docker_pull_latest} && #{cmd_docker_remove_dangling}"
+    run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
   end
 
   private
 
   # Prepare dpcker pull latest command.
-  def _docker_image_update_cmd_docker_pull_latest
+  def _docker_image_update_cmd_docker_pull
     format(
-      config.active['cmd_docker_image_update_docker_pull_latest'],
+      config.active['cmd_docker_image_update_docker_pull'],
       docker_user: @docker_user,
-      docker_repo: @docker_repo
+      docker_repo: @docker_repo,
+      docker_tag: @docker_tag
     )
   end
 end

data/lib/takeltau/git/lib.rb

@@ -33,7 +33,9 @@ module GitLib
     message = 'Update .hg mercurial directories'
 
     return false unless _git_lib_git_add_hg_dirs
-    return false unless _git_lib_git_commit message
+
+    # Do not fail or a clean workspace triggers a return
+    _git_lib_git_commit message
 
     return true if _git_lib_git_push_origin_hg
 

data/lib/takeltau/hg/push.rb

@@ -27,6 +27,6 @@ module HgPush
 
     stdout, _, exitstatus = run_and_capture cmd_hg_push_repos
     log.info stdout
-    exitstatus.zero?
+    exitstatus.zero? || exitstatus == 2
   end
 end

data/lib/takeltau/mutagen/check/daemon.rb

@@ -11,10 +11,7 @@ module MutagenCheckDaemon
 
     log.debug 'Check mutagen status'
 
-    unless _mutagen_check_daemon_start
-      log.error 'The mutagen daemon cannot be started'
-      return false
-    end
+    return false unless command_available_else_error? config.active['cmd_mutagen']
 
     # are we inside a takelage container?
     unless _docker_container_lib_check_matrjoschka
@@ -28,13 +25,13 @@ module MutagenCheckDaemon
       return true
     end
 
-    unless _mutagen_check_daemon_host_connection
-      log.error 'A mutagen host connection is not available'
+    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_container']
-      log.error 'The mutagen socket path in the container is not available'
+    unless _mutagen_check_daemon_host_connection
+      log.error 'A mutagen host connection is not available'
       return false
     end
 
@@ -42,6 +39,7 @@ module MutagenCheckDaemon
     @mutagen_daemon_available = true
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
@@ -68,12 +66,5 @@ module MutagenCheckDaemon
 
     true
   end
-  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
-
-  # Start mutagen daemon
-  def _mutagen_check_daemon_start
-    start = try config.active['cmd_mutagen_check_daemon_start_daemon']
-    start.exitstatus.zero?
-  end
 end

data/lib/takeltau/mutagen/socket/create.rb

@@ -10,8 +10,6 @@ module MutagenSocketCreate
     log.debug "Create the mutagen socket \"#{socketname}\" in the container " \
       "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
 
-    return false unless mutagen_check_daemon
-
     return false if mutagen_socket_check socketname
 
     socket_created = _mutagen_socket_create_socket(socketname, containersock, hostsock)

data/lib/takeltau/mutagen/socket/docker.rb

@@ -10,8 +10,6 @@ module MutagenSocketDocker
     log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
       "pointing to the host at \"#{hostsock}\""
 
-    return false unless mutagen_check_daemon
-
     return false if mutagen_socket_check socketname
 
     socket_created = _mutagen_socket_docker_socket(socketname, hostsock)

data/lib/takeltau/version

@@ -1 +1 @@
-0.39.11
+0.40.1

metadata

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