takelage 0.26.4 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf925e231daeab5d3930c78e761cafef36cf9ae428938df47d32459f0d4b001
-  data.tar.gz: 3485b85dfdeba7f4da4a67426c2a7ad61a14f9b81118e1305d163880757f5436
+  metadata.gz: c85358aee84b4ad7e8e67c54f106705fa7a81738b800e060472ec27989ea8a33
+  data.tar.gz: 1712ed57e584a5a9c6eb3cb30583f9c908abbd9a42a462aa770720a91b0be819
 SHA512:
-  metadata.gz: 3b6804918d7e81e8d93412b162168bc0617e6bf89443aa86476bfbcf152b33a292f4bf9388848a4390bf5968049d092ca01608048c1b0020e2d270905c20a7d5
-  data.tar.gz: aafc982404aceecd7f241991dbcb67194ddacda3d088849acfa0f56f7604d03b20c0a07360f5f3581d3d702f1ea4b1de0ece0afef95f3e39d3d4839f60e57852
+  metadata.gz: 1724194bc930b8d23c5e5e6395dbc493dde90440752bb3ea0a39539bd705876943b82d12524d8f23b9f682e56a3c0b7b18948d4d8efb6d827b8ec361148c9572
+  data.tar.gz: 617b075ad7581e80d3f3ec30c704d24333658d7daa94b893943f98315aeabfbef207cdbe02abf8ea3b0b281a65b4baa03ad89b29036d59e86873bbbd047a5a3b

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

@@ -32,6 +32,6 @@ module BitCheckWorkspace
 
     stdout_str_dir = run cmd_pwd
 
-    stdout_str_dir.strip
+    stdout_str_dir.chomp
   end
 end

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

@@ -55,7 +55,7 @@ module Takelage
     def list
       scopes = bit_scope_list
       exit false if scopes == false
-      say scopes unless scopes.to_s.strip.empty?
+      say scopes unless scopes.to_s.chomp.empty?
       true
     end
 

data/lib/takelage/default.yml

@@ -56,7 +56,7 @@ 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_main_git_branch: 'git symbolic-ref HEAD'
-cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
+cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
 cmd_info_status_lib_git_email: 'git -C %{root} config user.email'

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

@@ -11,7 +11,7 @@ module DockerContainerCheckExisting
 
     stdout_str = run _docker_container_cmd_check_existing container
 
-    if stdout_str.to_s.strip.empty?
+    if stdout_str.to_s.chomp.empty?
       log.debug "Container \"#{container}\" is not existing"
       return false
     end

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

@@ -11,7 +11,7 @@ module DockerContainerCheckNetwork
 
     stdout_str = run _docker_container_cmd_check_network network
 
-    if stdout_str.to_s.strip.empty?
+    if stdout_str.to_s.chomp.empty?
       log.debug "Network \"#{network}\" is not existing"
       return false
     end

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

@@ -9,7 +9,7 @@ module DockerImageTagCheck
 
     return false unless docker_check_daemon
 
-    if tag.to_s.strip.empty?
+    if tag.to_s.chomp.empty?
       log.warn 'No docker image tag specified'
       return false
     end
@@ -32,7 +32,7 @@ module DockerImageTagCheck
         image: image
       )
 
-    if (run cmd_docker_images).to_s.strip.empty?
+    if (run cmd_docker_images).to_s.chomp.empty?
       log.debug "No docker image \"#{image}\" found"
       return false
     end

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

@@ -31,7 +31,7 @@ module DockerSocketStop
   # Stop process.
   def _docker_socket_stop_kill_process(process, cmds_start_socket)
     # split processes in process id and process command
-    pid_command = process.strip.split(/ /, 2)
+    pid_command = process.chomp.split(/ /, 2)
     pid = pid_command[0]
     command = pid_command[1]
 

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

@@ -21,6 +21,6 @@ module GitCheckMain
   def _git_check_main_get_branch
     cmd_get_branch =
       config.active['cmd_git_check_main_git_branch']
-    (run cmd_get_branch).strip.split('/')[-1]
+    (run cmd_get_branch).chomp.split('/')[-1]
   end
 end

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

@@ -4,10 +4,9 @@
 module GitCheckWorkspace
   # Backend method for git check workspace.
   # @return [Boolean] is this a git workspace?
