takelage 0.23.0 → 0.25.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be86ab05e3007ca479cf08765723c1dd3f28c229a78de2be07618a7e30278577
-  data.tar.gz: 03037ef870580fa492323163cfb1754a1059329d6cb5ed1d384bfe7a690be21e
+  metadata.gz: f487182c0abf575811a00e8ae6e1a0c3a01a30eb684fd4c76783b1b05a63bd21
+  data.tar.gz: a72b1c9b40c4495af1a333924dd586acbda0e18f4b94d4b5d269923525eb91c8
 SHA512:
-  metadata.gz: f3dbb9cd02e027bffafc7e0d5e9060746bf1164e7a394810f0b010298db8039923bad224a01c4b625294a1618dd326d477478a3c24e3067a79edbb9474eba6c5
-  data.tar.gz: a6c473fabe3c219a3a10f1c7102b7f37bb605ec5ec30791aaef2470eee31f5004f19695f913658168ed7f7c2a6c30ce8ed17f4b8f7b560c900c20c6b7770e621
+  metadata.gz: 816965c2beac2f149a10257a62e64b9a7697ce8ab4883fabfe090bf139242484c6a8b0b244fe3f0e67856285e944699cbe8d7c0a14ec8d6da0958e4ab7b0cfe2
+  data.tar.gz: 5003ad31e12a7247eee338a6b29dd0e1d44deaec11946c4269e3b5c4e23985f1555e72635678690821e968cb2cc28823899fadfa3068dceb6575b586d8b14611

data/README.md

@@ -1,3 +1,5 @@
+![takelage image](https://github.com/geospin-takelage/takelage-cli/actions/workflows/test_project_nightly.yml/badge.svg)
+
 # takelage-cli
 
 *takelage-cli* is a command line interface 
@@ -59,22 +61,19 @@ tau [bit scope inbit](features/cucumber/features/bit/bit.scope.inbit.feature) |
 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
-tau [docker check running](features/cucumber/features/docker/docker.check.running.feature) | Check if docker daemon is running
+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
+tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) | Remove all docker containers
 tau [docker container command](features/cucumber/features/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
 tau [docker container daemon](features/cucumber/features/docker/docker.container.daemon.feature) | Run docker container in daemon mode
 tau [docker container login](features/cucumber/features/docker/docker.container.login.feature) | Log in to latest local docker container
-tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) | Remove all docker containers
 tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature) | Remove orphaned docker containers
-tau [docker image check outdated](features/cucumber/features/docker/docker.image.check.outdated.feature) | Check if a docker image is outdated
-tau [docker image tag check local](features/cucumber/features/docker/docker.image.tag.check.local.feature) [TAG] | Check if local docker image [TAG] exists
-tau [docker image tag check remote](features/cucumber/features/docker/docker.image.tag.check.remote.feature) [TAG] | Check if remote docker image [TAG] exists
-tau [docker image tag latest local](features/cucumber/features/docker/docker.image.tag.latest.local.feature) | Print latest local docker image tag
-tau [docker image tag latest remote](features/cucumber/features/docker/docker.image.tag.latest.remote.feature) | Print latest remote docker image tag
-tau [docker image tag list local](features/cucumber/features/docker/docker.image.tag.list.local.feature) | Print local docker image tags
-tau [docker image tag list remote](features/cucumber/features/docker/docker.image.tag.list.remote.feature) | Print remote docker image tags
+tau [docker image tag check](features/cucumber/features/docker/docker.image.tag.check.feature) [TAG] | Check if local docker image [TAG] exists
+tau [docker image tag latest](features/cucumber/features/docker/docker.image.tag.latest.feature) | Print latest local 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 [docker socket host](features/cucumber/features/docker/docker.socket.host.feature) | Print docker socket host ip address
 tau [docker socket scheme](features/cucumber/features/docker/docker.socket.scheme.feature) | Print docker socket scheme
@@ -93,15 +92,15 @@ tau [self config home](features/cucumber/features/self/self.config.home.feature)
 tau [self config project](features/cucumber/features/self/self.config.project.feature) | Print takelage project config file configuration
 tau [self list](features/cucumber/features/self/self.list.feature) | List all commands
 tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number
+tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
 tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature)
 tau copy [DIR] [SCOPE] | Alias for tau [bit clipboard copy](features/cucumber/features/bit/bit.clipboard.copy.feature)
 tau list | Alias for tau [self list](features/cucumber/features/self/self.list.feature)
 tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature)
-tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
 tau paste [COMPONENT] [DIR] | Alias for tau [bit clipboard paste](features/cucumber/features/bit/bit.clipboard.paste.feature)
 tau project | Alias for tau [info project active](features/cucumber/features/info/info.project.active.feature)
-tau pull | Alias for tau [bit clipboard pull](features/cucumber/features/bit/bit.clipboard.pull.feature)
 tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)
+tau pull | Alias for tau [bit clipboard pull](features/cucumber/features/bit/bit.clipboard.pull.feature)
 tau push | Alias for tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.feature)
 tau update | Alias for tau [docker image update](features/cucumber/features/docker/docker.image.update.feature)
 tau version | Alias for tau [self version](features/cucumber/features/self/self.version.feature)
