takelage 0.22.0 → 0.23.2

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

@@ -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/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/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.22.0
+0.23.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.2
 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
@@ -261,7 +254,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