takelage 0.22.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd37119ed7278082e62916cfc9c14086b719007ab746e58651647a95779ae96c
-  data.tar.gz: fe3fc46ef24bdb12a106f02c9c18c8ceddf3faa4683fa67bf805aea31aaef01a
+  metadata.gz: cf02f1f533c35aa972e1d54e901bb73d8df8bc2a5f3756cfceda0327f64e8c6f
+  data.tar.gz: 9a6f0a339620874334e281b59593744f5ba753978892655b0616db4f2648250e
 SHA512:
-  metadata.gz: 5dfaf046db1564a22555132cb6fea9974f397a86ea9a660877c2bcfc3fdccfa2f59e86a6bc0be7b42831254cdbeb7c1997b67a227488d1dd18e22a1386ed870b
-  data.tar.gz: 1598f3a2a4890118bb6a2b72e1c6a2be5e89391f6f20248ed5f0293479ce79e57c29203f4c60541acd66346353943235e575d9bac6637360f91848aa746dde30
+  metadata.gz: 84006fbef1835dc1c7f1cc6167497ff84598e6d32a56ca78f89b56566c66a55a0800fd1d94ed1372580ee1be9f088b14aed26e06927b720ad953b95134bf13a1
+  data.tar.gz: 76e6f343b509423b7602d27413d926596c78328c199faf3669555f576f567c4b822917d3cd7b5f020df57cadb8b3067955157e333502c74fe09c679e7d93e830

data/README.md

