takelage 0.29.8 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8837b042456b6e1babf826a7b04a1a3156c77c0bae985987c4653d1edf844bb
-  data.tar.gz: cd60992104d7730dd7688189142ef2567aa86ddcebf59aec2370e2adc0782154
+  metadata.gz: 2df3a519d6d5690b6dd1c9758d720bfff1ebd6afc8a3c116db5651bb223b0266
+  data.tar.gz: d924838d82f60a4d1bab01e151896f0875552726b8a9d8bdb0a6a672f12def91
 SHA512:
-  metadata.gz: fb2c0d378aeb648f070c29d28697f8345e38f1fa3e973b1694d121eb2a28ffde56f7441c7d3110bd27eabc8c9bf6a11e636428ae37d266eb6eb874e1792543ae
-  data.tar.gz: a0783056a1011839f7779debd94782479364f5a28294ca97c3b951c18023bc1c945bcfa0e8840a760d7712cebb92251bb2d47a957ab033b524e08291ce478ccd
+  metadata.gz: 8cceb1a7e8200a7217b4bb5b068d8c51b40e7c425921c7150c346964a1d31fbe103dcc1b2f9b90870f3388f5fbe1bb62e3a54f664d564f33b083916288920784
+  data.tar.gz: 40fd4ac0c4782ae56a26a76c3fbe3503252147b78e1ca66cd8ccde97f3e909acd6f084ba177ac31de6d61dc01632f828a448c91d8abb56e59b0cfc31bc3b8863

data/README.md

@@ -26,7 +26,6 @@ command line script using the
 | *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/bitboard/latest?label=hub.docker.com&sort=semver&color=blue)](https://hub.docker.com/r/takelage/bitboard) | 
 | *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelslim/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelslim) | 
 | *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelbase/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelbase) | 
-| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/multipostgres/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/multipostgres) | 
 
 ## Framework Status
 
@@ -38,7 +37,6 @@ command line script using the
 | *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build%20and%20test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_project_nightly.yml) | [![test roles](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Test%20roles?label=test%20roles)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_roles_nightly.yml) |
 | *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelslim/Build%20and%20deploy%20takelslim?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelslim/actions/workflows/build_deploy_takelslim_nightly.yml) |
 | *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelbase/Build%20and%20deploy%20takelbase?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelbase/actions/workflows/build_deploy_takelbase_nightly.yml) |
-| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-multipostgres/Build%20and%20deploy%20multipostgres?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-multipostgres/actions/workflows/build_deploy_multipostgres_nightly.yml) |
 
 ## Installation
 
@@ -73,7 +71,7 @@ tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.featu
 tau [bit require export](features/cucumber/features/bit/bit.require.export.feature) | Show requirements file of bit components
 tau [bit require import](features/cucumber/features/bit/bit.require.import.feature) | Import bit components from requirements file
 tau [bit scope add](features/cucumber/features/bit/bit.scope.add.feature) [SCOPE] | Add a bit [SCOPE]
-tau [bit scope inbit](features/cucumber/features/bit/bit.scope.inbit.feature) | Log in to bit remote server
+tau [bit scope ssh](features/cucumber/features/bit/bit.scope.ssh.feature) | Log in to bit remote server
 tau [bit scope list](features/cucumber/features/bit/bit.scope.list.feature) | List bit remote scopes
 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
