takelage 0.22.1 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240831f6c4308e8336a2d476a4ff3f5b728804e7e03d4e1463c9262fff7d2b56
-  data.tar.gz: 85d29bb364dbaf5758f51813a1f6388c9ad6babd417da65d30b6907283147c9f
+  metadata.gz: 24b3d161560016f990a94d7b20069137900e32f5a58956aa5707eb9aa0f60027
+  data.tar.gz: 755d43225e3eed43930e9f563701752999df2088fdf7f9210bfe1df7c57bd659
 SHA512:
-  metadata.gz: cfa4649517e1818407361da9e3a17832cb010dbcc6d79139e05e95f355838ae175f09b5959b338972b7953b1a11d8fdf04b31b21f8c7c6451026b93837cd1c55
-  data.tar.gz: ad5526d627c8cdb72d21936de73c8990782eb85f908ed405eab683bcc67b8e03dab564891636d919ab65c2cf4cce1d329efc4f28e8bd192d2ce2d60b64d15046
+  metadata.gz: 995e31c2e97743b63df181b0975c63c7cc6fffc04c3ed338cce64279c96401dead03e1188bd5308af0909e5472127cdbdecd27dd7e7323d711b5973c75da2d57
+  data.tar.gz: 53d043282900c5ea74825c911a9fa504001edd9290bc6251671a74f974ad1420f035c4055e72b01abd0f9d2869db81b3dd49a5f8a8251cd3e9d84c3c82763e39

data/README.md

@@ -84,6 +84,7 @@ tau [git check clean](features/cucumber/features/git/git.check.clean.feature) |
 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
@@ -124,6 +125,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,5 @@
 # frozen_string_literal: true
 
-require 'docker_registry2'
 require 'etc'
 require 'fileutils'
 require 'fylla'
@@ -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/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'
@@ -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'

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
@@ -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}\""

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,9 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckRunning
-    include DockerImageTagListRemote
-    include DockerImageTagLatestRemote
+    include DockerCheckDaemon
     include DockerImageUpdate
 
     # Initialize takelage docker image
@@ -21,9 +19,6 @@ module Takelage
       @docker_registry = config.active['docker_registry']
     end
 
-    desc 'check [COMMAND]', 'Check docker image'
-    subcommand 'check', DockerImageCheck
-
     desc 'tag [COMMAND]', 'Handle docker image tags'
     subcommand 'tag', DockerImageTag
 

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# takelage docker image tag check
+module DockerImageTagCheck
+  # Backend method for docker image tag check.
+  # @return [Boolean] does docker image tag exist?
+  def docker_image_tag_check(tag)
+    log.debug "Check if docker image tag \"#{tag}\" exists"
+
+    return false unless docker_check_daemon
+
+    if tag.to_s.strip.empty?
+      log.warn 'No docker image tag specified'
+      return false
+    end
+
+    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
+
+    return false unless _docker_image_check_image? image
+
+    log.debug "Found docker image \"#{image}\""
+    true
+  end
+
+  private
+
+  # Check if image exists.
+  def _docker_image_check_image?(image)
+    cmd_docker_images =
+      format(
+        config.active['cmd_docker_image_tag_check_docker_images'],
+        image: image
+      )
+
+    if (run cmd_docker_images).to_s.strip.empty?
+      log.debug "No docker image \"#{image}\" found"
+      return false
+    end
+
+    true
+  end
+end

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

@@ -3,13 +3,66 @@
 module Takelage
   # takelage docker image tag
   class DockerImageTag < SubCommandBase
-    desc 'check [COMMAND]', 'Check docker image tag'
-    subcommand 'check', DockerImageTagCheck
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+    include DockerImageTagList
+    include DockerImageTagList
+    include DockerImageTagLatest
+    include DockerImageTagCheck
 
-    desc 'latest [COMMAND]', 'Print latest local or remote docker image tag'
-    subcommand 'latest', DockerImageTagLatest
+    # Initialize takelage docker image tag check
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
 