@@ -125,6 +124,9 @@ or *tau config*.
 | *~/.takelage.yml* | normal | User-wide configuration file in your home directory. This is your normal custom configuration file. |
 | *takelage.yml* | highest | Project-specific configuration file next to your main Rakefile. Some projects need special configuration. |
 
+Please remember that a project directory is identified by the main
+[Rakefile](Rakefile).
+
 ### Configuration Examples
 
 - You should add the following configuration items in your *~/.takelage.yml*

data/lib/takelage.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'etc'
+require 'digest/bubblebabble'
 require 'fileutils'
 require 'fylla'
 require 'json'
@@ -43,7 +44,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'
@@ -107,8 +109,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/default.yml

@@ -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'

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.debug '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
@@ -36,7 +37,7 @@ module Takelage
       @docker_registry = config.active['docker_registry']
       @username = ENV['USER'] || 'noname'
       @workdir = Dir.getwd
-      @hostname = "#{@docker_repo}_#{File.basename(@workdir)}"
+      @hostname = _docker_container_lib_hostname
       @socket_host = docker_socket_host
       @sockets = docker_socket_scheme
     end

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

@@ -6,6 +6,14 @@
 module DockerContainerLib
   private
 
+  # Create unique docker hostname
+  def _docker_container_lib_hostname
+    relative_name = "#{@docker_repo}_#{File.basename(@workdir)}"
+    absolute_name = "#{@docker_repo}_#{@workdir}"
+    digest = Digest::SHA256.bubblebabble absolute_name
+    "#{relative_name}_#{digest[0..10]}"
+  end
+
   # Create docker container and network.
   def _docker_container_lib_create_net_and_ctr(name)
     return false if _docker_container_lib_check_matrjoschka
@@ -110,6 +118,10 @@ module DockerContainerLib
     return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
 
     log.error 'You cannot log in to takelage from within takelage'
+
+    # wait or the github workflow will fail
+    sleep 1
+
     true
   end
 

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

@@ -6,7 +6,7 @@ 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_socket_start
     return false unless _docker_container_lib_create_net_and_ctr @hostname

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

@@ -6,7 +6,7 @@ module DockerContainerPrune
   def docker_container_prune
     log.debug 'Removing orphaned docker containers'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     networks = _docker_container_prune_kill_orphaned_containers
     _docker_container_lib_remove_networks networks

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

@@ -6,7 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckRunning
+    include DockerCheckDaemon
     include DockerImageUpdate
 
     # Initialize takelage docker image

data/lib/takelage/docker/image/tag/check.rb

@@ -7,7 +7,7 @@ module DockerImageTagCheck
   def docker_image_tag_check(tag)
     log.debug "Check if docker image tag \"#{tag}\" exists"
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     if tag.to_s.strip.empty?
       log.warn 'No docker image tag specified'

data/lib/takelage/docker/image/tag/cli.rb

@@ -6,7 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckRunning
+    include DockerCheckDaemon
     include DockerImageTagList
     include DockerImageTagList
     include DockerImageTagLatest
@@ -37,7 +37,7 @@ module Takelage
     #
     # docker image tag latest
     #
-    desc 'list', 'Print latest docker image tag'
+    desc 'latest', 'Print latest docker image tag'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print latest docker image tag
     Print the tag of the docker image with the highest tag.

data/lib/takelage/docker/image/tag/latest.rb

@@ -7,11 +7,15 @@ module DockerImageTagLatest
   def docker_image_tag_latest
     log.debug 'Getting latest docker image tag'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     tags = docker_image_tag_list
 
-    tag_latest = tags[-1]
+    tag_latest = if tags.include? 'latest'
+                   'latest'
+                 else
+                   tags[-1]
+                 end
 
     log.debug "Latest docker tag: #{tag_latest}"
 

data/lib/takelage/docker/image/update.rb

@@ -4,7 +4,7 @@
 module DockerImageUpdate
   # Backend method for docker image update.
   def docker_image_update
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
     cmd_docker_pull_latest = _docker_image_update_cmd_docker_pull_latest
 

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

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

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

@@ -6,7 +6,9 @@ module DockerSocketStart
   def docker_socket_start
     log.debug 'Starting sockets for docker container'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
+
+    return false unless docker_check_socat
 
     cmds_start_socket = _docker_socket_lib_get_socket_start_commands 'start'
 

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

@@ -6,12 +6,13 @@ module DockerSocketStop
   def docker_socket_stop
     log.debug 'Stopping sockets for docker container'
 
-    return false unless docker_check_running
+    return false unless docker_check_daemon
+
+    return false unless docker_check_socat
 
     # get process list
     # assuming format: "pid command"
-    cmd_ps =
-      config.active['cmd_docker_socket_stop_docker_socket_ps']
+    cmd_ps = config.active['cmd_docker_socket_stop_docker_socket_ps']
 
     stdout_str = run cmd_ps
 

data/lib/takelage/version

@@ -1 +1 @@
-0.23.0
+0.25.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.8
 platform: ruby
 authors:
 - Geospin
@@ -226,7 +226,8 @@ files:
 - lib/takelage/completion/cli.rb
 - lib/takelage/default.yml
 - lib/takelage/docker/check/cli.rb
-- lib/takelage/docker/check/running.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
@@ -287,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: takelage devops workflow cli