takelage 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9962805477b6efa0976aa88ee6168f638f42bb47457eb6d4a541c8228a484bf6
-  data.tar.gz: c9cb238ca757eb45b379e245ee76281cba5070594fce8d5c994760a7af2b98fb
+  metadata.gz: e94a030afd607b722c46cdb7672eab62d2164b979a667f81adbacf5cfc62fe41
+  data.tar.gz: 0a69ac6c28f9212278be3801153eef5e7b15ed746936f02b16bb1d346df2a1d8
 SHA512:
-  metadata.gz: c6a2d5152cd63931a85c68a71601adc35a2a70f5f770497864e395deb9c63bbf24122ab329f55275d891e086df39dadb07192a1869c4ca17ec5f0b937440d83b
-  data.tar.gz: ac21c2529a2a1edf411557a55802ec759f06778d02214c48d2bbe1fe08abfccb17d2219ea1b45bed8055c33e441c45d7b5230454ff2e7fee4a8d893cc4adf5a8
+  metadata.gz: 36a7abc07a493f918c12355bad5b84fea6488993e32cf78d5e8bb1b0d530beb12825d4cba651e03b9a84e2285f40ebd9667eb9c7e66a0fb990785e26da3754cd
+  data.tar.gz: dadcb5a7aaf475e143477bca61af6edccbc2e029aefd91c46c100b5bc9d5f369eb4fb881aab02ac73e136dbb503e4225b5b6fa72608705f3c3b3c5adcf10e8f9

data/lib/takelage/bit/check/module.rb

@@ -7,10 +7,10 @@ module BitCheckModule
     log.debug 'Check if this is a bit workspace'
 
     cmd_bit_repo = config.active['bit_repo']
-    stdout_str_repo, stderr_str_repo, status_repo = run_and_check cmd_bit_repo
+    status_repo = try cmd_bit_repo
 
     cmd_pwd = config.active['pwd']
-    stdout_str_dir, stderr_str_dir, status_dir = run_and_check cmd_pwd
+    stdout_str_dir = run cmd_pwd
 
     dir = stdout_str_dir.strip
 

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

@@ -31,7 +31,7 @@ module BitClipboardModule
 
         # check if bit.dev remote scope exists
         cmd_bit_list_scope = config.active['bit_list_scope'] % {scope: scope}
-        stdout_str, stderr_str, status = run_and_check cmd_bit_list_scope
+        status = try cmd_bit_list_scope
 
         unless status.exitstatus.zero?
           log.error "No bit.dev remote scope \"#{scope}\" found"
@@ -42,7 +42,7 @@ module BitClipboardModule
 
         # check if bit remote scope is added to local workspace
         cmd_bit_list_remotes = config.active['bit_list_remotes']
-        stdout_str, stderr_str, status = run_and_check cmd_bit_list_remotes
+        stdout_str = run cmd_bit_list_remotes
 
         unless /.*\s+#{scope}\s+.*/m.match? stdout_str
           log.error "No bit remote scope \"#{scope}\" found in local bit workspace"
@@ -113,7 +113,7 @@ module BitClipboardModule
 
     _remove_bit_artifacts
 
-    log.info "Pasted bit component \"#{cid}\"" +
+    log.info "Pasted bit component \"#{cid}\" " +
                  "to directory \"#{dir}\""
   end
 

data/lib/takelage/bit/scope/module.rb

@@ -48,7 +48,7 @@ module BitScopeModule
     cmd_bit_scope_list = config.active['bit_scope_list'] % {root: root}
 
     # run ssh command with scope list command
