takelage 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8af5bb8cdf3144a82eb3b8e1058e51b6f05cb631d04bfba15db6f7a8d07c5c8
-  data.tar.gz: 3db0b716115de02773ece1d5cb3ecc0fd6c4a79fe1d5a0ba46d6cc3dc0cd27cc
+  metadata.gz: ff76a5fa994c76003af554e174ec3d4ae3e1a8b4e08caf61df2101e0bedd5607
+  data.tar.gz: 85de4c4db687bfa14385614ba4960314655909775b975c7a32c01aabe7573cb4
 SHA512:
-  metadata.gz: a6a7a3c1403ad667863df7e88880ea5bea8c43b093330cc5b10530d673c3bd4a92040ae4da7c96d78c9eea708b66b8a77593103d8d2c5e4521e2862c10c3477d
-  data.tar.gz: 9e8a39e3064d832ec9423b8acd23349e99b06071f171d4726845677baf937cdb541a61237507b6c2a65d0f3a077b8aed23d343cf121080884ca9b15669a975c8
+  metadata.gz: e51313c752ce726c55d786541ff273a63291e3c31cee20416bf70e2ee48906b3e02ccfef97bbfe1c6164ce1dbad4dc781f5ec1ce0f4e11915495e59cc73f8390
+  data.tar.gz: fb5458e2480025692fb344dba806c595570a756bf59abd45dfe948bc4af0edd4f315c3e7d5f23f2c7511d8b96d1996d4156d1e1e63323de39213f93b1db5c985

data/README.md

@@ -52,6 +52,8 @@ tau [bit clipboard copy](features/takelage/bit/bit.clipboard.copy.feature) [DIR]
 tau [bit clipboard paste](features/takelage/bit/bit.clipboard.paste.feature) [COMPONENT] [DIR] | Paste bit [COMPONENT] into [DIR]
 tau [bit clipboard pull](features/takelage/bit/bit.clipboard.pull.feature) | Pull all updates for bit components from bit remote scopes
 tau [bit clipboard push](features/takelage/bit/bit.clipboard.push.feature) | Push all updates of bit components to bit remote scopes
+tau [bit require export](features/takelage/bit/bit.require.export.feature) | Show requirements file of bit components
+tau [bit require import](features/takelage/bit/bit.require.import.feature) | Import bit components from requirements file
 tau [bit scope add](features/takelage/bit/bit.scope.add.feature) [SCOPE] | Add a bit [SCOPE]
 tau [bit scope inbit](features/takelage/bit/bit.scope.inbit.feature) | Log in to bit remote server
 tau [bit scope list](features/takelage/bit/bit.scope.list.feature) | List bit remote scopes

data/lib/takelage.rb

@@ -38,6 +38,10 @@ require_relative 'takelage/bit/clipboard/paste'
 require_relative 'takelage/bit/clipboard/pull'
 require_relative 'takelage/bit/clipboard/push'
 require_relative 'takelage/bit/clipboard/cli'
+require_relative 'takelage/bit/require/lib'
+require_relative 'takelage/bit/require/export'
+require_relative 'takelage/bit/require/import'
+require_relative 'takelage/bit/require/cli'
 require_relative 'takelage/bit/cli'
 require_relative 'takelage/completion/cli'
 require_relative 'takelage/docker/check/running'
@@ -112,7 +116,7 @@ module Takelage
       # Initialize global singleton project
       initialize_project
 
-      # prepare for the worst
+      # Prepare for the worst
       @docker_daemon_running = false
 
       # fylla bash completion code

data/lib/takelage/bit/cli.rb

@@ -9,6 +9,9 @@ module Takelage
     desc 'clipboard [COMMAND]', 'Manage bit clipboard'
     subcommand 'clipboard', BitClipboard
 