-    desc 'list [COMMAND]', 'Print local or remote docker image tags'
-    subcommand 'list', DockerImageTagList
+      @docker_user = config.active['docker_user']
+      @docker_repo = config.active['docker_repo']
+      @docker_registry = config.active['docker_registry']
+    end
+
+    #
+    # docker image tag check
+    #
+    desc 'check [TAG]', 'Check if docker image [TAG] exists'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if docker image tag exists
+    LONGDESC
+    # Check if docker image tag exists.
+    def check(tag)
+      exit docker_image_tag_check tag
+    end
+
+    #
+    # docker image tag latest
+    #
+    desc 'list', '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.
+    LONGDESC
+    # Print latest docker image tag.
+    def latest
+      tag_latest = docker_image_tag_latest
+      exit false if tag_latest == false
+      say tag_latest
+      true
+    end
+
+    #
+    # docker image tag list
+    #
+    desc 'list', 'Print docker image tags'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print docker image tags
+    LONGDESC
+    # Print docker image tags.
+    def list
+      tag_list = docker_image_tag_list
+      exit false if tag_list == false
+      say tag_list
+      true
+    end
   end
 end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# takelage docker image tag latest
+module DockerImageTagLatest
+  # Backend method for docker image tag latest.
+  # @return [String] latest docker image tag
+  def docker_image_tag_latest
+    log.debug 'Getting latest docker image tag'
+
+    return false unless docker_check_daemon
+
+    tags = docker_image_tag_list
+
+    tag_latest = tags[-1]
+
+    log.debug "Latest docker tag: #{tag_latest}"
+
+    tag_latest
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# takelage docker image tag list
+module DockerImageTagList
+  # Backend method for docker image tag list.
+  # @return [Array] docker image tags
+  def docker_image_tag_list
+    cmd_docker_tags =
+      format(
+        config.active['cmd_docker_image_tag_list_docker_images'],
+        docker_user: @docker_user,
+        docker_repo: @docker_repo
+      )
+
+    tags = (run cmd_docker_tags).split("\n")
+
+    VersionSorter.sort(tags)
+  end
+end

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

@@ -4,14 +4,9 @@
 module DockerImageUpdate
   # Backend method for docker image update.
   def docker_image_update
-    return false unless docker_check_running
+    return false unless docker_check_daemon
 
-    tags_remote = docker_image_tag_list_remote
-
-    tag = 'latest'
-    tag = docker_image_tag_latest_remote unless tags_remote.include?('latest')
-
-    cmd_docker_pull_latest = _docker_image_update_cmd_docker_pull_latest tag
+    cmd_docker_pull_latest = _docker_image_update_cmd_docker_pull_latest
 
     cmd_docker_remove_dangling =
       config.active['cmd_docker_image_update_docker_remove_dangling']
@@ -22,12 +17,11 @@ module DockerImageUpdate
   private
 
   # Prepare dpcker pull latest command.
-  def _docker_image_update_cmd_docker_pull_latest(tag)
+  def _docker_image_update_cmd_docker_pull_latest
     format(
       config.active['cmd_docker_image_update_docker_pull_latest'],
       docker_user: @docker_user,
-      docker_repo: @docker_repo,
-      tag_latest_remote: tag
+      docker_repo: @docker_repo
     )
   end
 end

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/host.rb

@@ -24,10 +24,9 @@ module DockerSocketHost
     # if interface docker0 exists (== linux host)
     # then return the ip address
     addr_infos.each do |addr_info|
-      if (addr_info.name == 'docker0') && addr_info.addr.ipv4?
-        socket_host = addr_info.addr.ip_address
-        break
-      end
+      next unless (addr_info.name == 'docker0') && addr_info.addr.ipv4?
+
+      socket_host = addr_info.addr.ip_address
     end
 
     socket_host

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/info/project/cli.rb

@@ -52,5 +52,18 @@ module Takelage
       say project_main_yaml
       true
     end
+
+    #
+    # info project dir
+    #
+    desc 'dir', 'Print project root directory'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print project root directory
+    LONGDESC
+    # Print project root directory.
+    def dir
+      say project.dir
+      true
+    end
   end
 end

data/lib/takelage/lib/project.rb

@@ -9,12 +9,13 @@ module ProjectModule
     include SystemModule
     include ConfigModule
 
-    attr_accessor :active, :private, :main
+    attr_accessor :active, :private, :main, :dir
 
     def initialize
       @active = {}
       @private = {}
       @main = {}
+      @dir = {}
     end
   end
 
@@ -23,6 +24,8 @@ module ProjectModule
     TakelageProject.instance.main = _project_read_main
     TakelageProject.instance.private = _project_read_private
     TakelageProject.instance.active = _project_merge_active
+    TakelageProject.instance.dir =
+      TakelageProject.instance.config.active['project_root_dir']
   end
 
   # @return [Object] global singleton project