-    scope_list, stderr, status = run_and_check "#{cmd_bit_ssh} '#{cmd_bit_scope_list}'"
+    scope_list = run "#{cmd_bit_ssh} '#{cmd_bit_scope_list}'"
 
     # remove bit remote root directory from results
     scope_list.gsub!(/#{root}\/*/, '')

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

@@ -0,0 +1,23 @@
+module Takelage
+
+  # takelage docker check
+  class DockerCheck < SubCommandBase
+
+    include LoggingModule
+    include SystemModule
+    include DockerCheckModule
+
+    #
+    # docker check running
+    #
+    desc 'running [TAG]', '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
+    end
+
+  end
+end

data/lib/takelage/docker/check/module.rb

@@ -0,0 +1,21 @@
+# takelage docker check module
+module DockerCheckModule
+
+  # Backend method for docker check running.
+  # @return [Boolean] is the docker daemon running?
+  def docker_check_running
+    log.debug "Check if the docker daemon is running"
+
+    cmd_docker_info = 'docker info'
+
+    status = try cmd_docker_info
+
+    unless status.exitstatus.zero?
+      log.error "The docker daemon is not running"
+      return false
+    end
+
+    log.debug "The docker daemon is running"
+    true
+  end
+end

data/lib/takelage/docker/cli.rb

@@ -3,6 +3,9 @@ module Takelage
   # takelage docker
   class Docker < SubCommandBase
 
+    desc 'check [COMMAND]', 'Check docker'
+    subcommand 'check', DockerCheck
+
     desc 'container [COMMAND]', 'Handle docker container'
     subcommand 'container', DockerContainer
 

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerContainerCheckModule
 
     #

data/lib/takelage/docker/container/check/module.rb

@@ -6,11 +6,13 @@ module DockerContainerCheckModule
   def docker_container_check_existing(container)
     log.debug "Checking if container \"#{container}\" is existing"
 
+    exit false unless docker_check_running
+
     cmd_docker_existing = 'docker ps ' +
         "--filter name=^#{container}$ " +
         '--quiet'
 
-    stdout_str, stderr_str, status = run_and_check cmd_docker_existing
+    stdout_str = run cmd_docker_existing
 
     if stdout_str.to_s.strip.empty?
       log.debug "Container \"#{container}\" is not existing"
@@ -26,11 +28,13 @@ module DockerContainerCheckModule
   def docker_container_check_network(network)
     log.debug "Checking if network \"#{network}\" is existing"
 
+    exit false unless docker_check_running
+
     cmd_docker_network = 'docker network ls ' +
         '--quiet ' +
         "--filter name=^#{network}$"
 
-    stdout_str, stderr_str, status = run_and_check cmd_docker_network
+    stdout_str = run cmd_docker_network
 
     if stdout_str.to_s.strip.empty?
       log.debug "Network \"#{network}\" is not existing"
@@ -46,12 +50,14 @@ module DockerContainerCheckModule
   def docker_container_check_orphaned(container)
     log.debug "Check if container \"#{container}\" is orphaned"
 
+    exit false unless docker_check_running
+
     cmd_docker_orphaned = 'docker exec ' +
         '--interactive ' +
         "#{container} " +
         'ps a'
 
-    stdout_str, stderr_str, status = run_and_check cmd_docker_orphaned
+    stdout_str = run cmd_docker_orphaned
 
     if stdout_str.include? '/loginpoint.py'
       log.debug "Container \"#{container}\" isn't orphaned"

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerContainerCheckModule
     include DockerContainerModule
     include DockerImageTagLatestModule

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

@@ -5,6 +5,8 @@ module DockerContainerModule
   def docker_container_command(command)
     log.debug "Running command in container"
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_repo docker_image docker_tag)
 
     docker_socket_start
@@ -18,6 +20,8 @@ module DockerContainerModule
   def docker_container_daemon
     log.debug 'Starting docker container as daemon'
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_repo docker_image docker_tag)
 
     _create_network @hostname unless docker_container_check_network @hostname
@@ -28,6 +32,8 @@ module DockerContainerModule
   def docker_container_login
     log.debug 'Logging in to docker container'
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_repo docker_image docker_tag)
 
     docker_socket_start
@@ -41,6 +47,8 @@ module DockerContainerModule
   def docker_container_nuke
     log.debug 'Removing all docker containers'
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_image)
 
     networks = []
@@ -60,6 +68,8 @@ module DockerContainerModule
   def docker_container_purge
     log.debug 'Removing orphaned docker containers'
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_image)
 
     networks = []
@@ -169,7 +179,7 @@ module DockerContainerModule
         "--filter id=#{container} " +
         '--format "{{.Names}}"'
 
-    stdout_str, stderr_str, status = run_and_check cmd_get_container_name_by_id
+    stdout_str = run cmd_get_container_name_by_id
 
     name = stdout_str.chomp
 
@@ -188,7 +198,7 @@ module DockerContainerModule
         "--filter name=^#{@docker_image}_ " +
         '--quiet'
 
-    stdout_str, stderr_str, status = run_and_check cmd_docker_get
+    stdout_str = run cmd_docker_get
 
     # convert stdout lines to array and return array
     stdout_str.split(/\n+/)

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerImageTagListModule
     include DockerImageTagLatestModule
     include DockerImageModule

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

@@ -3,14 +3,9 @@ module DockerImageModule
 
   # Backend method for docker image update.
   def docker_image_update
-    exit false unless configured? %w(docker_repo docker_image docker_tagsurl)
-
-    tag_latest_local = docker_image_tag_latest_local
+    exit false unless docker_check_running
 
-    if tag_latest_local.to_s.strip.empty?
-      log.error "Unable to get latest local tag"
-      exit false
-    end
+    exit false unless configured? %w(docker_repo docker_image docker_tagsurl)
 
     tag_latest_remote = docker_image_tag_latest_remote
 