+    desc 'require [COMMAND]', 'Manage bit requirements'
+    subcommand 'require', BitRequire
+
     desc 'scope [COMMAND]', 'Manage bit scopes'
     subcommand 'scope', BitScope
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Takelage
-  # takelage bit
+  # takelage bit clipboard
   class BitClipboard < SubCommandBase
     include LoggingModule
     include ConfigModule

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

@@ -43,7 +43,7 @@ module BitClipboardCopy
   end
   # rubocop:enable Metrics/MethodLength
 
-  # touch README.bit if necessary
+  # Touch README.bit if necessary.
   def _bit_clipboard_copy_touch_readme_bit(dir)
     readme_bit = "#{dir}/README.bit"
     return if File.file? readme_bit
@@ -52,7 +52,7 @@ module BitClipboardCopy
     File.open(readme_bit, 'w') {}
   end
 
-  # check if a README.bit file exists in a subdirectory
+  # Check if a README.bit file exists in a subdirectory.
   def _bit_clipboard_copy_readme_bit_exists_in_subdir?(dir)
     Dir.glob("#{dir}/**/README.bit").each do |file|
       unless file == "#{dir}/README.bit"
@@ -64,7 +64,7 @@ module BitClipboardCopy
     false
   end
 
-  # Check if bit scope exists
+  # Check if bit scope exists.
   def _bit_clipboard_copy_dir_scope_exists?(scope)
     bit_dev = config.active['bit_dev_user']
 
@@ -78,7 +78,7 @@ module BitClipboardCopy
     true
   end
 
