takelage 0.29.8 → 0.29.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8837b042456b6e1babf826a7b04a1a3156c77c0bae985987c4653d1edf844bb
-  data.tar.gz: cd60992104d7730dd7688189142ef2567aa86ddcebf59aec2370e2adc0782154
+  metadata.gz: 0b28f6c30df4d3f1e62b9f8ad4c282a828eb186521b168bda7f79dfb9a2a483b
+  data.tar.gz: 6adc87395967eac65059df51f82140ee3b879fa19d869082924aaf44d04826b4
 SHA512:
-  metadata.gz: fb2c0d378aeb648f070c29d28697f8345e38f1fa3e973b1694d121eb2a28ffde56f7441c7d3110bd27eabc8c9bf6a11e636428ae37d266eb6eb874e1792543ae
-  data.tar.gz: a0783056a1011839f7779debd94782479364f5a28294ca97c3b951c18023bc1c945bcfa0e8840a760d7712cebb92251bb2d47a957ab033b524e08291ce478ccd
+  metadata.gz: 68bfc3ff719f4fdbd300e38cded2a0379b78bad467259fd7f1b79b773d7137567ca22451f581a7c684070feaff6296c58e6c73ad4c9cdacbe793daf9019b98a6
+  data.tar.gz: c21632713ec979285748664c5076f20499bb2ac58efeda6f957c904421d21ee078bfc4a1e424c9e69ed38bf2f31dc52bf629276df4704f633e19a009e414c70d

data/lib/takelage/default.yml

@@ -79,7 +79,7 @@ docker_user: 'takelage'
 git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
-login_wait_for_sockets: '1'
+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'

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,17 +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
-
-    _docker_container_wait_for_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}\""

data/lib/takelage/version

@@ -1 +1 @@
-0.29.8
+0.29.10

metadata

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