takelage 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb34019e556b714fcd893cf3141e23a1fbf63aad8bb695e2b205cfffb657a2ee
-  data.tar.gz: a0a2b8c6b6987f52057042ef410b2a94fb5628d519aa9f3c7ede9d4831d04a0d
+  metadata.gz: be86ab05e3007ca479cf08765723c1dd3f28c229a78de2be07618a7e30278577
+  data.tar.gz: 03037ef870580fa492323163cfb1754a1059329d6cb5ed1d384bfe7a690be21e
 SHA512:
-  metadata.gz: 0ef2f83567050eaf5578f793417ca4f65de20ce9d1409bef4503793a58b0ba0b8ad9fac6e889c19f33ebb3d20617519714a93e7db92b6e06283520281690ccab
-  data.tar.gz: ba45ccafbddeeda014a74eed0fcad687ad6d2287773cadb7d0aafde9854bc381d8003aea47965196f7faf5f7b3c8205daef0c03696eb0b0328d18838093f030f
+  metadata.gz: f3dbb9cd02e027bffafc7e0d5e9060746bf1164e7a394810f0b010298db8039923bad224a01c4b625294a1618dd326d477478a3c24e3067a79edbb9474eba6c5
+  data.tar.gz: a6c473fabe3c219a3a10f1c7102b7f37bb605ec5ec30791aaef2470eee31f5004f19695f913658168ed7f7c2a6c30ce8ed17f4b8f7b560c900c20c6b7770e621

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'
@@ -52,18 +51,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'

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

@@ -4,6 +4,14 @@
 module BitClipboardLib
   private
 
+  # Run bit status.
+  def _bit_clipboard_lib_bit_status
+    log.debug 'Running bit status'
+
+    cmd_bit_status = config.active['cmd_bit_clipboard_lib_bit_status']
+    run_and_exit cmd_bit_status
+  end
+
   # Prepare workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_workspace
     unless bit_check_workspace
@@ -18,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
 
@@ -83,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
@@ -96,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/clipboard/pull.rb

@@ -14,9 +14,7 @@ module BitClipboardPull
     _bit_clipboard_pull_checkout_all
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
-
-    log.info 'Pulled bit components'
-    true
+    _bit_clipboard_lib_bit_status
   end
 
   private

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

@@ -14,9 +14,7 @@ module BitClipboardPush
     _bit_clipboard_push_export_all
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
-
-    log.info 'Pushed bit components'
-    true
+    _bit_clipboard_lib_bit_status
   end
 
   private

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

@@ -6,6 +6,7 @@ bit_root: '/bit'
 bit_ssh: ''
 cmd_bit_check_workspace_bit_list: 'bit list'
 cmd_bit_check_workspace_pwd: 'pwd'
+cmd_bit_clipboard_lib_bit_status: 'bit status'
 cmd_bit_clipboard_copy_bit_list_scope: 'bit list --skip-update --json %{scope}'
 cmd_bit_clipboard_copy_bit_list_remotes: 'bit remote --skip-update'
 cmd_bit_clipboard_copy_bit_add_dir: 'bit add --skip-update --id %{id} --main %{dir}/README.bit %{dir}'
@@ -13,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'
@@ -40,9 +41,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'
@@ -53,7 +54,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'
@@ -67,5 +68,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/container/cli.rb

@@ -16,10 +16,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/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

@@ -8,7 +8,6 @@ module DockerContainerLogin
 
     return false unless docker_check_running
 
-    _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/image/cli.rb

@@ -7,8 +7,6 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerCheckRunning
-    include DockerImageTagListRemote
-    include DockerImageTagLatestRemote
     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_running
+
+    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 DockerCheckRunning
+    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_running
+
+    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

@@ -6,12 +6,7 @@ module DockerImageUpdate
   def docker_image_update
     return false unless docker_check_running
 
-    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/host.rb

@@ -6,6 +6,17 @@ module DockerSocketHost
   def docker_socket_host
     log.debug 'Getting docker socket host ip address'
 
+    socket_host = _docker_socket_host_get_socket_host
+
+    log.debug "Docker socket host ip address is \"#{socket_host}\""
+
+    socket_host
+  end
+
+  private
+
+  # Get the socket host, i.e. the ip of the docker host.
+  def _docker_socket_host_get_socket_host
     socket_host = '127.0.0.1'
 
     addr_infos = Socket.getifaddrs
@@ -13,12 +24,10 @@ module DockerSocketHost
     # if interface docker0 exists (== linux host)
     # then return the ip address
     addr_infos.each do |addr_info|
-      if addr_info.name == 'docker0'
-        socket_host = addr_info.addr.ip_address if addr_info.addr.ipv4?
-      end
-    end
+      next unless (addr_info.name == 'docker0') && addr_info.addr.ipv4?
 
-    log.debug "Docker socket host ip address is \"#{socket_host}\""
+      socket_host = addr_info.addr.ip_address
+    end
 
     socket_host
   end

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

@@ -7,7 +7,7 @@ module Takelage
     include SystemModule
     include ConfigModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
 
     #
@@ -23,15 +23,15 @@ module Takelage
     end
 
     #
-    # git check master
+    # git check main
     #
-    desc 'master', 'Check if we are on the git master branch'
+    desc 'main', 'Check if we are on the git main branch'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if we are on the git master branch
+    Check if we are on the git main branch
     LONGDESC
-    # Check if we are on the git master branch.
-    def master
-      exit git_check_master
+    # Check if we are on the git main branch.
+    def main
+      exit git_check_main
     end
 
     #

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

@@ -0,0 +1,26 @@
+# 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).strip.split('/')[-1]
+  end
+end

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

@@ -9,7 +9,7 @@ module LoggingModule
     attr_accessor :logger
 
     def initialize
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
     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/lib/subcmd.rb

@@ -3,9 +3,11 @@
 # Thor with subcommands that work correctly with help
 class SubCommandBase < Thor
   # Set the subcommand banner.
+  # rubocop:disable Style/OptionalBooleanParameter
   def self.banner(command, _namespace = nil, _subcommand = false)
     "#{basename} #{subcommand_prefix} #{command.usage}"
   end
+  # rubocop:enable Style/OptionalBooleanParameter
 
   # Set the subcommand prefix.
   def self.subcommand_prefix

data/lib/takelage/version

@@ -1 +1 @@
-0.21.0
+0.23.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Geospin
@@ -239,19 +239,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
@@ -261,7 +253,7 @@ files:
 - lib/takelage/docker/socket/stop.rb
 - lib/takelage/git/check/clean.rb
 - lib/takelage/git/check/cli.rb
-- lib/takelage/git/check/master.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/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

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

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