@@ -91,7 +89,7 @@ tau [docker image tag latest](features/cucumber/features/docker/docker.image.tag
 tau [docker image tag list](features/cucumber/features/docker/docker.image.tag.list.feature) | Print local docker image tags
 tau [docker image update](features/cucumber/features/docker/docker.image.update.feature) | Get latest remote docker container
 tau [git check clean](features/cucumber/features/git/git.check.clean.feature) | Check if the git workspace is clean
-tau [git check main](features/cucumber/features/git/git.check.main.feature) | Check if we are on the git main branch
+tau [git check bit](features/cucumber/features/git/git.check.bit.feature) | Check if we are on the git bit branch
 tau [git check workspace](features/cucumber/features/git/git.check.workspace.feature) | Check if a git workspace exists
 tau [info project active](features/cucumber/features/info/info.project.active.feature) | Print active project info
 tau [info project dir](features/cucumber/features/info/info.project.dir.feature) | Print project root directory
@@ -108,7 +106,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.rb

@@ -21,14 +21,14 @@ require_relative 'takelage/lib/config'
 require_relative 'takelage/lib/project'
 
 require_relative 'takelage/git/check/clean'
-require_relative 'takelage/git/check/main'
+require_relative 'takelage/git/check/bit'
 require_relative 'takelage/git/check/workspace'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'
 require_relative 'takelage/bit/check/workspace'
 require_relative 'takelage/bit/check/cli'
 require_relative 'takelage/bit/scope/add'
-require_relative 'takelage/bit/scope/inbit'
+require_relative 'takelage/bit/scope/ssh'
 require_relative 'takelage/bit/scope/list'
 require_relative 'takelage/bit/scope/new'
 require_relative 'takelage/bit/scope/cli'

data/lib/takelage/bit/clipboard/cli.rb

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitClipboardLib

data/lib/takelage/bit/clipboard/lib.rb

@@ -26,7 +26,7 @@ module BitClipboardLib
 
   # Prepare git workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_main
+    unless git_check_bit
       log.error 'Not on git main branch'
       return false
     end
@@ -97,7 +97,7 @@ module BitClipboardLib
 
     cmd_bit_clipboard_git_push = format(
       config.active['cmd_bit_clipboard_git_push'],
-      main: config.active['git_main_branch']
+      main: config.active['git_bit_branch']
     )
 
     run cmd_bit_clipboard_git_push
@@ -108,7 +108,7 @@ module BitClipboardLib
     log.debug 'Updating git workspace'
     cmd_bit_clipboard_git_pull = format(
       config.active['cmd_bit_clipboard_git_pull'],
-      main: config.active['git_main_branch']
+      main: config.active['git_bit_branch']
     )
 
     return true if try cmd_bit_clipboard_git_pull

data/lib/takelage/bit/require/cli.rb

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeList

data/lib/takelage/bit/scope/add.rb

@@ -28,7 +28,7 @@ module BitScopeAdd
 
     return true unless git_check_workspace
 
-    return true if git_check_main
+    return true if git_check_bit
 
     log.error 'Not on git main branch'
     false

data/lib/takelage/bit/scope/cli.rb

@@ -6,11 +6,11 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeAdd
-    include BitScopeInbit
+    include BitScopeSSH
     include BitScopeList
     include BitScopeNew
 
@@ -60,15 +60,15 @@ module Takelage
     end
 
     #
-    # bit scope inbit
+    # bit scope ssh
     #
-    desc 'inbit', 'Log in to bit remote server'
+    desc 'ssh', 'Log in to bit remote server'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Log in to bit remote server
     LONGDESC
     # Log in to bit remote server.
-    def inbit
-      exit bit_scope_inbit
+    def ssh
+      exit bit_scope_ssh
     end
   end
 end

data/lib/takelage/bit/scope/{inbit.rb → ssh.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# takelage bit scope inbit
-module BitScopeInbit
-  # Backend method for bit scope inbit.
-  def bit_scope_inbit
+# takelage bit scope ssh
+module BitScopeSSH
+  # Backend method for bit scope ssh.
+  def bit_scope_ssh
     log.debug 'Logging in to bit remote server'
 
     return false unless configured? %w[bit_ssh]

data/lib/takelage/default.yml

@@ -48,7 +48,7 @@ cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
-cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
+cmd_git_check_bit_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
@@ -76,11 +76,11 @@ docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/defau
 docker_shm_size: '512M'
 docker_tag: 'latest'
 docker_user: 'takelage'
-git_main_branch: 'main'
+git_bit_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'
-mutagen_socket_takelage_label: 'type=takelage-socket'
+mutagen_socket_takelage_label: 'type=takelage'

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/git/check/bit.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# takelage git check bit
+module GitCheckBit
+  # Backend method for git check bit.
+  # @return [Boolean] are we on the git bit branch?
+  def git_check_bit
+    log.debug 'Check if we are on the git bit branch'
+
+    return false unless git_check_workspace
+
+    branch = _git_check_bit_get_branch
+    log.debug "We are on git branch \"#{branch}\""
+
+    branch == config.active['git_bit_branch']
+  end
+
+  private
+
+  # Get git branch.
+  def _git_check_bit_get_branch
+    cmd_get_branch =
+      config.active['cmd_git_check_bit_get_git_branch']
+    (run cmd_get_branch).chomp.split('/')[-1]
+  end
+end

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

@@ -7,31 +7,31 @@ module Takelage
     include SystemModule
     include ConfigModule
     include GitCheckClean
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
 
     #
-    # git check clean
+    # git check bit
     #
-    desc 'clean', 'Check if the git workspace is clean'
+    desc 'bit', 'Check if we are on the git bit branch'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if the git workspace is clean
+    Check if we are on the git bit branch
     LONGDESC
-    # Check if the git workspace is clean.
-    def clean
-      exit git_check_clean
+    # Check if we are on the git bit branch.
+    def bit
+      exit git_check_bit
     end
 
     #
-    # git check main
+    # git check clean
     #
-    desc 'main', 'Check if we are on the git main branch'
+    desc 'clean', 'Check if the git workspace is clean'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if we are on the git main branch
+    Check if the git workspace is clean
     LONGDESC
-    # Check if we are on the git main branch.
-    def main
-      exit git_check_main
+    # Check if the git workspace is clean.
+    def clean
+      exit git_check_clean
     end
 
     #

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

@@ -79,11 +79,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/version

@@ -1 +1 @@
-0.29.8
+0.30.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.29.8
+  version: 0.30.0
 platform: ruby
 authors:
 - Geospin
@@ -220,9 +220,9 @@ files:
 - lib/takelage/bit/require/lib.rb
 - lib/takelage/bit/scope/add.rb
 - lib/takelage/bit/scope/cli.rb
-- lib/takelage/bit/scope/inbit.rb
 - lib/takelage/bit/scope/list.rb
 - lib/takelage/bit/scope/new.rb
+- lib/takelage/bit/scope/ssh.rb
 - lib/takelage/completion/cli.rb
 - lib/takelage/default.yml
 - lib/takelage/docker/check/cli.rb
@@ -245,9 +245,9 @@ files:
 - lib/takelage/docker/image/tag/latest.rb
 - lib/takelage/docker/image/tag/list.rb
 - lib/takelage/docker/image/update.rb
+- lib/takelage/git/check/bit.rb
 - lib/takelage/git/check/clean.rb
 - lib/takelage/git/check/cli.rb
-- lib/takelage/git/check/main.rb
 - lib/takelage/git/check/workspace.rb
 - lib/takelage/git/cli.rb
 - lib/takelage/info/cli.rb

data/lib/takelage/git/check/main.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# takelage git check main
-module GitCheckMain
-  # Backend method for git check main.
-  # @return [Boolean] are we on the git main branch?
-  def git_check_main
-    log.debug 'Check if we are on the git main branch'
-
-    return false unless git_check_workspace
-
-    branch = _git_check_main_get_branch
-    log.debug "We are on git branch \"#{branch}\""
-
-    branch == config.active['git_main_branch']
-  end
-
-  private
-
-  # Get git branch.
-  def _git_check_main_get_branch
-    cmd_get_branch =
-      config.active['cmd_git_check_main_git_branch']
-    (run cmd_get_branch).chomp.split('/')[-1]
-  end
-end