takelage 0.28.8 → 0.28.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d001b2320ee31a8a1418fa2148f2b57e188161a77462d743664ba65fee9f9c9
-  data.tar.gz: 1029b8f87e5a2ca62dabb569393b9882728555c36a3a474a8c4d8a07284aab00
+  metadata.gz: 5a8b7bb0715a8126a3d09df70fca6e992c49abaed80e3ccfc8e79c6b3c480c66
+  data.tar.gz: 6a0290962d4a8cf2ec036b9a4ce925ba467f6163f2e0d9d37a02a37085356fe9
 SHA512:
-  metadata.gz: 9edf2460fba247d5cca26952aba78c223c86b13a796dfc88e2cf586e910e3d2b451ac920d5ea1f597d1ba282b1a65c90e19d89e5e2bb2ded707916db908b4368
-  data.tar.gz: e6678614002f51c2e712aaa0a9a4578fb6ace913de6d6c0561728a21ae53f048140ef9bbe58439c1da9791b1a86f73bfaa957fe39ce45ff875f37d5f0c1b8df6
+  metadata.gz: e782f36cde89e04d2431c0232f4a9edc059c475ccce8216dad7db30842693bf72677ac9de79d08c98031c9434cfead8321261019e7d1723af1895bd2e8f6565c
+  data.tar.gz: 49fda45497cc158cd9ee10709deaf015e4d27e14ab486bd291b89c8fa5d5b4f18b56e49b487189bb57b43de1de08dfc143866662072f013165bb9fdacbf17041

data/lib/takelage/default.yml

@@ -67,6 +67,7 @@ cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
+cmd_mutagen_check_daemon_version: 'mutagen version'
 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_check: 'mutagen forward list %{socketname}'
 cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'

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

@@ -29,6 +29,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @workdir = Dir.getwd
+
       inside = _docker_container_lib_check_matrjoschka
       @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"

data/lib/takelage/mutagen/check/cli.rb

@@ -22,6 +22,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @workdir = Dir.getwd
+
       inside = _docker_container_lib_check_matrjoschka
       @hostname = inside ? ENV['HOSTNAME'] : _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"

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

@@ -5,9 +5,21 @@ 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
     log.debug 'Check mutagen status'
 
+    # are we outside of a takelage container?
+    unless _docker_container_lib_check_matrjoschka
+      unless _mutagen_check_daemon_version
+        log.error 'mutagen is not available'
+        return false
+      end
+
+      log.debug 'mutagen is available'
+      return true
+    end
+
     unless _file_exists? config.active['mutagen_socket_path']
       log.error 'mutagen socket is not available'
       return false
@@ -21,6 +33,7 @@ module MutagenCheckDaemon
     log.debug 'mutagen is available'
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
@@ -34,4 +47,10 @@ module MutagenCheckDaemon
     host_connection = try check_host_connection
     host_connection.exitstatus.zero?
   end
+
+  # Check mutagen version
+  def _mutagen_check_daemon_version
+    version = try config.active['cmd_mutagen_check_daemon_version']
+    version.exitstatus.zero?
+  end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.28.8
+0.28.11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.8
+  version: 0.28.11
 platform: ruby
 authors:
 - Geospin