@@ -34,8 +37,8 @@ module ProjectModule
 
   # Read main YAML file.
   def _project_read_main
-    path = TakelageProject.instance.config.active['project_root_dir']
-    main_file = "#{path}/" \
+    dir = TakelageProject.instance.config.active['project_root_dir']
+    main_file = "#{dir}/" \
         "#{TakelageProject.instance.config.active['info_project_main']}"
 
     return {} unless File.exist? main_file
@@ -45,8 +48,8 @@ module ProjectModule
 
   # Read private YAML file.
   def _project_read_private
-    path = TakelageProject.instance.config.active['project_root_dir']
-    private_file = "#{path}/" \
+    dir = TakelageProject.instance.config.active['project_root_dir']
+    private_file = "#{dir}/" \
         "#{TakelageProject.instance.config.active['info_project_private']}"
 
     return {} unless File.exist? private_file

data/lib/takelage/version

@@ -1 +1 @@
-0.22.1
+0.23.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.3
 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
@@ -239,19 +240,11 @@ files:
 - lib/takelage/docker/container/lib.rb
 - lib/takelage/docker/container/login.rb
 - lib/takelage/docker/container/prune.rb
-- lib/takelage/docker/image/check/cli.rb
-- lib/takelage/docker/image/check/outdated.rb
 - lib/takelage/docker/image/cli.rb
-- lib/takelage/docker/image/tag/check/cli.rb
-- lib/takelage/docker/image/tag/check/local.rb
-- lib/takelage/docker/image/tag/check/remote.rb
+- lib/takelage/docker/image/tag/check.rb
 - lib/takelage/docker/image/tag/cli.rb
