takelage 0.23.1 → 0.25.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d346e40e1123b0d3ab5c6934f2ff4f269348ed6ef96536c7c32bb6a41d41ae0
-  data.tar.gz: 52c40ad168244e782e68c3f177e6fedb2d570c4e665a74af0cbbe52eb4a28f8e
+  metadata.gz: 6e946f65c7d82b399bff9b24ad38f5f35692b1984fb3b24a746b9a79d949ff68
+  data.tar.gz: 22ca88e0d4c57564caafe1fbabd6fb2ec18fe85da30b78edec4286d0f807555f
 SHA512:
-  metadata.gz: 95dad34c1553f33d38c7d3d9b2c2bf3c34a6d77739283ea601c1aa317c303dcd4d0d6399068486d783034ef2f9c5f1163b6c214d183acd7921b33c185fd0e853
-  data.tar.gz: e619aee9600ad197991ff80de7adc41fa7ceb0fdcebf1770800ee7b6decb2325e75209d21beec9b8f98b55f7d7e3722d3616660f64794419d2dba791f54099f7
+  metadata.gz: 321defb1e6c775e1fdf69d85fba71f2265602be4db53705b204b4e10096d73c517762e71e910af09cf717bb112f736c1705802ccdfc44a1289ab9e5183f2fbe2
+  data.tar.gz: 58ab87995c99d0ff2059b9d7def178b3489276e18787c8744c66d43c2bc4d82f80ba959f19e31b3a3084e14c04d99515324ba69ec5b743fc267eb6bb091a8a65

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'

data/lib/takelage/default.yml

@@ -30,7 +30,7 @@ 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_daemon_docker_info: 'docker info'
-cmd_docker_check_socat_socat_version: 'socat -V'
+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/socat.rb

@@ -9,10 +9,10 @@ module DockerCheckSocat
 
     log.debug 'Check if the socat command is available'
 
-    status = try config.active['cmd_docker_check_socat_socat_version']
+    status = try config.active['cmd_docker_check_socat_which_socat']
 
     unless status.exitstatus.zero?
-      log.error 'The socat command is not available'
+      log.debug 'The socat command is not available'
       return false
     end
 

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

@@ -37,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/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/image/tag/cli.rb

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

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

@@ -1 +1 @@
-0.23.1
+0.25.10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.25.10
 platform: ruby
 authors:
 - Geospin
@@ -288,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