takeltau 0.40.6 → 0.40.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f528a62f30a403c13db7d70795446c0645a309d1c3e7c33db9160f41ac2d6b
-  data.tar.gz: 2ff094105f954a14a79e5e7978a29d2756db85b3cd0beeb3744d9b4deebc1a47
+  metadata.gz: 36e5345fd6b55be001f841d4181d01e1efcc47e35ad6ea5650536dfd1ef49321
+  data.tar.gz: 94db651e1825390239623b0c803fa8c903af90949b7e0f6ca10e173ba0c2ec9f
 SHA512:
-  metadata.gz: cfc49373ada2a44e5eb91dcafc92f9bc3c8e4ac9fbacecb4932d77ffeb7929cc0dca135a7c356e23e5514d4f49aba48debe208363f8978edf7b92cf170f9bcc1
-  data.tar.gz: 8260d3330ad8df2e9d89d0f253cc17afc33bc5f0407f358ef747d88bdc95dafa3dff396e6fabc01aa90a8969874fb7c351d0468de7af15ca42c286cfd9ab31b3
+  metadata.gz: 8e5c61d7cfef9f13924fb147ecce6a0b4615ea85ec98505f720cfb765f975b1f08d66c4eb1284e755696b9b66e3b2b66e88e319f0a36a05a02131b6fbf69eaff
+  data.tar.gz: 676182ed7f62baa2e535a3c2499cd3c8b920dfe3c1210a4947e0264db09492327c9c4cfedcf038231856674e49facd5253788b57ce3822aecdcd66b76674466d

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

@@ -17,8 +17,8 @@ module InfoStatusBar
     _info_status_bar_gopass
     _info_status_bar_gpg
     _info_status_bar_hg
-    _info_status_bar_mutagen
     _info_status_bar_ssh
+    _info_status_bar_mutagen
 
     say @bar_list.join(' | ')
     @bar_status

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

@@ -16,13 +16,13 @@ module InfoStatusSSH
       return false
     end
 
-    unless _file_exists? gpg_ssh_socket
-      log.error 'gpg ssh socket is not available'
+    unless _info_status_ssh_keys
+      log.error 'ssh keys are not available'
       return false
     end
 
-    unless _info_status_ssh_keys
-      log.error 'ssh keys are not available'
+    unless _file_exists? gpg_ssh_socket
+      log.error 'gpg ssh socket is not available'
       return false
     end
 

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

@@ -25,13 +25,13 @@ module MutagenCheckDaemon
       return true
     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
 
-    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
 
@@ -58,7 +58,7 @@ module MutagenCheckDaemon
       return false
     end
 
-    unless stdout.include? 'Status: Forwarding connections'
+    unless stdout.include? 'Status: Forwarding'
       log.debug 'The mutagen forward connection to the host ' \
         'is not forwarding connections'
       return false

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

@@ -6,7 +6,7 @@ module MutagenSocketCreate
   # rubocop:disable Metrics/MethodLength
   def mutagen_socket_create(name, containersock, hostsock)
     # See DockerContainerLib::_docker_container_lib_hostname
-    socketname = "#{@hostname[-11..-1]}-#{name}"
+    socketname = "#{@hostname[-11..]}-#{name}"
     log.debug "Create the mutagen socket \"#{socketname}\" in the container " \
       "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
 

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

@@ -6,7 +6,7 @@ module MutagenSocketDocker
   # rubocop:disable Metrics/MethodLength
   def mutagen_socket_docker(hostsock)
     # See DockerContainerLib::_docker_container_lib_hostname
-    socketname = "#{@hostname[-11..-1]}-docker"
+    socketname = "#{@hostname[-11..]}-docker"
     log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
       "pointing to the host at \"#{hostsock}\""
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.40.6
+0.40.11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.40.6
+  version: 0.40.11
 platform: ruby
 authors:
 - Takelwerk
@@ -293,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="