-- lib/takelage/docker/image/tag/latest/cli.rb
-- lib/takelage/docker/image/tag/latest/local.rb
-- lib/takelage/docker/image/tag/latest/remote.rb
-- lib/takelage/docker/image/tag/list/cli.rb
-- lib/takelage/docker/image/tag/list/local.rb
-- lib/takelage/docker/image/tag/list/remote.rb
+- lib/takelage/docker/image/tag/latest.rb
+- lib/takelage/docker/image/tag/list.rb
 - lib/takelage/docker/image/update.rb
 - lib/takelage/docker/socket/cli.rb
 - lib/takelage/docker/socket/host.rb

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Takelage
-  # takelage docker image check
-  class DockerImageCheck < SubCommandBase
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
-    include DockerCheckRunning
-    include DockerImageTagListRemote
-    include DockerImageTagLatestRemote
-    include DockerImageCheckOutdated
-
-    # Initialize takelage docker image check
-    def initialize(args = [], local_options = {}, configuration = {})
-      # initialize thor parent class
-      super args, local_options, configuration
-
-      @docker_user = config.active['docker_user']
-      @docker_repo = config.active['docker_repo']
-      @docker_registry = config.active['docker_registry']
-      @docker_tag = config.active['docker_tag']
-    end
-
-    #
-    # docker image check outdated
-    #
-    desc 'outdated', 'Check if a docker image is outdated'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if a docker image is outdated
-    LONGDESC
-    # Check if a docker image is outdated.
-    def outdated
-      outdated = docker_image_check_outdated @docker_tag
-      say "Your takelage version \"#{@docker_tag}\" is outdated" if outdated
-      exit outdated
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image check outdated
-module DockerImageCheckOutdated
-  # Backend method for docker image check outdated.
-  # @return [Boolean] is docker image tag older than latest remote image tag?
-  def docker_image_check_outdated(tag)
-    log.debug "Check if docker image version \"#{tag}\" is outdated"
-
-    return false unless docker_check_running
-
-    return false if _docker_outdated_tag_latest? tag
-
-    tag_latest_remote = docker_image_tag_latest_remote
-    tags = [tag, docker_image_tag_latest_remote]
-    # rubocop:disable Style/RedundantSort
-    outdated = (tag != VersionSorter.sort(tags).last)
-    # rubocop:enable Style/RedundantSort
-
-    _docker_outdated_log_info tag, tag_latest_remote if outdated
-
-    outdated
-  end
-
-  private
-
-  # Check if the tag is "latest".
-  def _docker_outdated_tag_latest?(tag)
-    return false unless tag == 'latest'
-
-    log.debug 'Docker image version "latest" is by definition never outdated'
-    true
-  end
-
-  # Log info if docker image is outdated.
-  def _docker_outdated_log_info(tag, tag_latest_remote)
-    log.debug "Docker image version is outdated: #{tag}"
-    log.debug "Docker image version is available: #{tag_latest_remote}"
-  end
-end

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

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Takelage
-  # takelage docker image tag check
-  class DockerImageTagCheck < SubCommandBase
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
-    include DockerCheckRunning
-    include DockerImageTagListRemote
-    include DockerImageTagCheckLocal
-    include DockerImageTagCheckRemote
-
-    # Initialize takelage docker image tag check
-    def initialize(args = [], local_options = {}, configuration = {})
-      # initialize thor parent class
-      super args, local_options, configuration
-
-      @docker_user = config.active['docker_user']
-      @docker_repo = config.active['docker_repo']
-      @docker_registry = config.active['docker_registry']
-    end
-
-    #
-    # docker image tag check local
-    #
-    desc 'local [TAG]', 'Check if local docker image [TAG] exists'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if local docker image tag exists
-    LONGDESC
-    # Check if local docker image tag exists.
-    def local(tag)
-      exit docker_image_tag_check_local tag
-    end
-
-    #
-    # docker image tag check remote
-    #
-    desc 'remote [TAG]', 'Check if remote docker image [TAG] exists'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if remote docker image tag exists
-    LONGDESC
-    # Check if remote docker image tag exists.
-    def remote(tag)
-      exit docker_image_tag_check_remote tag
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag check local
-module DockerImageTagCheckLocal
-  # Backend method for docker image check tag local.
-  # @return [Boolean] does local docker image tag exist?
-  def docker_image_tag_check_local(tag)
-    log.debug "Check if local docker image tag \"#{tag}\" exists"
-
-    return false unless docker_check_running
-
-    if tag.to_s.strip.empty?
-      log.warn 'No local docker image tag specified'
-      return false
-    end
-
-    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
-
-    return false unless _docker_image_check_local_image? image
-
-    log.debug "Found local docker image \"#{image}\""
-    true
-  end
-
-  private
-
-  # Check if local image exists.
-  def _docker_image_check_local_image?(image)
-    cmd_docker_images =
-      format(
-        config.active['cmd_docker_image_tag_check_local_docker_images'],
-        image: image
-      )
-
-    if (run cmd_docker_images).to_s.strip.empty?
-      log.debug "No local docker image \"#{image}\" found"
-      return false
-    end
-
-    true
-  end
-end

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

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag check remote
-module DockerImageTagCheckRemote
-  # Backend method for docker image check tag remote.
-  # @return [Boolean] does remote docker image tag exist?
-  def docker_image_tag_check_remote(tag)
-    log.debug "Check if remote image tag \"#{tag}\" exists"
-
-    return false unless docker_check_running
-
-    if tag.to_s.strip.empty?
-      log.warn 'No remote docker image tag specified'
-      return false
-    end
-
-    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
-
-    return false unless _docker_iamge_check_remote_image? image, tag
-
-    log.debug "Found remote docker image \"#{image}\""
-    true
-  end
-
-  private
-
-  # Check if remote image exists.
-  def _docker_iamge_check_remote_image?(image, tag)
-    tags = docker_image_tag_list_remote
-
-    unless tags != false && tags.include?(tag)
-      log.debug "No remote docker image \"#{image}\" found"
-      return false
-    end
-
-    true
-  end
-end

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

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Takelage
-  # takelage docker image tag latest
-  class DockerImageTagLatest < SubCommandBase
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
-    include DockerCheckRunning
-    include DockerImageTagListLocal
-    include DockerImageTagListRemote
-    include DockerImageTagLatestLocal
-    include DockerImageTagLatestRemote
-
-    # Initialize takelage docker image tag latest
-    def initialize(args = [], local_options = {}, configuration = {})
-      # initialize thor parent class
-      super args, local_options, configuration
-
-      @docker_user = config.active['docker_user']
-      @docker_repo = config.active['docker_repo']
-      @docker_registry = config.active['docker_registry']
-    end
-
-    #
-    # docker image tag latest local
-    #
-    desc 'local', 'Print latest local docker image tag'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print latest local docker image tag
-    Print the tag of the local docker image with the highest tag.
-    LONGDESC
-    # Print latest local docker image tag.
-    def local
-      tag_latest_local = docker_image_tag_latest_local
-      exit false if tag_latest_local == false
-      say tag_latest_local
-      true
-    end
-
-    #
-    # docker image tag latest remote
-    #
-    desc 'remote', 'Print latest remote docker image tag'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print latest remote docker image tag
-    Print the tag of the remote docker image with the highest tag.
-    LONGDESC
-    # Print latest remote docker image tag.
-    def remote
-      tag_latest_remote = docker_image_tag_latest_remote
-      exit false if tag_latest_remote == false
-      say tag_latest_remote
-      true
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag latest local
-module DockerImageTagLatestLocal
-  # Backend method for docker image tag latest local.
-  # @return [String] latest local docker image tag
-  def docker_image_tag_latest_local
-    log.debug 'Getting latest local docker image tag'
-
-    return false unless docker_check_running
-
-    tags = docker_image_tag_list_local
-
-    tag_latest_local = tags[-1]
-
-    log.debug "Latest docker local tag: #{tag_latest_local}"
-
-    tag_latest_local
-  end
-end

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag latest remote
-module DockerImageTagLatestRemote
-  # Backend method for docker image tag latest remote.
-  # @return [String] latest remote docker image tag
-  def docker_image_tag_latest_remote
-    log.debug 'Getting latest remote docker image tag'
-
-    return false unless docker_check_running
-
-    tags = docker_image_tag_list_remote
-
-    if tags == false || tags.nil?
-      log.warn 'No latest docker remote tag'
-      return ''
-    end
-
-    tag_latest_remote = tags[-1]
-
-    log.debug "Latest docker remote tag: #{tag_latest_remote}"
-
-    tag_latest_remote
-  end
-end

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

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Takelage
-  # takelage docker image tag list
-  class DockerImageTagList < SubCommandBase
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
-    include DockerCheckRunning
-    include DockerImageTagListLocal
-    include DockerImageTagListRemote
-
-    # Initialize takelage docker image tag list
-    def initialize(args = [], local_options = {}, configuration = {})
-      # initialize thor parent class
-      super args, local_options, configuration
-
-      @docker_user = config.active['docker_user']
-      @docker_repo = config.active['docker_repo']
-      @docker_registry = config.active['docker_registry']
-    end
-
-    #
-    # docker image tag list local
-    #
-    desc 'local', 'Print local docker image tags'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print local docker image tags
-    LONGDESC
-    # Print local docker image tags.
-    def local
-      tag_list_local = docker_image_tag_list_local
-      exit false if tag_list_local == false
-      say tag_list_local
-      true
-    end
-
-    #
-    # docker image tag list remote
-    #
-    desc 'remote', 'Print remote docker image tags'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Print remote docker image tags
-    LONGDESC
-    # Print latest remote docker image tag.
-    def remote
-      tag_list_remote = docker_image_tag_list_remote
-      exit false if tag_list_remote == false
-      say tag_list_remote
-      true
-    end
-  end
-end

