takelage 0.28.14 → 0.28.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011a1f337984e2512deb1b67601fe20191a29d38d24b356c922f7c9e5e12a467
-  data.tar.gz: 5decfcfd262bfb3466baa3a38b7ae80bb9d314838751ae4a17777915cb90edde
+  metadata.gz: 1a283a1e76877049cf7645c703c6bf2b17dcc3c7c13c1a5cac363441202f91b1
+  data.tar.gz: a53eb5c037d97b88d99e8bc4b9e9d5db17a2eb30b15fa993ac6a70924d5f9a36
 SHA512:
-  metadata.gz: 279972fa01d7b84f786198d9abcd5f7757a3ef840b13d5d9f4de31032979ede3ab45ad5d21deb8d71f8ab806ac711e6cae17bf7389c8838e15efe68abd2aaba2
-  data.tar.gz: 1e0c9eb0a468ff8fd5f4adbd0c969e3c2f466a5fbcdb9e0eeb0ca592ad31bcc5f11b0a0454a1fd5c819e46c545ea402ad131ab6b7b7cabe68eb105b23f7a67ad
+  metadata.gz: '05921e675c4136d159cf1e3e4e3774ea0e39a23bd4add0d4a0ce955b6e34806577ab63ddc9d14797799439e4abdde303b86471ef94c6a98ad24e196194e65416'
+  data.tar.gz: f0eb22800596daaefc3e6a8b2ccd9ea8df1d17e3ec547165bd795c98eedf06f02f310339406d6afb0164390b4fed7c88bc4b8b804b8f13c0db68f9665e33f3aa

data/README.md

@@ -78,7 +78,6 @@ tau [bit scope list](features/cucumber/features/bit/bit.scope.list.feature) | Li
 tau [bit scope new](features/cucumber/features/bit/bit.scope.new.feature) [SCOPE] | Init a new bit [SCOPE]
 tau [completion bash](features/cucumber/features/completion/completion.bash.feature) | Print bash completion code
 tau [docker check daemon](features/cucumber/features/docker/docker.check.daemon.feature) | Check if docker daemon is running
