takelage 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d4e9f1786e7e4c7d21e9cada3ed8f29b332aba1e9a4c9d6ad9883aad14aa643
-  data.tar.gz: 73028ac09504b53a127cc8c02d9b7d912e1e24962513955f08fe401f2ab2931f
+  metadata.gz: f66a9c3c1c62c23deef953a07c15ec08e90325ea20989461836d5fe9bb3827d7
+  data.tar.gz: 312841983390a8fbcd11e8c51ab591d37b44bec0c745a6f83dd10fbed5dbe358
 SHA512:
-  metadata.gz: ff27f4263162d199b3aa7f9f54ee01b8eb537e3dc6f9a260689fa499f9fdc6e700483657d5d2b72198d431a3ca454c8a4cbc07e256c354bc538fe7bb5395bf86
-  data.tar.gz: 49dd92f06b1ad60f87f1af59ac96b6ad3fbc17005de3eaf29c748e396fd88d2232a1db4e0b7bd2e3400e6fb6fae8acba82c49b15ae15aa450a0c823f8840f386
+  metadata.gz: e969702e08c786cb712f9f804a16aa612760c8859faaa3e363eb354308351833369eb79bd2f58d3dac1f1f0301bb7eb9e70f9fdf658eb82289ddb448d85e315c
+  data.tar.gz: 71f2c1baa7255ae59a0ba15e859db9c04dcde1a33c4f9e90fe58c978f28798b663432ca5018fe17eee1d3b9d44b9f3f3e602be8ece86be6eda018a710d43bd46

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

@@ -6,10 +6,14 @@ module BitCheckModule
   def bit_check_workspace
     log.debug 'Check if this is a bit workspace'
 
-    cmd_bit_repo = config.active['bit_repo']
+    cmd_bit_repo =
+        config.active['cmd_bit_check_workspace_bit_list']
+
     status_repo = try cmd_bit_repo
 
-    cmd_pwd = config.active['pwd']
+    cmd_pwd =
+        config.active['cmd_bit_check_workspace_pwd']
+
     stdout_str_dir = run cmd_pwd
 
     dir = stdout_str_dir.strip

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

@@ -24,13 +24,18 @@ module BitClipboardModule
 
       log.debug "Adding the directory \"#{dir}\" as a tagged bit component"
 
-      bit_dev = config.active['bit_dev']
+      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 + '.'
 
         # check if bit.dev remote scope exists
-        cmd_bit_list_scope = config.active['bit_list_scope'] % {scope: scope}
+        cmd_bit_list_scope =
+            config.active['cmd_bit_clipboard_copy_bit_list_scope'] % {
+                scope: scope
+            }
+
         status = try cmd_bit_list_scope
 
         unless status.exitstatus.zero?
@@ -41,7 +46,9 @@ module BitClipboardModule
       else
 
         # check if bit remote scope is added to local workspace
-        cmd_bit_list_remotes = config.active['bit_list_remotes']
+        cmd_bit_list_remotes =
+            config.active['cmd_bit_clipboard_copy_bit_list_remotes']
+
         stdout_str = run cmd_bit_list_remotes
 
         unless /.*\s+#{scope}\s+.*/m.match? stdout_str
@@ -69,19 +76,32 @@ module BitClipboardModule
       id = _id(dir)
 
       # get bit add dir command from active config
-      cmd_bit_add_dir = config.active['bit_add_dir'] % {id: id, dir: dir}
+      cmd_bit_add_dir =
+          config.active['cmd_bit_clipboard_copy_bit_add_dir'] % {
+              id: id, dir: dir
+          }
+
       run cmd_bit_add_dir
 
       # get bit tag dir command from active config
-      cmd_bit_tag_id = config.active['bit_tag_id'] % {id: id}
+      cmd_bit_tag_id =
+          config.active['cmd_bit_clipboard_copy_bit_tag_id'] % {
+              id: id
+          }
+
       run cmd_bit_tag_id
+
     else
       log.error "The directory \"#{dir}\" does not exist"
       return false
     end
 
     # export component to bit remote scope
-    cmd_bit_export_to_scope = config.active['bit_export_to_scope'] % {scope: scope}
+    cmd_bit_export_to_scope =
+        config.active['cmd_bit_clipboard_copy_bit_export_to_scope'] % {
+            scope: scope
+        }
+
     run cmd_bit_export_to_scope
 
     _remove_bit_artifacts