@@ -19,9 +14,13 @@ module DockerImageModule
       exit false
     end
 
-    if Gem::Version.new(tag_latest_local) >= Gem::Version.new(tag_latest_remote)
-      log.info 'Already up to date.'
-      exit
+    tag_latest_local = docker_image_tag_latest_local
+
+    unless tag_latest_local.to_s.strip.empty?
+      if Gem::Version.new(tag_latest_local) >= Gem::Version.new(tag_latest_remote)
+        log.info 'Already up to date.'
+        exit
+      end
     end
 
     cmd_docker_pull_latest = "docker pull #{@docker_repo}/#{@docker_image}:#{tag_latest_remote}"

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerImageTagListModule
     include DockerImageTagCheckModule
 

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

@@ -6,6 +6,8 @@ module DockerImageTagCheckModule
   def docker_image_tag_check_local(tag)
     log.debug "Check if local docker image tag \"#{tag}\" exists"
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_repo docker_image)
 
     if tag.to_s.strip.empty?
@@ -18,7 +20,7 @@ module DockerImageTagCheckModule
     cmd_docker_images = 'docker images --quiet ' +
         image
 
-    stdout_str, stderr_str, status = run_and_check cmd_docker_images
+    stdout_str = run cmd_docker_images
 
     if stdout_str.to_s.strip.empty?
       log.debug "No local docker image \"#{image}\" found"
@@ -34,6 +36,8 @@ module DockerImageTagCheckModule
   def docker_image_tag_check_remote(tag)
     log.debug "Check if remote image tag \"#{tag}\" exists"
 
+    exit false unless docker_check_running
+
     exit false unless configured? %w(docker_repo docker_image docker_tagsurl)
 
     if tag .to_s.strip.empty?

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerImageTagListModule
     include DockerImageTagLatestModule
 

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

@@ -6,6 +6,8 @@ module DockerImageTagLatestModule
   def docker_image_tag_latest_local
     log.debug "Getting latest local docker image tag"
 
+    exit false unless docker_check_running
+
     tags = docker_image_tag_list_local
 
     tag_latest_local = tags[-1]
@@ -20,8 +22,15 @@ module DockerImageTagLatestModule
   def docker_image_tag_latest_remote
     log.debug "Getting latest remote docker image tag"
 
+    exit false unless docker_check_running
+
     tags = docker_image_tag_list_remote
 
+    if tags.nil?
+      log.debug "No latest docker remote tag"
+      return ''
+    end
+
     tag_latest_remote = tags[-1]
 
     log.debug "Latest docker remote tag: #{tag_latest_remote}"

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
+    include DockerCheckModule
     include DockerImageTagListModule
 
     # Initialize takelage docker image tag list

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

@@ -6,12 +6,13 @@ module DockerImageTagListModule
   def docker_image_tag_list_local
     tags = []
 
-    cmd_docker_images = 'docker images'
-    images = run cmd_docker_images
+    cmd_docker_images = 'docker images ' +
+        "#{@docker_repo}\/#{@docker_image} " +
+        ' --format "{{.Tag}}"'
 
