takelage 0.29.0 → 0.29.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ad578971e04ab78238e26f456f1071a39dcd57ca40d08cb63f78623dbba13f
-  data.tar.gz: 5bc6aaf8d1d7b37ab684da509c766d040d12d37a88cc301ee24405110f4b0631
+  metadata.gz: 72eec6b693bd95af8a8e16cfc0370eb7ee120dad14d0d1dd40bd57c2df01a589
+  data.tar.gz: 25020601afdd90fb2c22f5a3e7a99d29703c2fea860a85db8be9e4be7c8ea571
 SHA512:
-  metadata.gz: 38d06e826c104089e3a134a7e6ce9660893f1cd2f8f103cdf2771d84ad4a82e2eda8e6dd7578da0452a98a4e808b0e55393798ac363c89d4960d34ebb83390e3
-  data.tar.gz: 5a98640e8c71d0be3a730de18d75e86f890e812498e53a1a7e0bb73d90536f36add90d80abc89ea06cdbfb99b208ead667aecc91f4e524b2245b68356c92f7e3
+  metadata.gz: '05995559b4ff1dc2c6691f49525c4323af0bd11f59b20105a80f5626671ffb6727be7a467676534913080a5485a8f3351544994f4c32ffce745c8ff8e76c3ca5'
+  data.tar.gz: b35d4ccbe94879a1749195098b77986a2e7836f8f36fd3418f433b916019fba9779582be2c81c8e60cb88fad0149422d891e55d447e877d1bcc851d4152c4b8d

data/README.md

@@ -108,7 +108,7 @@ tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.che
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [NAME] [IN] [OUT] | Create a mutagen socket [NAME] from [IN] to [OUT] of the container
 tau [mutagen socket list](features/cucumber/features/mutagen/mutagen.socket.list.feature) | List mutagen sockets
 tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
-tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) | Terminate a mutagen socket
+tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) [SOCKET] | Terminate a mutagen [SOCKET]
 tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration
 tau [self config default](features/cucumber/features/self/self.config.default.feature) | Print takelage default configuration
 tau [self config home](features/cucumber/features/self/self.config.home.feature) | Print takelage home config file configuration

data/lib/takelage/default.yml

@@ -62,7 +62,7 @@ cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
 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_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --label=%{takelsocklabel} 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}'
 cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
@@ -79,7 +79,9 @@ docker_user: 'takelage'
 git_main_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_takelage_label: 'type=takelage-socket'
+mutagen_socket_takelage_label: 'type=takelage'
+mutagen_socket_takelage_socket_label: 'type=takelage-socket'

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

@@ -8,9 +8,13 @@ module DockerContainerCommand
 
     return false unless docker_check_daemon
 
-    return false unless _docker_container_lib_create_net_and_ctr @hostname
+    # no matrjoschka test here
 
-    _docker_container_lib_start_sockets
+    unless docker_container_check_existing @hostname
+      return false unless _docker_container_lib_create_net_and_ctr @hostname
+
+      _docker_container_lib_start_sockets
+    end
 
     _docker_container_command_run_command @hostname, command
   end

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

@@ -25,17 +25,12 @@ module DockerContainerLib
 
   # Create docker container and network.
   def _docker_container_lib_create_net_and_ctr(name)
-    if _docker_container_lib_check_matrjoschka
-      log.error 'You cannot log in to takelage from within takelage'
-      return false
-    end
+    return true if docker_container_check_existing name
 
     unless docker_container_check_network name
       _docker_container_lib_create_network name
     end
 
-    return true if docker_container_check_existing name
-
     _docker_container_lib_create_container name
   end
 
@@ -121,12 +116,12 @@ module DockerContainerLib
   def _docker_container_lib_check_matrjoschka
     log.debug 'Checking if we are already inside a takelage container'
 
-    return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
-
-    log.debug 'We are already inside a takelage container'
+    unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
+      log.debug 'We are not inside a takelage container'
+      return false
+    end
 
-    # wait or the github workflow will fail
-    sleep 1
+    log.debug 'We are inside a takelage container'
 
     true
   end

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

@@ -8,15 +8,30 @@ module DockerContainerLogin
 
     return false unless docker_check_daemon
 
-    return false unless _docker_container_lib_create_net_and_ctr @hostname
+    if _docker_container_lib_check_matrjoschka
+      log.error 'You cannot log in to takelage from within takelage'
+      return false
+    end
 
-    _docker_container_lib_start_sockets
+    # rubocop:disable Style/IfUnlessModifier
+    unless docker_container_check_existing @hostname
+      _docker_container_login_create_container @hostname
+    end
+    # rubocop:enable Style/IfUnlessModifier
 
     run_and_exit _docker_container_login_enter_container @hostname
   end
 
   private
 
+  # Create container, network and forward sockets
+  def _docker_container_login_create_container(container)
+    return false unless _docker_container_lib_create_net_and_ctr container
+
+    _docker_container_lib_start_sockets
+    _docker_container_wait_for_sockets
+  end
+
   # Prepare enter existing container command.
   def _docker_container_login_enter_container(container)
     log.debug "Entering container \"#{container}\""
@@ -31,4 +46,13 @@ module DockerContainerLogin
       username: @username
     )
   end
+
+  # Wait for the sockets to come up
+  def _docker_container_wait_for_sockets
+    wait_for_sockets = config.active['login_wait_for_sockets'].to_i
+    return if wait_for_sockets.zero?
+
+    log.debug "Waiting for #{wait_for_sockets} #{pluralize(wait_for_sockets, 'second', 'seconds')}"
+    sleep wait_for_sockets
+  end
 end

data/lib/takelage/lib/system.rb

@@ -162,5 +162,12 @@ module SystemModule
     end
     true
   end
+
+  # Pluralize a verb in relation to a number
+  def pluralize(number, singular, plural)
+    return singular if number == 1
+
+    plural
+  end
 end
 # rubocop:enable Metrics/ModuleLength

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

@@ -35,6 +35,7 @@ module Takelage
 
       @hostlabel = "hostname=#{@hostname}"
       @takellabel = config.active['mutagen_socket_takelage_label']
+      @takelsocklabel = config.active['mutagen_socket_takelage_socket_label']
     end
 
     #
@@ -79,11 +80,11 @@ module Takelage
     #
     # mutagen socket terminate
     #
-    desc 'terminate', 'Terminate a mutagen socket'
+    desc 'terminate [SOCKET]', 'Terminate a mutagen [SOCKET]'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Terminate a mutagen socket
+    Terminate a mutagen [SOCKET]
     LONGDESC
-    # Terminate a mutagen socket.
+    # Terminate a mutagen [SOCKET].
     def terminate(socket)
       exit mutagen_socket_terminate socket
     end

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

@@ -39,7 +39,8 @@ module MutagenSocketCreate
       username: @username,
       container: @hostname,
       hostlabel: @hostlabel,
-      takellabel: @takellabel
+      takellabel: @takellabel,
+      takelsocklabel: @takelsocklabel
     )
     run cmd_create_socket
   end

data/lib/takelage/version

@@ -1 +1 @@
-0.29.0
+0.29.13

metadata

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