-tau [docker check socat](features/cucumber/features/docker/docker.check.socat.feature) | Check if socat command is available
 tau [docker container check existing](features/cucumber/features/docker/docker.container.check.existing.feature) [CONTAINER] | Check if docker [CONTAINER] is existing
 tau [docker container check network](features/cucumber/features/docker/docker.container.check.network.feature) [NETWORK] | Check if docker [NETWORK] is existing
 tau [docker container check orphaned](features/cucumber/features/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned

data/lib/takelage.rb

@@ -49,7 +49,6 @@ require_relative 'takelage/mutagen/socket/create'
 require_relative 'takelage/mutagen/socket/terminate'
 require_relative 'takelage/mutagen/socket/tidy'
 require_relative 'takelage/docker/check/daemon'
-require_relative 'takelage/docker/check/socat'
 require_relative 'takelage/docker/check/cli'
 require_relative 'takelage/docker/socket/lib'
 require_relative 'takelage/docker/socket/host'

data/lib/takelage/default.yml

@@ -30,7 +30,6 @@ cmd_bit_scope_list_find_scopes: 'find -L %{root} -name scope.json'
 cmd_bit_scope_new_bit_init: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
 cmd_docker_check_daemon_docker_info: 'docker info'
-cmd_docker_check_socat_which_socat: 'which socat'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
 
     #
     # docker check daemon
@@ -20,17 +19,5 @@ module Takelage
     def daemon
       exit docker_check_daemon
     end
-
-    #
-    # docker check socat
-    #
-    desc 'socat', 'Check if socat command is available'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if socat command is available
-    LONGDESC
-    # Check if socat command is available.
-    def socat
-      exit docker_check_socat
-    end
   end
 end

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

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
-# takelage docker check running
+# takelage docker check daemon
 module DockerCheckDaemon
-  # Backend method for docker check running.
+  # Backend method for docker check daemon.
   # @return [Boolean] is the docker daemon running?
+  # rubocop:disable Metrics/MethodLength
   def docker_check_daemon
     return true if @docker_daemon_running
 
+    return false unless command_available? 'docker'
+
     log.debug 'Check if the docker daemon is running'
 
     status = try config.active['cmd_docker_check_daemon_docker_info']
@@ -20,4 +23,5 @@ module DockerCheckDaemon
     @docker_daemon_running = true
     true
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/lib/takelage/docker/container/check/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCheckOrphaned

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCheckOrphaned

data/lib/takelage/docker/socket/cli.rb

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerSocketLib
     include DockerSocketHost
     include DockerSocketScheme

data/lib/takelage/docker/socket/start.rb

@@ -8,7 +8,7 @@ module DockerSocketStart
 
     return false unless docker_check_daemon
 
-    return false unless docker_check_socat
+    return false unless command_available? 'socat'
 
     cmds_start_socket = _docker_socket_lib_get_socket_start_commands 'start'
 

data/lib/takelage/docker/socket/stop.rb

@@ -8,7 +8,7 @@ module DockerSocketStop
 
     return false unless docker_check_daemon
 
-    return false unless docker_check_socat
+    return false unless command_available? 'socat'
 
     # get process list
     # assuming format: "pid command"

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCommand

data/lib/takelage/lib/system.rb

@@ -5,7 +5,26 @@ require 'open3'
 require 'yaml'
 
 # Interaction with the operating system
+# rubocop:disable Metrics/ModuleLength
 module SystemModule
+  # Check if a command is available
+  # @return [Boolean] is the command available?
+  def command_available?(command)
+    return true if instance_variable_get("@command_available_#{command}")
+
+    log.debug "Check if the command \"#{command}\" is available"
+
+    status = try "which #{command}"
+
+    unless status.exitstatus.zero?
+      log.debug "The command \"#{command}\" is not available"
+      return false
+    end
+
+    log.debug "The command \"#{command}\" is available"
+    instance_variable_set("@command_available_#{command}", true)
+  end
+
   # Convert hash to yaml.
   # @return [String] yaml of hash
   def hash_to_yaml(hash)
@@ -131,3 +150,4 @@ module SystemModule
     true
   end
 end
+# rubocop:enable Metrics/ModuleLength

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCommand

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

@@ -9,28 +9,30 @@ module MutagenCheckDaemon
   def mutagen_check_daemon
     log.debug 'Check mutagen status'
 
+    return false unless command_available? 'mutagen'
+
     # are we outside of a takelage container?
     unless _docker_container_lib_check_matrjoschka
       unless _mutagen_check_daemon_version
-        log.error 'mutagen is not available'
+        log.error 'The mutagen daemon is not available'
         return false
       end
 
-      log.debug 'mutagen is available'
+      log.debug 'The mutagen daemon is available'
       return true
     end
 
     unless _file_exists? config.active['mutagen_socket_path']
-      log.error 'mutagen socket is not available'
+      log.error 'The mutagen socket is not available'
       return false
     end
 
     unless _mutagen_check_daemon_host_connection
-      log.error 'mutagen host connection is not available'
+      log.error 'A mutagen host connection is not available'
       return false
     end
 
-    log.debug 'mutagen is available'
+    log.debug 'The mutagen daemon is available'
     true
   end
   # rubocop:enable Metrics/AbcSize

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

@@ -7,7 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
-    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCommand

data/lib/takelage/version

@@ -1 +1 @@
-0.28.14
+0.28.24

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.28.14
+  version: 0.28.24
 platform: ruby
 authors:
 - Geospin
@@ -227,7 +227,6 @@ files:
 - lib/takelage/default.yml
 - lib/takelage/docker/check/cli.rb
 - lib/takelage/docker/check/daemon.rb
-- lib/takelage/docker/check/socat.rb
 - lib/takelage/docker/cli.rb
 - lib/takelage/docker/container/check/cli.rb
 - lib/takelage/docker/container/check/existing.rb

data/lib/takelage/docker/check/socat.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker check running
-module DockerCheckSocat
-  # Backend method for docker check socat.
-  # @return [Boolean] is the socat command available?
-  def docker_check_socat
-    return true if @socat_command_available
-
-    log.debug 'Check if the socat command is available'
-
-    status = try config.active['cmd_docker_check_socat_which_socat']
-
-    unless status.exitstatus.zero?
-      log.debug 'The socat command is not available'
-      return false
-    end
-
-    log.debug 'The socat command is available'
-    @socat_command_available = true
-    true
-  end
-end