@@ -114,7 +134,11 @@ module BitClipboardModule
                   "has contains component id \"#{cid}\""
 
     # get components in remote scope
-    cmd_bit_list_scope = config.active['bit_list_scope'] % {scope: scope}
+    cmd_bit_list_scope =
+        config.active['cmd_bit_clipboard_paste_bit_list_scope'] % {
+            scope: scope
+        }
+
     bit_list_scope = run cmd_bit_list_scope
 
     unless bit_list_scope.include? '"id": "' + cid + '",'
@@ -123,7 +147,11 @@ module BitClipboardModule
     end
 
     # paste bit component into directory
-    cmd_bit_import_cid = config.active['bit_import_cid'] % {cid: cid, dir: dir}
+    cmd_bit_import_cid =
+        config.active['cmd_bit_clipboard_paste_bit_import_cid'] % {
+            cid: cid, dir: dir
+        }
+
     run cmd_bit_import_cid
 
     _handle_bitignore
@@ -151,11 +179,15 @@ module BitClipboardModule
     end
 
     # import components into workspace
-    cmd_bit_import_all = config.active['bit_import_all']
+    cmd_bit_import_all =
+        config.active['cmd_bit_clipboard_pull_bit_import_all']
+
     run cmd_bit_import_all
 
     # checkout components and merge them
-    cmd_bit_checkout_all = config.active['bit_checkout_all']
+    cmd_bit_checkout_all =
+        config.active['cmd_bit_clipboard_pull_bit_checkout_all']
+
     run cmd_bit_checkout_all
 
     _handle_bitignore
@@ -182,11 +214,15 @@ module BitClipboardModule
     end
 
     # tag all components
-    cmd_bit_tag_all = config.active['bit_tag_all']
+    cmd_bit_tag_all =
+        config.active['cmd_bit_clipboard_push_bit_tag_all']
+
     run cmd_bit_tag_all
 
     # export components
-    cmd_bit_export_all = config.active['bit_export_all']
+    cmd_bit_export_all =
+        config.active['cmd_bit_clipboard_push_bit_export_all']
+
     run cmd_bit_export_all
 
     _remove_bit_artifacts

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

@@ -28,7 +28,8 @@ module BitScopeModule
     end
 
     # get bit remote from active config
-    bit_remote = config.active['bit_remote']
+    bit_remote =
+        config.active['bit_remote']
 
     # prepare scope add command
     cmd_bit_scope_add = "bit remote add #{bit_remote}/#{scope}"
@@ -43,7 +44,9 @@ module BitScopeModule
 
     return false unless configured? %w(bit_ssh)
 
-    cmd_bit_scope_login = config.active['bit_ssh']
+    cmd_bit_scope_login =
+        config.active['bit_ssh']
+
     run_and_exit cmd_bit_scope_login
   end
 
@@ -55,11 +58,17 @@ module BitScopeModule
     return false unless configured? %w(bit_ssh bit_remote)
 
     # get ssh command from active config
-    cmd_bit_ssh = config.active['bit_ssh']
+    cmd_bit_ssh =
+        config.active['bit_ssh']
 
     # prepare scope list command
-    root = config.active['bit_scope_root']
-    cmd_bit_scope_list = config.active['bit_scope_list'] % {root: root}
+    root =
+        config.active['bit_scope_root']
+
+    cmd_bit_scope_list =
+        config.active['cmd_bit_scope_list_find_scopes'] % {
+            root: root
+        }
 
     # run ssh command with scope list command
     scope_list = run "#{cmd_bit_ssh} '#{cmd_bit_scope_list}'"
@@ -88,11 +97,17 @@ module BitScopeModule
     end
 
     # get ssh command from active config
-    cmd_bit_ssh = config.active['bit_ssh']
+    cmd_bit_ssh =
+        config.active['bit_ssh']
 
     # prepare scope list command
-    root = config.active['bit_scope_root']
-    cmd_bit_scope_new = config.active['bit_scope_new'] % {scope: scope, root: root}
+    root =
+        config.active['bit_scope_root']
+
+    cmd_bit_scope_new =
+        config.active['cmd_bit_scope_new_bit_init'] % {
+            scope: scope, root: root
+        }
 
     # run ssh command with scope new command
     run "#{cmd_bit_ssh} '#{cmd_bit_scope_new}'"

data/lib/takelage/default.yml

@@ -1,56 +1,60 @@
 ---