data/lib/takelage/docker/image/tag/list/local.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag list local
-module DockerImageTagListLocal
-  # Backend method for docker image tag list local.
-  # @return [Array] local docker image tags
-  def docker_image_tag_list_local
-    cmd_docker_tags =
-      format(
-        config.active['cmd_docker_image_tag_list_local_docker_images'],
-        docker_user: @docker_user,
-        docker_repo: @docker_repo
-      )
-
-    tags = (run cmd_docker_tags).split("\n")
-
-    VersionSorter.sort(tags)
-  end
-end

data/lib/takelage/docker/image/tag/list/remote.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-# takelage docker image tag list remote
-module DockerImageTagListRemote
-  # Backend method for docker image tag list remote.
-  # @return [Array] remote docker image tags
-  def docker_image_tag_list_remote
-    log.debug 'Getting docker remote tags ' \
-      "of \"#{@docker_user}/#{@docker_repo}\" " \
-      "from \"#{@docker_registry}\""
-    _docker_image_tag_list_remote_tags
-  end
-
-  private
-
-  # Get docker remote tags.
-  def _docker_image_tag_list_remote_tags
-    user = File.basename @docker_user
-    begin
-      registry = DockerRegistry2.connect(@docker_registry)
-      tags = registry.tags("#{user}/#{@docker_repo}")
-      VersionSorter.sort(tags['tags'])
-    rescue RestClient::Exceptions::OpenTimeout
-      log.error "Timeout while connecting to \"#{@docker_registry}\""
-      false
-    end
-  end
-end