-    images.scan(/.*#{@docker_repo}\/#{@docker_image}.*/) do |line|
-      tags << line.split(/\s+/)[1]
-    end
+    stdout_str = run cmd_docker_images
+
+    tags = stdout_str.split("\n")
 
     tags.sort_by(&Gem::Version.method(:new))
   end

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

@@ -6,6 +6,7 @@ module Takelage
     include LoggingModule
     include ConfigModule
     include SystemModule
+    include DockerCheckModule
     include DockerSocketModule
 
     # Initialize docker socket

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

@@ -5,6 +5,8 @@ module DockerSocketModule
   def docker_socket_start
     log.debug 'Starting sockets for docker container'
 
+    exit false unless docker_check_running
+
     cmds_start_socket = _get_socket_start_commands sockets_up = false
 
     unless cmds_start_socket.empty?
@@ -24,11 +26,13 @@ module DockerSocketModule
   def docker_socket_stop
     log.debug 'Stopping sockets for docker container'
 
+    exit false unless docker_check_running
+
     cmd_ps = config.active['docker_socket_ps']
 
     # get process list
     # assuming format: "pid command"
-    stdout_str, stderr_str, status = run_and_check cmd_ps
+    stdout_str = run cmd_ps
 
     cmds_start_socket = _get_socket_start_commands sockets_up = true
 
@@ -85,7 +89,7 @@ module DockerSocketModule
   # get socket paths
   def _get_socket_paths
     cmd_gpgconf_listdirs = config.active['docker_socket_gpgconf']
-    stdout_str, stderr_str, status = run_and_check cmd_gpgconf_listdirs
+    stdout_str = run cmd_gpgconf_listdirs
 
     stdout_str.split(/\n+/).each do |gpg_path|
       @sockets.each do |socket, socket_config|

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

@@ -12,9 +12,9 @@ module GitCheckModule
     cmd_git_uncommitted = config.active['git_uncommitted']
     cmd_git_status = config.active['git_status']
 
-    stdout_str, stderr_str, status_unstaged = run_and_check cmd_git_unstaged
-    stdout_str, stderr_str, status_uncommitted = run_and_check cmd_git_uncommitted
-    stdout_str_status, stderr_str, status = run_and_check cmd_git_status
+    status_unstaged = try cmd_git_unstaged
+    status_uncommitted = try cmd_git_uncommitted
+    stdout_str_status = run cmd_git_status
 
     # only return true if neither unstaged nor uncommitted nor empty files
     sum = status_unstaged.exitstatus +
@@ -32,7 +32,7 @@ module GitCheckModule
     return false unless git_check_workspace
 
     cmd_get_branch = config.active['git_branch']
-    stdout_str, stderr_str, status = run_and_check cmd_get_branch
+    stdout_str = run cmd_get_branch
 
     branch = stdout_str.strip.split('/')[-1]
 
@@ -47,10 +47,10 @@ module GitCheckModule
     log.debug 'Check if this is a git workspace'
 
     cmd_git_repo = config.active['git_repo']
-    stdout_str_repo, stderr_str_repo, status_repo = run_and_check cmd_git_repo
+    status_repo = try cmd_git_repo
 
     cmd_pwd = config.active['pwd']
-    stdout_str_dir, stderr_str_dir, status_dir = run_and_check cmd_pwd
+    stdout_str_dir = run cmd_pwd
 
     dir = stdout_str_dir.strip
 

data/lib/takelage/lib/system.rb

@@ -6,14 +6,6 @@ require 'yaml'
 # Interaction with the operating system
 module SystemModule
 
-  # Run a command and return the result.
-  # @return [Boolean] success of command run
-  def run_and_check(command)
-    log.debug "Running command \"#{command}\""
-    stdout_str, stderr_str, status = Open3.capture3 command
-    return stdout_str, stderr_str, status
-  end
-
   # Print hash as yaml.
   def hash_to_yaml(hash)
     if hash == {}
@@ -62,30 +54,12 @@ module SystemModule
     Pathname.new(directory).rmtree
   end
 
-  # Run a command.
+  # Run a command and return the standard output.
   # @return [String] stdout of command
   def run(command, realtime=false)
     log.debug "Running command \"#{command}\""
-    stdout_str = ''
-    stderr_str = ''
-    status = ''
-    exitstatus = -1
-    Open3.popen3 command do |stdin, stdout, stderr, thread|
-      stdout.each do |line|
-        say line if realtime
-        stdout_str += line
-      end
-      stderr_str = stderr
-      status = thread.value
-      exitstatus = thread.value.exitstatus
-    end
-    unless status.success?
-      log.error "Command \"#{command}\" failed!"
-      log.debug "status: #{status}"
-      log.debug "stdout: #{stdout_str}"
-      log.debug "stderr: #{stderr_str}"
-      exit exitstatus
-    end
+    stdout_str, stderr_str, status = Open3.capture3 command
+    log.debug "Command \"#{command}\" has stdout:\"\n#{stdout_str}\""
     stdout_str
   end
 
@@ -104,4 +78,12 @@ module SystemModule
     Process.detach(job)
   end
 
+  # Run a command and return the result.
+  # @return [Boolean] success of command run
+  def try(command)
+    log.debug "Running command \"#{command}\""
+    stdout_str, stderr_str, status = Open3.capture3 command
+    log.debug "Command \"#{command}\" has exit status \"#{status.exitstatus}\""
+    status
+  end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.4.5
+0.5.0

data/lib/takelage.rb

@@ -27,6 +27,8 @@ require_relative 'takelage/bit/clipboard/module'
 require_relative 'takelage/bit/clipboard/cli'
 require_relative 'takelage/bit/cli'
 require_relative 'takelage/completion/cli'
+require_relative 'takelage/docker/check/module'
+require_relative 'takelage/docker/check/cli'
 require_relative 'takelage/docker/socket/module'
 require_relative 'takelage/docker/socket/cli'
 require_relative 'takelage/docker/image/tag/list/module'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Geospin
@@ -186,6 +186,8 @@ files:
 - lib/takelage/bit/scope/module.rb
 - lib/takelage/completion/cli.rb
 - lib/takelage/default.yml
+- lib/takelage/docker/check/cli.rb
+- lib/takelage/docker/check/module.rb
 - lib/takelage/docker/cli.rb
 - lib/takelage/docker/container/check/cli.rb
 - lib/takelage/docker/container/check/module.rb