-bit_add_dir: 'bit add --skip-update --id %{id} --main %{dir}/README.bit %{dir}'
-bit_checkout_all: 'bit checkout --ignore-dist --skip-update --all latest'
-bit_dev: 'takelage'
-bit_export_to_scope: 'bit export --skip-update %{scope}'
-bit_export_all: 'bit export --skip-update --all'
-bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'
-bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
-bit_list_remotes: 'bit remote --skip-update'
-bit_list_scope: 'bit list --skip-update --json %{scope}'
+bit_dev_user: 'takelage'
 bit_remote: ''
-bit_repo: 'bit list'
 bit_scope_root: '/bit'
-bit_scope_list: 'find -L %{root} -name scope.json'
-bit_scope_new: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
-bit_scope_remove: 'rm --force --recursive %{root}/%{scope}'
 bit_ssh: ''
-bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
-bit_tag_all: 'bit tag --skip-update --skip-tests --all'
-docker_create: 'docker run --detach --env GEOSPIN_PROJECT_BASE_DIR=%{workdir} --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username}'
-docker_create_network: 'docker network create %{network}'
+cmd_bit_check_workspace_bit_list: 'bit list'
+cmd_bit_check_workspace_pwd: 'pwd'
+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}'
+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_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'
+cmd_bit_clipboard_pull_bit_checkout_all: 'bit checkout --ignore-dist --skip-update --all latest'
+cmd_bit_clipboard_push_bit_tag_all: 'bit tag --skip-update --skip-tests --all'
+cmd_bit_clipboard_push_bit_export_all: 'bit export --skip-update --all'
+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_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'
+cmd_docker_create_container_docker_run: 'docker run --detach --env GEOSPIN_PROJECT_BASE_DIR=%{workdir} --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_DAYNIGHT=%{daynight} --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
+cmd_docker_create_network_docker_network: 'docker network create %{network}'
+cmd_docker_enter_container_docker_exec: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
+cmd_docker_get_container_name_by_id: 'docker ps --filter id=%{container} --format "{{.Names}}"'
+cmd_docker_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
+cmd_docker_remove_network: 'docker network rm %{network}'
+cmd_docker_run_command_in_container: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
+cmd_docker_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_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
+cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
+cmd_docker_get_socket_start_commands_docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
+cmd_docker_get_socket_paths_docker_socket_gpgconf: 'gpgconf --list-dirs'
+cmd_docker_socket_start_sudo_true: 'sudo true'
+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_workspace_git_repo: 'git -C . rev-parse'
+cmd_git_check_workspace_pwd: 'pwd'
+docker_daynight: 'night'
 docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
-docker_enter: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
-docker_existing: 'docker ps --filter name=^%{container}$ --quiet'
-docker_get: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
-docker_get_container_name_by_id: 'docker ps --filter id=%{container} --format "{{.Names}}"'
+docker_entrypoint_options: ''
 docker_repo: 'takelage'
-docker_images: 'docker images --quiet %{image}'
-docker_info: 'docker info'
-docker_network: 'docker network ls --quiet --filter name=^%{network}$'
-docker_orphaned: 'docker exec --interactive %{container} ps a'
-docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
-docker_remove_network: 'docker network rm %{network}'
 docker_user: 'takelage'
-docker_run_command: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
 docker_socket_agent_port: 20000
 docker_socket_agent_ssh_port: 20001
 docker_socket_agent_extra_port: 20002
 docker_socket_agent_browser_port: 20003
-docker_socket_ps: 'sudo ps a -o pid,command'
-docker_socket_gpgconf: 'gpgconf --list-dirs'
-docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
-docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
-docker_stop: 'docker stop %{container}'
 docker_tag: 'latest'
-docker_tags: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 docker_tagsurl: 'https://hub.docker.com/v2/repositories/takelage/takelage/tags'
-git_branch: 'git symbolic-ref HEAD'
-git_repo: 'git -C . rev-parse'
-git_status: 'git status --porcelain'
-git_unstaged: 'git diff --exit-code'
-git_uncommitted: 'git diff --cached --exit-code'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
-pwd: 'pwd'
-sudo_true: 'sudo true'

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

@@ -6,7 +6,8 @@ module DockerCheckModule
   def docker_check_running
     log.debug "Check if the docker daemon is running"
 
-    cmd_docker_info = config.active['docker_info']
+    cmd_docker_info =
+        config.active['cmd_docker_check_running_docker_info']
 
     status = try cmd_docker_info
 

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

@@ -9,7 +9,9 @@ module DockerContainerCheckModule
     return false unless docker_check_running
 
     cmd_docker_existing =