-  def git_check_workspace
-    log.debug 'Check if this is a git workspace'
-    status_repo = _git_check_workspace_get_status_repo
-    dir = _git_check_workspace_get_dir
+  def git_check_workspace(dir = _git_check_workspace_get_dir)
+    log.debug "Check if \"#{dir}\" is a git workspace"
+    status_repo = _git_check_workspace_get_status_repo(dir)
     unless status_repo.exitstatus.zero?
       log.debug "No git workspace found in \"#{dir}\""
       return false
@@ -18,8 +17,11 @@ module GitCheckWorkspace
   private
 
   # Get git repository status.
-  def _git_check_workspace_get_status_repo
-    cmd_git_repo = config.active['cmd_git_check_workspace_git_repo']
+  def _git_check_workspace_get_status_repo(dir)
+    cmd_git_repo = format(
+      config.active['cmd_git_check_workspace_git_repo'],
+      dir: dir
+    )
     try cmd_git_repo
   end
 
@@ -27,6 +29,6 @@ module GitCheckWorkspace
   def _git_check_workspace_get_dir
     cmd_pwd =
       config.active['cmd_git_check_workspace_pwd']
-    (run cmd_pwd).strip
+    (run cmd_pwd).chomp
   end
 end

data/lib/takelage/info/status/cli.rb

@@ -7,6 +7,7 @@ module Takelage
     include SystemModule
     include ConfigModule
     include DockerSocketScheme
+    include GitCheckWorkspace
     include InfoStatusLib
     include InfoStatusGit
     include InfoStatusGopass

data/lib/takelage/info/status/git.rb

@@ -11,18 +11,23 @@ module InfoStatusGit
 
     root = config.active['project_root_dir']
 
-    if root.strip.empty?
+    if root.chomp.empty?
       log.error 'Cannot determine project root directory'
       log.info 'Is there a Rakefile in the project root directory?'
       return false
     end
 
-    if _info_status_lib_git_name(root).strip.empty?
+    unless git_check_workspace(root)
+      log.error 'Project root directory is not a git workspace'
+      return false
+    end
+
+    if _info_status_lib_git_name(root).chomp.empty?
       log.error 'git config user.name is not available'
       return false
     end
 
-    if _info_status_lib_git_email(root).strip.empty?
+    if _info_status_lib_git_email(root).chomp.empty?
       log.error 'git config user.email is not available'
       return false
     end

data/lib/takelage/info/status/gopass.rb

@@ -8,9 +8,9 @@ module InfoStatusGopass
   def info_status_gopass
     log.debug 'Check gopass status'
 
-    root = _info_status_gopass_root_store.chomp
+    root = _info_status_gopass_root_store
 
-    if root.strip.empty?
+    if root.chomp.empty?
       log.error 'gopass root store not found'
       return false
     end
@@ -32,6 +32,6 @@ module InfoStatusGopass
   # Get gopass root store
   def _info_status_gopass_root_store
     cmd_gopass_root_store = config.active['cmd_info_status_gopass_root_store']
-    run cmd_gopass_root_store
+    (run cmd_gopass_root_store).chomp
   end
 end

data/lib/takelage/info/status/lib.rb

@@ -31,7 +31,7 @@ module InfoStatusLib
         config.active['cmd_info_status_lib_git_signingkey'],
         root: root
       )
-    run cmd_git_signingkey
+    (run cmd_git_signingkey).chomp
   end
 
   # Check if git key is available

data/lib/takelage/info/status/ssh.rb

@@ -8,7 +8,15 @@ module InfoStatusSSH
   def info_status_ssh
     log.debug 'Check ssh status'
 
-    unless _file_exists? _socket_get_agent_ssh_socket_path
+    ssh_auth_sock = ENV['SSH_AUTH_SOCK']
+    gpg_ssh_socket = _socket_get_agent_ssh_socket_path
+
+    unless ssh_auth_sock == gpg_ssh_socket
+      log.error 'ssh does not use gpg ssh socket'
+      return false
+    end
+
+    unless _file_exists? gpg_ssh_socket
       log.error 'gpg ssh socket is not available'
       return false
     end

data/lib/takelage/version

@@ -1 +1 @@
-0.26.4
+0.26.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.7
 platform: ruby
 authors:
 - Geospin