-  # check if bit.dev remote scope exists
+  # Check if bit.dev remote scope exists.
   def _bit_clipboard_bit_dev_scope_exists(scope)
     cmd_bit_list_scope = format(
       config.active['cmd_bit_clipboard_copy_bit_list_scope'],
@@ -93,7 +93,7 @@ module BitClipboardCopy
     false
   end
 
-  # check if bit remote scope is added to local workspace
+  # Check if bit remote scope is added to local workspace.
   def _bit_clipboard_custom_scope_exists(scope)
     cmd_bit_list_remotes =
       config.active['cmd_bit_clipboard_copy_bit_list_remotes']
@@ -107,7 +107,7 @@ module BitClipboardCopy
     false
   end
 
-  # bit tag dir
+  # bit tag dir.
   def _bit_clipboard_copy_add_dir(id, dir)
     cmd_bit_add_dir = format(
       config.active['cmd_bit_clipboard_copy_bit_add_dir'],
@@ -118,7 +118,7 @@ module BitClipboardCopy
     run cmd_bit_add_dir
   end
 
-  # bit tag dir
+  # bit tag dir.
   def _bit_clipboard_copy_tag_dir(id)
     cmd_bit_tag_id = format(
       config.active['cmd_bit_clipboard_copy_bit_tag_id'],
@@ -128,7 +128,7 @@ module BitClipboardCopy
     run cmd_bit_tag_id
   end
 
-  # bit export component to bit remote scope
+  # bit export component to bit remote scope.
   def _bit_clipboard_copy_export_to_scope(scope)
     cmd_bit_export_to_scope = format(
       config.active['cmd_bit_clipboard_copy_bit_export_to_scope'],

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

@@ -52,29 +52,28 @@ module BitClipboardLib
     log.debug 'Syncing git workspace'
 
     _rakefile, path = Rake.application.find_rakefile_location
-    bitmap = "#{path}/.bitmap"
+    file = "#{path}/.bitmap"
+    message = 'Update .bitmap'
 
-    _bit_clipboard_lib_git_add bitmap
-    _bit_clipboard_lib_git_commit bitmap
+    _bit_clipboard_lib_git_add file
+    _bit_clipboard_lib_git_commit message
     _bit_clipboard_lib_git_push
   end
 
-  # git add .bitmap
-  def _bit_clipboard_lib_git_add(bitmap)
-    log.debug "Adding \"#{bitmap}\" to git"
+  # git add .bitmap.
+  def _bit_clipboard_lib_git_add(file)
+    log.debug "Adding \"#{file}\" to git"
 
     cmd_bit_clipboard_git_add = format(
       config.active['cmd_bit_clipboard_git_add'],
-      file: bitmap
+      file: file
     )
     run cmd_bit_clipboard_git_add
   end
 
-  # git commit -m "Update .bitmap"
-  def _bit_clipboard_lib_git_commit(bitmap)
-    message = 'Update .bitmap'
-
-    log.debug "Committing \"#{bitmap}\" to git"
+  # git commit -m "Update .bitmap".
+  def _bit_clipboard_lib_git_commit(message)
+    log.debug "Committing to git with message \"#{message}\""
 
     cmd_bit_clipboard_git_commit = format(
       config.active['cmd_bit_clipboard_git_commit'],
@@ -84,7 +83,7 @@ module BitClipboardLib
     run cmd_bit_clipboard_git_commit
   end
 
-  # git push origin master
+  # git push origin master.
   def _bit_clipboard_lib_git_push
     log.debug 'Pushing master branch to origin'
 
@@ -94,7 +93,7 @@ module BitClipboardLib
     run cmd_bit_clipboard_git_push
   end
 
-  # git pull
+  # git pull.
   def _bit_clipboard_lib_git_pull
     log.debug 'Updating git workspace'
     cmd_bit_clipboard_git_pull =

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

@@ -20,7 +20,7 @@ module BitClipboardPaste
 
   private
 
-  # paste bit component into directory
+  # paste bit component into directory.
   def _bit_clipboard_paste_import_cid(cid, dir)
     cmd_bit_import_cid = format(
       config.active['cmd_bit_clipboard_paste_bit_import_cid'],
@@ -31,6 +31,7 @@ module BitClipboardPaste
     run cmd_bit_import_cid
   end
 
+  # Check if remote component exists.
   def _bit_clipboard_paste_cid_exists?(cid)
     scope = cid.scan(%r{([^/]*).*}).first.first
 
@@ -45,7 +46,7 @@ module BitClipboardPaste
     false
   end
 
-  # get components in remote scope
+  # Get components in remote scope.
   def _bit_clipboard_paste_cid_exists_list_scope(scope)
     cmd_bit_list_scope = format(
       config.active['cmd_bit_clipboard_paste_bit_list_scope'],

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

@@ -19,7 +19,7 @@ module BitClipboardPull
 
   private
 
-  # bit import components into workspace
+  # bit import components into workspace.
   def _bit_clipboard_pull_import_all
     cmd_bit_import_all =
       config.active['cmd_bit_clipboard_pull_bit_import_all']
@@ -27,7 +27,7 @@ module BitClipboardPull
     run cmd_bit_import_all
   end
 
-  # checkout components and merge them
+  # Checkout components and merge them.
   def _bit_clipboard_pull_checkout_all
     cmd_bit_checkout_all =
       config.active['cmd_bit_clipboard_pull_bit_checkout_all']

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

@@ -2,7 +2,7 @@
 
 # takelage bit clipboard push
 module BitClipboardPush
-  # Backend method for bit push
+  # Backend method for bit push.
   def bit_clipboard_push
     log.debug 'Running bit push'
 
@@ -19,7 +19,7 @@ module BitClipboardPush
 
   private
 
-  # bit tag all components
+  # bit tag all components.
   def _bit_clipboard_push_tag_all
     cmd_bit_tag_all =
       config.active['cmd_bit_clipboard_push_bit_tag_all']
@@ -27,7 +27,7 @@ module BitClipboardPush
     run cmd_bit_tag_all
   end
 
-  # bit export components
+  # bit export components.
   def _bit_clipboard_push_export_all
     cmd_bit_export_all =
       config.active['cmd_bit_clipboard_push_bit_export_all']

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Takelage
+  # takelage bit requiere
+  class BitRequire < SubCommandBase
+    include LoggingModule
+    include ConfigModule
+    include SystemModule
+    include GitCheckClean
+    include GitCheckMaster
+    include GitCheckWorkspace
+    include BitCheckWorkspace
+    include BitScopeList
+    include BitScopeAdd
+    include BitClipboardLib
+    include BitClipboardCopy
+    include BitClipboardPaste
+    include BitRequireLib
+    include BitRequireExport
+    include BitRequireImport
+
+    # Initialize bit require
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @bit_require_file = config.active['bit_require_file']
+    end
+
+    #
+    # bit require export
+    #
+    desc 'export', 'Create requirements file with bit components.'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Create requirements file with bit components
+    LONGDESC
+    # Create requirements file with bit components.
+    def export
+      bit_require_yml = bit_require_export
+      exit false if bit_require_yml == false
+      say bit_require_yml
+      true
+    end
+
+    #
+    # bit require import
+    #
+    desc 'import', 'Import bit components from requirements file.'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Import bit components from requirements file
+    LONGDESC
+    # Import bit components from requirements file.
+    def import
+      exit bit_require_import
+    end
+  end
+end

data/lib/takelage/bit/require/export.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# takelage bit require export
+module BitRequireExport
+  # Backend method for bit require export.
+  def bit_require_export
+    log.debug 'Running bit require export'
+
+    components = _bit_require_lib_get_components
+    bitrequire_yml = _bit_require_export_get_bitrequire_yml components
+
+    log.debug "bitrequire.yml of this project:\n#{bitrequire_yml}"
+    bitrequire_yml
+  end
+
+  private
+
+  # Create contents of bitrequire yaml file.
+  # rubocop:disable Metrics/AbcSize
+  def _bit_require_export_get_bitrequire_yml(components)
+    bitrequire = {}
+    components.each do |component|
+      scope = component['id'].clone.gsub!(%r{/.*}, '')
+      name = component['id'].clone.gsub!(%r{#{scope}/}, '')
+      bitrequire['scopes'] = { scope => [] } if bitrequire['scopes'].nil?
+      bitrequire['scopes'] = { scope => [] } unless bitrequire['scopes'].key? scope
+      bitrequire['scopes'][scope] << { 'name' => name }
+    end
+    hash_to_yaml bitrequire
+  end
+  # rubocop:enable Metrics/AbcSize
+end

data/lib/takelage/bit/require/import.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+# takelage bit require import
+module BitRequireImport
+  # Backend method for bit require import.
+  def bit_require_import
+    log.debug 'Running bit require import'
+
+    return false unless _bit_clipboard_lib_prepare_workspace
+
+    return false unless _bit_require_import_check_require_file_exists
+
+    scopes = _bit_require_import_get_scopes_and_components
+    return false unless scopes
+
+    components = _bit_require_import_get_components scopes
+    return false unless components
+
+    return false unless _bit_require_import_add_scopes scopes
+
+    _bit_require_import_paste_components components
+  end
+
+  private
+
+  # Check if a bit requirements file exists.
+  def _bit_require_import_check_require_file_exists
+    return true if File.exist? @bit_require_file
+
+    log.error "No #{@bit_require_file} file found"
+    false
+  end
+
+  # Get scopes and components from requirements file.
+  def _bit_require_import_get_scopes_and_components
+    bit_require = read_yaml_file(@bit_require_file)
+    return bit_require['scopes'] if bit_require.key?('scopes')
+
+    log.error "No scopes in #{@bit_require_file} file"
+    false
+  end
+
+  # Get flat components array.
+  def _bit_require_import_get_components(scopes)
+    components_all = []
+    scopes.each do |scope, components|
+      scope_components = _bit_require_import_get_scope_components scope, components
+      return false unless scope_components
+
+      components_all |= scope_components
+    end
+    components_all
+  end
+
+  # Get bit components of a scope.
+  def _bit_require_import_get_scope_components(scope, components)
+    scope_components = []
+    components.each do |component|
+      return false unless _bit_require_import_check_component_valid component, scope
+
+      name = component['name']
+      path = name
+      path = component['path'] if component.key?('path')
+      scope_components << { name: name, path: path, scope: scope }
+      log.debug "Identified bit component \"#{name}\" with path \"#{path}\" in scope \"#{scope}\""
+    end
+    scope_components
+  end
+
+  # Check if there are bit components
+  def _bit_require_import_check_component_valid(component, scope)
+    return true if (component.class == Hash) && component.key?('name')
+
+    log.error "No component in #{scope}"
+    false
+  end
+
+  # Add bit scopes to workspace.
+  def _bit_require_import_add_scopes(scopes)
+    scopes.each do |scope, _components|
+      bit_scope_add scope unless _bit_clipboard_bit_dev_scope_exists scope
+    end
+  end
+
+  # Paste bit components.
+  def _bit_require_import_paste_components(components)
+    _rakefile, path = Rake.application.find_rakefile_location
+    components.each do |component|
+      next if _bit_require_import_check_component_exists component, path
+
+      return false unless _bit_require_import_paste_component component
+
+      _bit_require_import_commit_component component, path
+    end
+    true
+  end
+
+  # Check if there are bit components
+  def _bit_require_import_check_component_exists(component, path)
+    scope = component[:scope]
+    cid = component[:name]
+    dir = component[:path]
+    dest = "#{path}/#{dir}"
+    cids = _bit_require_lib_get_components_ids
+    return false unless cids.include? "#{scope}/#{cid}"
+
+    log.warn "Skipping existing bit component \"#{scope}/#{cid}\" with path \"#{dest}\""
+    true
+  end
+
+  # Paste a bit component
+  def _bit_require_import_paste_component(component)
+    scope = component[:scope]
+    cid = component[:name]
+    dir = component[:path]
+    bit_clipboard_paste "#{scope}/#{cid}", dir
+  end
+
+  # Commit a bit component
+  def _bit_require_import_commit_component(component, path)
+    scope = component[:scope]
+    cid = component[:name]
+    dir = component[:path]
+    dest = "#{path}/#{dir}"
+    message = "Add bit component \"#{scope}/#{cid}\" to path \"#{dest}\""
+    _bit_clipboard_lib_git_add dest
+    _bit_clipboard_lib_git_commit message
+  end
+end

data/lib/takelage/bit/require/lib.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# takelage bit require lib
+module BitRequireLib
+  private
+
+  # Get bit components.
+  def _bit_require_lib_get_components
+    cmd_bit_list = config.active['cmd_bit_require_lib_bit_list']
+    bit_list = run cmd_bit_list
+    JSON.parse bit_list
+  end
+
+  # Get bit components ids.
+  def _bit_require_lib_get_components_ids
+    cmd_bit_list_ids = config.active['cmd_bit_require_lib_bit_list_ids']
+    run cmd_bit_list_ids
+  end
+end

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

@@ -9,7 +9,7 @@ module BitScopeList
 
     return false unless configured? %w[bit_ssh bit_remote]
 
-    # get ssh command from active config
+    # get ssh command from active config.
     cmd_bit_ssh =
       config.active['bit_ssh']
 
@@ -17,7 +17,7 @@ module BitScopeList
 
     cmd_bit_scope_list = _bit_scope_list_cmd root
 
-    # run ssh command with scope list command
+    # run ssh command with scope list command.
     scope_list = run "#{cmd_bit_ssh} '#{cmd_bit_scope_list}'"
 
     # remove bit remote root directory from results

data/lib/takelage/default.yml

@@ -1,6 +1,7 @@
 ---
 bit_dev_user: 'takelage'
 bit_remote: ''
+bit_require_file: 'bitrequire.yml'
 bit_root: '/bit'
 bit_ssh: ''
 cmd_bit_check_workspace_bit_list: 'bit list'
@@ -20,6 +21,9 @@ cmd_bit_clipboard_pull_bit_import_all: 'bit import --ignore-package-json --ignor
 cmd_bit_clipboard_pull_bit_checkout_all: 'bit checkout --ignore-package-json --ignore-dist --skip-update --skip-npm-install --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_clipboard_export_bit_list: 'bit list --skip-update --json %{scope}'
+cmd_bit_require_lib_bit_list: 'bit list --skip-update --json'
+cmd_bit_require_lib_bit_list_ids: 'bit list --skip-update --json --ids'
 cmd_bit_scope_add_scope: 'bit remote add %{remote}/%{scope}'
 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'
@@ -28,7 +32,7 @@ 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_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --docker_daemon_port %{docker_daemon_port} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
 cmd_docker_container_create_network: 'docker network create %{network}'
 cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
@@ -59,7 +63,6 @@ docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
 docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json'
 docker_shm_size: '512M'
-docker_socket_docker_daemon_port: 17873
 docker_socket_gpg_agent_port: 17874
 docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'

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

@@ -22,6 +22,7 @@ module DockerContainerCheckExisting
 
   private
 
+  # Format command to check if docker container exists.
   def _docker_container_cmd_check_existing(container)
     format(
       config.active['cmd_docker_container_check_existing_docker_ps'],

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

@@ -22,6 +22,7 @@ module DockerContainerCheckNetwork
 
   private
 
+  # Prepare command to check if docker network exists.
   def _docker_container_cmd_check_network(network)
     format(
       config.active['cmd_docker_container_check_network_docker_network'],

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

@@ -22,6 +22,7 @@ module DockerContainerCheckOrphaned
 
   private
 
+  # Format command to check if docker container is orphaned.
   def _docker_container_cmd_check_orphaned(container)
     format(
       config.active['cmd_docker_container_check_orphaned_docker_exec'],

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

@@ -16,7 +16,7 @@ module DockerContainerClean
 
   private
 
-  # Check if we are running tau clean inside a takelage container
+  # Check if we are running tau clean inside a takelage container.
   def _docker_container_clean_harakiri?
     hostname = ENV['HOSTNAME'] || ''
     return false unless hostname.start_with? "#{@docker_repo}_"
@@ -26,7 +26,7 @@ module DockerContainerClean
     true
   end
 
-  # Kill all docker containers and return list of networks
+  # Kill all docker containers and return list of networks.
   def _docker_container_clean_kill_existing_containers
     networks = []
     _docker_container_lib_get_containers.each do |container|

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

@@ -2,12 +2,14 @@
 
 # takelage docker container lib
 # rubocop:disable Metrics/ModuleLength
+# rubocop:disable Style/IfUnlessModifier
 module DockerContainerLib
   private
 
   # Create docker container and network.
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_net_and_ctr(name)
+    return false if _docker_container_lib_check_matrjoschka
+
     unless docker_container_check_network name
       _docker_container_lib_create_network name
     end
@@ -16,10 +18,8 @@ module DockerContainerLib
 
     _docker_container_lib_create_container name
   end
-  # rubocop:enable Style/IfUnlessModifier
 
   # Remove docker networks.
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_remove_networks(networks)
     networks.each do |network|
       if docker_container_check_network network
@@ -27,7 +27,6 @@ module DockerContainerLib
       end
     end
   end
-  # rubocop:enable Style/IfUnlessModifier
 
   # Create docker network.
   def _docker_container_lib_create_network(network)
@@ -56,7 +55,6 @@ module DockerContainerLib
   # Create docker container.
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
@@ -83,7 +81,7 @@ module DockerContainerLib
       addhost: addhost,
       container: container,
       docker_run_options: config.active['docker_run_options'],
-      docker_daemon_port: config.active['docker_socket_docker_daemon_port'],
+      dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
       extra: config.active['docker_entrypoint_extra'],
@@ -102,10 +100,19 @@ module DockerContainerLib
 
     try cmd_docker_create
   end
-  # rubocop:enable Style/IfUnlessModifier
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
+  # Check if we are already inside a takelage container
+  def _docker_container_lib_check_matrjoschka
+    log.debug 'Checking if we are already inside a takelage container'
+
+    return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
+
+    log.error 'You cannot log in to takelage from within takelage'
+    true
+  end
+
   # Check if docker image is available
   def _docker_container_lib_image_available?(image)
     return true if docker_image_tag_list_local.include? @docker_tag
@@ -157,4 +164,5 @@ module DockerContainerLib
     run cmd_docker_stop
   end
 end
+# rubocop:enable Style/IfUnlessModifier
 # rubocop:enable Metrics/ModuleLength

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

@@ -14,7 +14,7 @@ module DockerContainerPrune
 
   private
 
-  # Kill orphaned docker containers and return list of networks
+  # Kill orphaned docker containers and return list of networks.
   def _docker_container_prune_kill_orphaned_containers
     networks = []
 

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

@@ -23,7 +23,7 @@ module DockerSocketLib
     cmds_start_socket
   end
 
-  # Get socket start command
+  # Get socket start command.
   def _docker_socket_lib_get_start_cmd(mode, socket, host, port, path)
     if mode == 'start'
       unless _docker_socket_lib_socket_up? socket, host, port, path
@@ -45,7 +45,7 @@ module DockerSocketLib
     )
   end
 
-  # Check if a socket is available by trying to connect to it via TCP
+  # Check if a socket is available by trying to connect to it via TCP.
   def _docker_socket_lib_socket_up?(socket, host, port, path)
     error_message = _docker_socket_lib_error_msg socket, host, port, path
     begin

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

@@ -6,34 +6,20 @@ module DockerSocketScheme
   def docker_socket_scheme
     log.debug 'Getting docker socket scheme'
 
-    socket_scheme = _socket_get_scheme _socket_get_config
+    gpg_path = _socket_get_agent_socket_path
+    gpg_port = config.active['docker_socket_gpg_agent_port']
+    ssh_path = _socket_get_agent_ssh_socket_path
+    ssh_port = config.active['docker_socket_gpg_ssh_agent_port']
 
-    log.debug "Docker socket scheme is \n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
+    socket_scheme = _socket_get_scheme gpg_path, gpg_port, ssh_path, ssh_port
+    log.debug 'Docker socket scheme is ' \
+      "\n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
 
     socket_scheme
   end
 
   private
 
-  # Get docker socket config.
-  def _socket_get_config
-    socket_config = {
-      'docker_path' => _socket_get_docker_daemon_path,
-      'docker_port' => config.active['docker_socket_docker_daemon_port'],
-      'gpg_path' => _socket_get_agent_socket_path,
-      'gpg_port' => config.active['docker_socket_gpg_agent_port'],
-      'ssh_path' => _socket_get_agent_ssh_socket_path,
-      'ssh_port' => config.active['docker_socket_gpg_ssh_agent_port']
-    }
-
-    socket_config
-  end
-
-  # Get docker socket path.
-  def _socket_get_docker_daemon_path
-    '/var/run/docker.sock'
-  end
-
   # Get gpg agent socket path.
   def _socket_get_agent_socket_path
     cmd_agent_socket_path =
@@ -49,15 +35,12 @@ module DockerSocketScheme
   end
 
   # Create socket scheme.
-  def _socket_get_scheme(socket_config)
-    { 'docker-daemon' => { 'path' => socket_config['docker_path'],
-                           'host' => @socket_host,
-                           'port' => socket_config['docker_port'] },
-      'gpg-agent' => { 'path' => socket_config['gpg_path'],
-                       'host' => @socket_host,
-                       'port' => socket_config['gpg_port'] },
-      'gpg-ssh-agent' => { 'path' => socket_config['ssh_path'],
-                           'host' => @socket_host,
-                           'port' => socket_config['ssh_port'] } }
+  def _socket_get_scheme(gpg_path, gpg_port, ssh_path, ssh_port)
+    { 'agent-socket' => { 'path' => gpg_path,
+                          'host' => @socket_host,
+                          'port' => gpg_port },
+      'agent-ssh-socket' => { 'path' => ssh_path,
+                              'host' => @socket_host,
+                              'port' => ssh_port } }
   end
 end

data/lib/takelage/lib/config.rb

@@ -19,6 +19,7 @@ module ConfigModule
   end
 
   # Initialze config
+  # rubocop:disable Metrics/AbcSize
   def initialize_config
     log.debug "takelage version: #{Takelage::VERSION}"
     log.debug "Current working directory: #{Dir.pwd}"
@@ -28,6 +29,7 @@ module ConfigModule
     TakelageConfig.instance.project = _config_read_project
     TakelageConfig.instance.active = _config_merge_active
   end
+  # rubocop:enable Metrics/AbcSize
 
   # @return [Object] global singleton config
   def config
@@ -55,7 +57,7 @@ module ConfigModule
     false
   end
 
-  # Check if config key is nil or empty
+  # Check if config key is nil or empty.
   def _check_key_set?(config_key)
     takel_config_key = TakelageConfig.instance.active[config_key]
     return true unless takel_config_key.nil? || takel_config_key.empty?
@@ -99,7 +101,7 @@ module ConfigModule
     project_yaml.sort.to_h
   end
 
-  # Merge active config
+  # Merge active config.
   def _config_merge_active
     # make a clone or else we'll change the original hash
     default = TakelageConfig.instance.default.clone

data/lib/takelage/lib/logging.rb

@@ -28,12 +28,14 @@ module LoggingModule
 
   private
 
+  # Get log format.
   def _logging_get_log_format
     proc do |severity, _datetime, _progname, msg|
       "[#{severity}] #{msg}\n"
     end
   end
 
+  # Get log level.
   def _logging_get_log_level(loglevel)
     if %w[FATAL ERROR WARN INFO DEBUG].include? loglevel
       loglevel

data/lib/takelage/lib/subcmd.rb

@@ -2,12 +2,12 @@
 
 # Thor with subcommands that work correctly with help
 class SubCommandBase < Thor
-  # Set the subcommand banner
+  # Set the subcommand banner.
   def self.banner(command, _namespace = nil, _subcommand = false)
     "#{basename} #{subcommand_prefix} #{command.usage}"
   end
 
-  # Set the subcommand prefix
+  # Set the subcommand prefix.
   def self.subcommand_prefix
     name.gsub(/.*::/, '')
         .gsub(/^[A-Z]/) { |match| match[0].downcase }

data/lib/takelage/self/list.rb

@@ -20,6 +20,7 @@ module SelfList
 
   private
 
+  # Manipulate output of thor list command.
   def _manipulate_output_(thor_list)
     thor_list.gsub!("takelage\n", '')
     thor_list.gsub!("------\n", '')

data/lib/takelage/version

@@ -1 +1 @@
-0.18.0
+0.20.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Geospin
@@ -214,6 +214,10 @@ files:
 - lib/takelage/bit/clipboard/paste.rb
 - lib/takelage/bit/clipboard/pull.rb
 - lib/takelage/bit/clipboard/push.rb
+- lib/takelage/bit/require/cli.rb
+- lib/takelage/bit/require/export.rb
+- lib/takelage/bit/require/import.rb
+- lib/takelage/bit/require/lib.rb
 - lib/takelage/bit/scope/add.rb
 - lib/takelage/bit/scope/cli.rb
 - lib/takelage/bit/scope/inbit.rb
@@ -284,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="