-        config.active['docker_existing'] % {container: container}
+        config.active['cmd_docker_container_check_existing_docker_ps'] % {
+            container: container
+        }
 
     stdout_str = run cmd_docker_existing
 
@@ -30,7 +32,9 @@ module DockerContainerCheckModule
     return false unless docker_check_running
 
     cmd_docker_network =
-        config.active['docker_network'] % {network: network}
+        config.active['cmd_docker_container_check_network_docker_network'] % {
+            network: network
+        }
 
     stdout_str = run cmd_docker_network
 
@@ -51,7 +55,9 @@ module DockerContainerCheckModule
     return false unless docker_check_running
 
     cmd_docker_orphaned =
-        config.active['docker_orphaned'] % {container: container}
+        config.active['cmd_docker_container_check_orphaned_docker_exec'] % {
+            container: container
+        }
 
     stdout_str = run cmd_docker_orphaned
 

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

@@ -26,6 +26,10 @@ module Takelage
       @docker_repo = config.active['docker_repo']
       @docker_tag = config.active['docker_tag']
 
+      @entrypoint_options = config.active['docker_entrypoint_options']
+
+      @daynight = config.active['docker_daynight']
+
       @dockersock = '/var/run/docker.sock'
 
       @username = ENV['USER'] ? ENV['USER'] : 'username'

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

@@ -114,8 +114,9 @@ module DockerContainerModule
     end
 
     cmd_docker_create =