@@ -81,9 +81,10 @@ tau [docker socket scheme](features/cucumber/features/docker/docker.socket.schem
 tau [docker socket start](features/cucumber/features/docker/docker.socket.start.feature) | Start sockets for docker container
 tau [docker socket stop](features/cucumber/features/docker/docker.socket.stop.feature) | Stop sockets for docker container
 tau [git check clean](features/cucumber/features/git/git.check.clean.feature) | Check if the git workspace is clean
-tau [git check master](features/cucumber/features/git/git.check.master.feature) | Check if we are on the git master branch
+tau [git check main](features/cucumber/features/git/git.check.main.feature) | Check if we are on the git main 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
 tau [info project main](features/cucumber/features/info/info.project.main.feature) | Print main project info
 tau [info project private](features/cucumber/features/info/info.project.private.feature) | Print private project info
 tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration

data/lib/takelage.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'docker_registry2'
 require 'etc'
 require 'fileutils'
 require 'fylla'
@@ -21,7 +20,7 @@ require_relative 'takelage/lib/config'
 require_relative 'takelage/lib/project'
 
 require_relative 'takelage/git/check/clean'
-require_relative 'takelage/git/check/master'
+require_relative 'takelage/git/check/main'
 require_relative 'takelage/git/check/workspace'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'
@@ -44,7 +43,8 @@ require_relative 'takelage/bit/require/import'
 require_relative 'takelage/bit/require/cli'
 require_relative 'takelage/bit/cli'
 require_relative 'takelage/completion/cli'
-require_relative 'takelage/docker/check/running'
+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'
@@ -52,18 +52,10 @@ require_relative 'takelage/docker/socket/scheme'
 require_relative 'takelage/docker/socket/start'
 require_relative 'takelage/docker/socket/stop'
 require_relative 'takelage/docker/socket/cli'
-require_relative 'takelage/docker/image/tag/list/local'
-require_relative 'takelage/docker/image/tag/list/remote'
-require_relative 'takelage/docker/image/tag/list/cli'
-require_relative 'takelage/docker/image/tag/latest/local'
-require_relative 'takelage/docker/image/tag/latest/remote'
-require_relative 'takelage/docker/image/tag/latest/cli'
-require_relative 'takelage/docker/image/tag/check/local'
-require_relative 'takelage/docker/image/tag/check/remote'
-require_relative 'takelage/docker/image/tag/check/cli'
+require_relative 'takelage/docker/image/tag/list'
+require_relative 'takelage/docker/image/tag/latest'
+require_relative 'takelage/docker/image/tag/check'
 require_relative 'takelage/docker/image/tag/cli'
-require_relative 'takelage/docker/image/check/outdated'
-require_relative 'takelage/docker/image/check/cli'
 require_relative 'takelage/docker/image/update'
 require_relative 'takelage/docker/image/cli'
 require_relative 'takelage/docker/container/check/existing'
@@ -116,8 +108,9 @@ module Takelage
       # Initialize global singleton project
       initialize_project
 
-      # Prepare for the worst
+      # Set defaults
       @docker_daemon_running = false
+      @socat_command_available = false
 
       # fylla bash completion code
       @bash_fylla = Fylla.bash_completion self

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

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

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

@@ -71,7 +71,7 @@ module BitClipboardCopy
     bit_dev = config.active['bit_dev_user']
 
     # check if scope is a candidate for a bit.dev remote scope
-    if scope.start_with? bit_dev + '.'
+    if scope.start_with? "#{bit_dev}."
       return false unless _bit_clipboard_bit_dev_scope_exists scope
     else
       return false unless _bit_clipboard_custom_scope_exists scope

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

@@ -26,8 +26,8 @@ module BitClipboardLib
 
   # Prepare git workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_master
-      log.error 'Not on git master branch'
+    unless git_check_main
+      log.error 'Not on git main branch'
       return false
     end
 
@@ -91,12 +91,14 @@ module BitClipboardLib
     run cmd_bit_clipboard_git_commit
   end
 
-  # git push origin master.
+  # git push origin main.
   def _bit_clipboard_lib_git_push
-    log.debug 'Pushing master branch to origin'
+    log.debug 'Pushing main branch to origin'
 
-    cmd_bit_clipboard_git_push =
-      config.active['cmd_bit_clipboard_git_push']
+    cmd_bit_clipboard_git_push = format(
+      config.active['cmd_bit_clipboard_git_push'],
+      main: config.active['git_main_branch']
+    )
 
     run cmd_bit_clipboard_git_push
   end
@@ -104,8 +106,10 @@ module BitClipboardLib
   # git pull.
   def _bit_clipboard_lib_git_pull
     log.debug 'Updating git workspace'
-    cmd_bit_clipboard_git_pull =
-      config.active['cmd_bit_clipboard_git_pull']
+    cmd_bit_clipboard_git_pull = format(
+      config.active['cmd_bit_clipboard_git_pull'],
+      main: config.active['git_main_branch']
+    )
 
     return true if try cmd_bit_clipboard_git_pull
 

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

@@ -42,7 +42,7 @@ module BitClipboardPaste
 
     bit_list_scope = _bit_clipboard_paste_cid_exists_list_scope scope
 
-    return true if bit_list_scope.include? '"id": "' + cid + '",'
+    return true if bit_list_scope.include? "\"id\": \"#{cid}\","
 
     log.error "No remote component \"#{cid}\""
     false

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

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

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

@@ -71,7 +71,7 @@ module BitRequireImport
 
   # Check if there are bit components
   def _bit_require_import_check_component_valid(component, scope)
-    return true if (component.class == Hash) && component.key?('name')
+    return true if component.instance_of?(Hash) && component.key?('name')
 
     log.error "No component in #{scope}"
     false

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

@@ -28,9 +28,9 @@ module BitScopeAdd
 
     return true unless git_check_workspace
 
-    return true if git_check_master
+    return true if git_check_main
 
-    log.error 'Not on git master branch'
+    log.error 'Not on git main branch'
     false
   end
 

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

@@ -6,7 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeAdd

data/lib/takelage/default.yml

@@ -14,8 +14,8 @@ cmd_bit_clipboard_copy_bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
 cmd_bit_clipboard_copy_bit_export_to_scope: 'bit export --skip-update %{scope}'
 cmd_bit_clipboard_git_add: 'git add %{file}'
 cmd_bit_clipboard_git_commit: 'git commit --message="%{message}"'
-cmd_bit_clipboard_git_pull: 'git pull origin master'
-cmd_bit_clipboard_git_push: 'git push origin master'
+cmd_bit_clipboard_git_pull: 'git pull origin %{main}'
+cmd_bit_clipboard_git_push: 'git push origin %{main}'
 cmd_bit_clipboard_paste_bit_list_scope: 'bit list --skip-update --json %{scope}'
 cmd_bit_clipboard_paste_bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
 cmd_bit_clipboard_pull_bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'
@@ -29,7 +29,8 @@ cmd_bit_scope_add_scope: 'bit remote add %{remote}/%{scope}'
 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_running_docker_info: 'docker info'
+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'
@@ -41,9 +42,9 @@ cmd_docker_container_get_containers: 'docker ps --all --filter name=^%{docker_re
 cmd_docker_container_remove_network: 'docker network rm %{network}'
 cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
 cmd_docker_container_stop_container: 'docker stop %{container}'
-cmd_docker_image_tag_check_local_docker_images: 'docker images --quiet %{image}'
-cmd_docker_image_tag_list_local_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
-cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
+cmd_docker_image_tag_check_docker_images: 'docker images --quiet %{image}'
+cmd_docker_image_tag_list_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
+cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:latest'
 cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
 cmd_docker_socket_config_agent_socket_path: 'gpgconf --list-dirs agent-socket'
 cmd_docker_socket_config_agent_ssh_socket_path: 'gpgconf --list-dirs agent-ssh-socket'
@@ -54,7 +55,7 @@ cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 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_master_git_branch: 'git symbolic-ref HEAD'
+cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
@@ -68,5 +69,6 @@ docker_socket_gpg_agent_port: 17874
 docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'
 docker_user: 'takelage'
+git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'

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

@@ -6,18 +6,31 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckRunning
+    include DockerCheckDaemon
+    include DockerCheckSocat
 
     #
-    # docker check running
+    # docker check daemon
     #
-    desc 'running', 'Check if docker daemon is running'
+    desc 'daemon', 'Check if docker daemon is running'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Check if docker daemon is running
     LONGDESC
     # Check if docker daemon is running.
-    def running
-      exit docker_check_running
+    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/{running.rb → daemon.rb}

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # takelage docker check running
-module DockerCheckRunning
+module DockerCheckDaemon
   # Backend method for docker check running.
   # @return [Boolean] is the docker daemon running?
-  def docker_check_running
+  def docker_check_daemon
     return true if @docker_daemon_running
 
     log.debug 'Check if the docker daemon is running'
 
-    status = try config.active['cmd_docker_check_running_docker_info']
+    status = try config.active['cmd_docker_check_daemon_docker_info']
 
     unless status.exitstatus.zero?
       log.error 'The docker daemon is not running'

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

@@ -0,0 +1,23 @@
+# 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.error 'The socat command is not available'
+      return false
+    end
+
+    log.debug 'The socat command is available'
+    @socat_command_available = true
+    true
+  end
+end

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

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

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

@@ -7,7 +7,7 @@ module DockerContainerCheckExisting
   def docker_container_check_existing(container)
     log.debug "Checking if container \"#{container}\" is existing"
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     stdout_str = run _docker_container_cmd_check_existing container
 

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

@@ -7,7 +7,7 @@ module DockerContainerCheckNetwork
   def docker_container_check_network(network)
     log.debug "Checking if network \"#{network}\" is existing"
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     stdout_str = run _docker_container_cmd_check_network network
 

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

@@ -7,7 +7,7 @@ module DockerContainerCheckOrphaned
   def docker_container_check_orphaned(container)
     log.debug "Check if container \"#{container}\" is orphaned"
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     stdout_str = run _docker_container_cmd_check_orphaned container
 

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

@@ -6,7 +6,7 @@ module DockerContainerClean
   def docker_container_clean
     log.debug 'Removing all docker containers'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     return false if _docker_container_clean_harakiri?
 

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

@@ -6,7 +6,8 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckRunning
+    include DockerCheckDaemon
+    include DockerCheckSocat
     include DockerContainerCheckExisting
     include DockerContainerCheckNetwork
     include DockerContainerCheckOrphaned
@@ -16,10 +17,9 @@ module Takelage
     include DockerContainerLogin
     include DockerContainerClean
     include DockerContainerPrune
-    include DockerImageTagLatestLocal
-    include DockerImageTagListLocal
-    include DockerImageTagCheckLocal
-    include DockerImageCheckOutdated
+    include DockerImageTagLatest
+    include DockerImageTagList
+    include DockerImageTagCheck
     include DockerSocketLib
     include DockerSocketHost
     include DockerSocketScheme

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

@@ -6,7 +6,7 @@ module DockerContainerCommand
   def docker_container_command(command)
     log.debug 'Running command in container'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     docker_socket_start
     return false unless _docker_container_lib_create_net_and_ctr @hostname

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

@@ -6,7 +6,7 @@ module DockerContainerDaemon
   def docker_container_daemon
     log.debug 'Starting docker container as daemon'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     _docker_container_lib_create_net_and_ctr @hostname
   end

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

@@ -115,7 +115,7 @@ module DockerContainerLib
 
   # Check if docker image is available
   def _docker_container_lib_image_available?(image)
-    return true if docker_image_tag_list_local.include? @docker_tag
+    return true if docker_image_tag_list.include? @docker_tag
 
     log.error "No local image \"#{image}\" available"
     log.info "Try: docker pull #{image}"

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

@@ -6,9 +6,8 @@ module DockerContainerLogin
   def docker_container_login
     log.debug 'Logging in to docker container'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
-    _docker_container_login_check_outdated
     docker_socket_start
     return false unless _docker_container_lib_create_net_and_ctr @hostname
 
@@ -17,18 +16,6 @@ module DockerContainerLogin
 
   private
 
-  # Check if newer docker container is available.
-  def _docker_container_login_check_outdated
-    return if @docker_tag == 'latest'
-
-    outdated = docker_image_check_outdated @docker_tag
-    return unless outdated
-
-    tag_latest = docker_image_tag_latest_remote
-    log.warn "#{@docker_user}/#{@docker_repo}:#{@docker_tag} is outdated"
-    log.warn "#{@docker_user}/#{@docker_repo}:#{tag_latest} is available"
-  end
-
   # Prepare enter existing container command.
   def _docker_container_login_enter_container(container)
     log.debug "Entering container \"#{container}\""