-        config.active['docker_create'] % {
+        config.active['cmd_docker_create_container_docker_run'] % {
             workdir: @workdir,
+            daynight: @daynight,
             timezone: @timezone,
             container: container,
             dockersock: @dockersock,
@@ -125,7 +126,8 @@ module DockerContainerModule
             entrypoint: entrypoint,
             gid: @gid,
             uid: @uid,
-            username: @username
+            username: @username,
+            entrypoint_options: @entrypoint_options
         }
 
     run cmd_docker_create
@@ -136,7 +138,7 @@ module DockerContainerModule
     log.debug "Create network \"#{network}\""
 
     cmd_create_network =
-        config.active['docker_create_network'] % {
+        config.active['cmd_docker_create_network_docker_network'] % {
             network: network
         }
 
@@ -153,7 +155,7 @@ module DockerContainerModule
     end
 
     cmd_docker_enter =
-        config.active['docker_enter'] % {
+        config.active['cmd_docker_enter_container_docker_exec'] % {
             container: container,
             loginpoint: loginpoint,
             username: @username
@@ -167,7 +169,7 @@ module DockerContainerModule
     log.debug "Getting name of container \"#{container}\""
 
     cmd_get_container_name_by_id =
-        config.active['docker_get_container_name_by_id'] % {
+        config.active['cmd_docker_get_container_name_by_id'] % {
             container: container
         }
 
@@ -186,7 +188,7 @@ module DockerContainerModule
     log.debug "Getting all containers of image \"#{@docker_repo}\""
 
     cmd_docker_get =
-        config.active['docker_get'] % {
+        config.active['cmd_docker_get_containers'] % {
             docker_repo: @docker_repo
         }
 
@@ -201,7 +203,7 @@ module DockerContainerModule
     log.debug "Remove network \"#{network}\""
 
     cmd_remove_network =
-        config.active['docker_remove_network'] % {
+        config.active['cmd_docker_remove_network'] % {
             network: network
         }
 
@@ -213,7 +215,7 @@ module DockerContainerModule
     log.debug "Running command \"#{command}\" in container \"#{container}\""
 
     cmd_docker_run_command =
-        config.active['docker_run_command'] % {
+        config.active['cmd_docker_run_command_in_container'] % {
             container: container,
             username: @username,
             command: command
@@ -227,7 +229,7 @@ module DockerContainerModule
     log.debug "Stopping container \"#{container}\""
 
     cmd_docker_stop =
-        config.active['docker_stop'] % {
+        config.active['cmd_docker_stop_container'] % {
             container: container
         }
 

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

@@ -26,7 +26,7 @@ module DockerImageModule
     log.info "Updating to docker image \"#{@docker_user}/#{@docker_repo}:#{tag_latest_remote}\""
 
     cmd_docker_pull_latest =
-        config.active['docker_pull_latest'] % {
+        config.active['cmd_docker_image_update_docker_pull_latest'] % {
             docker_user: @docker_user,
             docker_repo: @docker_repo,
             tag_latest_remote: tag_latest_remote

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

@@ -18,7 +18,7 @@ module DockerImageTagCheckModule
     image = "#{@docker_user}/#{@docker_repo}:#{tag}"
 
     cmd_docker_images =
-        config.active['docker_images'] % {
+        config.active['cmd_docker_image_tag_check_local_docker_images'] % {
             image: image
         }
 

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

@@ -7,7 +7,7 @@ module DockerImageTagListModule
     tags = []
 
     cmd_docker_tags =
-        config.active['docker_tags'] % {
+        config.active['cmd_docker_image_tag_list_local_docker_images'] % {
             docker_user: @docker_user,
             docker_repo: @docker_repo
         }

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

@@ -12,7 +12,9 @@ module DockerSocketModule
     unless cmds_start_socket.empty?
       log.debug 'Request sudo so that subsequent background tasks run without delay'
 
-      cmd_sudo_true = config.active['sudo_true']
+      cmd_sudo_true =
+          config.active['cmd_docker_socket_start_sudo_true']
+
       run cmd_sudo_true
     end
 
@@ -31,7 +33,9 @@ module DockerSocketModule
 
     # get process list
     # assuming format: "pid command"
-    cmd_ps = config.active['docker_socket_ps']
+    cmd_ps =
+        config.active['cmd_docker_socket_stop_docker_socket_ps']
+
     stdout_str = run cmd_ps
 
     cmds_start_socket = _get_socket_start_commands sockets_up = true
@@ -50,7 +54,11 @@ module DockerSocketModule
         if command == cmd_start_socket
           log.debug "Killing PID #{pid}"
 
-          cmd_kill = config.active['docker_socket_kill'] % {pid: pid}
+          cmd_kill =
+              config.active['cmd_docker_socket_stop_docker_socket_kill'] % {
+                  pid: pid
+              }
+
           run cmd_kill
         end
       end
@@ -67,7 +75,8 @@ module DockerSocketModule
 
     # loop over sockets
     @sockets.each do |socket, socket_config|
-      cmd_start_socket = config.active['docker_socket_start'] % {
+      cmd_start_socket =
+          config.active['cmd_docker_get_socket_start_commands_docker_socket_start'] % {
           host: socket_config[:host],
           port: socket_config[:port],
           path: socket_config[:path],
@@ -89,7 +98,9 @@ module DockerSocketModule
 
   # get socket paths
   def _get_socket_paths
-    cmd_gpgconf_listdirs = config.active['docker_socket_gpgconf']
+    cmd_gpgconf_listdirs =
+        config.active['cmd_docker_get_socket_paths_docker_socket_gpgconf']
+
     stdout_str = run cmd_gpgconf_listdirs
 
     stdout_str.split(/\n+/).each do |gpg_path|

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

@@ -8,9 +8,14 @@ module GitCheckModule
 
     return false unless git_check_workspace
 
-    cmd_git_unstaged = config.active['git_unstaged']
-    cmd_git_uncommitted = config.active['git_uncommitted']
-    cmd_git_status = config.active['git_status']
+    cmd_git_unstaged =
+        config.active['cmd_git_check_clean_git_unstaged']
+
+    cmd_git_uncommitted =
+        config.active['cmd_git_check_clean_git_uncommitted']
+
+    cmd_git_status =
+        config.active['cmd_git_check_clean_git_status']
 
     status_unstaged = try cmd_git_unstaged
     status_uncommitted = try cmd_git_uncommitted
@@ -31,7 +36,9 @@ module GitCheckModule
 
     return false unless git_check_workspace
 
-    cmd_get_branch = config.active['git_branch']
+    cmd_get_branch =
+        config.active['cmd_git_check_master_git_branch']
+
     stdout_str = run cmd_get_branch
 
     branch = stdout_str.strip.split('/')[-1]
@@ -46,10 +53,14 @@ module GitCheckModule
   def git_check_workspace
     log.debug 'Check if this is a git workspace'
 
-    cmd_git_repo = config.active['git_repo']
+    cmd_git_repo =
+        config.active['cmd_git_check_workspace_git_repo']
+
     status_repo = try cmd_git_repo
 
-    cmd_pwd = config.active['pwd']
+    cmd_pwd =
+        config.active['cmd_git_check_workspace_pwd']
+
     stdout_str_dir = run cmd_pwd
 
     dir = stdout_str_dir.strip

data/lib/takelage/version

@@ -1 +1 @@
-0.9.1
+0.9.2

metadata

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