takelage 0.20.1 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d318a7c4c17c6319e50997f41934e44a39fb6fddd58c66f8f1da168a5e21d54
-  data.tar.gz: f56501c87c2044f41e9b7f66473aeb3c1244a1b6ec983b4853d7e2565b65f4e4
+  metadata.gz: 240831f6c4308e8336a2d476a4ff3f5b728804e7e03d4e1463c9262fff7d2b56
+  data.tar.gz: 85d29bb364dbaf5758f51813a1f6388c9ad6babd417da65d30b6907283147c9f
 SHA512:
-  metadata.gz: 2450ffc17a6e8efe1e8bc3195136253bce595f91e098018e890d5e182fe837beb98d6dbba3a3d22c0f3e2db3d58b4104213042d3898c4e457e53f6076860e04d
-  data.tar.gz: 301cbb253cc736a39264476385e595f4b0c07f9dbcecec3a39325176c964a6ec51f582d2acf29cdfb90ead7fec3f586e136f2850918349db9d82e86e7b18af6f
+  metadata.gz: cfa4649517e1818407361da9e3a17832cb010dbcc6d79139e05e95f355838ae175f09b5959b338972b7953b1a11d8fdf04b31b21f8c7c6451026b93837cd1c55
+  data.tar.gz: ad5526d627c8cdb72d21936de73c8990782eb85f908ed405eab683bcc67b8e03dab564891636d919ab65c2cf4cce1d329efc4f28e8bd192d2ce2d60b64d15046

data/README.md

@@ -42,68 +42,68 @@ You are encouraged to read the cucumber feature files
 for the *tau* commands
 to get an idea of how the commands work.
 You can list the *tau* commands by running
-*tau [self list](features/takelage/self/self.list.feature)*
+*tau [self list](features/cucumber/features/self/self.list.feature)*
 or *tau list*:
 
 Command	| Description
 ------- | -----------
-tau [bit check workspace](features/takelage/bit/bit.check.workspace.feature) | Check if a bit workspace exists
-tau [bit clipboard copy](features/takelage/bit/bit.clipboard.copy.feature) [DIR] [SCOPE] | Copy new [DIR] to [SCOPE]
-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
-tau [bit scope new](features/takelage/bit/bit.scope.new.feature) [SCOPE] | Init a new bit [SCOPE]
-tau [completion bash](features/takelage/completion/completion.bash.feature) | Print bash completion code
-tau [docker check running](features/takelage/docker/docker.check.running.feature) | Check if docker daemon is running
-tau [docker container check existing](features/takelage/docker/docker.container.check.existing.feature) [CONTAINER] | Check if docker [CONTAINER] is existing
-tau [docker container check network](features/takelage/docker/docker.container.check.network.feature) [NETWORK] | Check if docker [NETWORK] is existing
-tau [docker container check orphaned](features/takelage/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned
-tau [docker container command](features/takelage/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
-tau [docker container daemon](features/takelage/docker/docker.container.daemon.feature) | Run docker container in daemon mode
-tau [docker container login](features/takelage/docker/docker.container.login.feature) | Log in to latest local docker container
-tau [docker container clean](features/takelage/docker/docker.container.clean.feature) | Remove all docker containers
-tau [docker container prune](features/takelage/docker/docker.container.prune.feature) | Remove orphaned docker containers
-tau [docker image check outdated](features/takelage/docker/docker.image.check.outdated.feature) | Check if a docker image is outdated
-tau [docker image tag check local](features/takelage/docker/docker.image.tag.check.local.feature) [TAG] | Check if local docker image [TAG] exists
-tau [docker image tag check remote](features/takelage/docker/docker.image.tag.check.remote.feature) [TAG] | Check if remote docker image [TAG] exists
-tau [docker image tag latest local](features/takelage/docker/docker.image.tag.latest.local.feature) | Print latest local docker image tag
-tau [docker image tag latest remote](features/takelage/docker/docker.image.tag.latest.remote.feature) | Print latest remote docker image tag
-tau [docker image tag list local](features/takelage/docker/docker.image.tag.list.local.feature) | Print local docker image tags
-tau [docker image tag list remote](features/takelage/docker/docker.image.tag.list.remote.feature) | Print remote docker image tags
-tau [docker image update](features/takelage/docker/docker.image.update.feature) | Get latest remote docker container
-tau [docker socket host](features/takelage/docker/docker.socket.host.feature) | Print docker socket host ip address
-tau [docker socket scheme](features/takelage/docker/docker.socket.scheme.feature) | Print docker socket scheme
-tau [docker socket start](features/takelage/docker/docker.socket.start.feature) | Start sockets for docker container
-tau [docker socket stop](features/takelage/docker/docker.socket.stop.feature) | Stop sockets for docker container
-tau [git check clean](features/takelage/git/git.check.clean.feature) | Check if the git workspace is clean
-tau [git check master](features/takelage/git/git.check.master.feature) | Check if we are on the git master branch
-tau [git check workspace](features/takelage/git/git.check.workspace.feature) | Check if a git workspace exists
-tau [info project active](features/takelage/info/info.project.active.feature) | Print active project info
-tau [info project main](features/takelage/info/info.project.main.feature) | Print main project info
-tau [info project private](features/takelage/info/info.project.private.feature) | Print private project info
-tau [self config active](features/takelage/self/self.config.active.feature) | Print active takelage configuration
-tau [self config default](features/takelage/self/self.config.default.feature) | Print takelage default configuration
-tau [self config home](features/takelage/self/self.config.home.feature) | Print takelage home config file configuration
-tau [self config project](features/takelage/self/self.config.project.feature) | Print takelage project config file configuration
-tau [self list](features/takelage/self/self.list.feature) | List all commands
-tau [self version](features/takelage/self/self.version.feature) | Print tau semantic version number
-tau config | Alias for tau [self config active](features/takelage/self/self.config.active.feature)
-tau copy [DIR] [SCOPE] | Alias for tau [bit clipboard copy](features/takelage/bit/bit.clipboard.copy.feature)
-tau list | Alias for tau [self list](features/takelage/self/self.list.feature)
-tau login | Alias for tau [docker container login](features/takelage/docker/docker.container.login.feature)
-tau clean | Alias for tau [docker container clean](features/takelage/docker/docker.container.clean.feature)
-tau paste [COMPONENT] [DIR] | Alias for tau [bit clipboard paste](features/takelage/bit/bit.clipboard.paste.feature)
-tau project | Alias for tau [info project active](features/takelage/info/info.project.active.feature)
-tau pull | Alias for tau [bit clipboard pull](features/takelage/bit/bit.clipboard.pull.feature)
-tau prune | Alias for tau [docker container prune](features/takelage/docker/docker.container.prune.feature)
-tau push | Alias for tau [bit clipboard push](features/takelage/bit/bit.clipboard.push.feature)
-tau update | Alias for tau [docker image update](features/takelage/docker/docker.image.update.feature)
-tau version | Alias for tau [self version](features/takelage/self/self.version.feature)
+tau [bit check workspace](features/cucumber/features/bit/bit.check.workspace.feature) | Check if a bit workspace exists
+tau [bit clipboard copy](features/cucumber/features/bit/bit.clipboard.copy.feature) [DIR] [SCOPE] | Copy new [DIR] to [SCOPE]
+tau [bit clipboard paste](features/cucumber/features/bit/bit.clipboard.paste.feature) [COMPONENT] [DIR] | Paste bit [COMPONENT] into [DIR]
+tau [bit clipboard pull](features/cucumber/features/bit/bit.clipboard.pull.feature) | Pull all updates for bit components from bit remote scopes
+tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.feature) | Push all updates of bit components to bit remote scopes
+tau [bit require export](features/cucumber/features/bit/bit.require.export.feature) | Show requirements file of bit components
+tau [bit require import](features/cucumber/features/bit/bit.require.import.feature) | Import bit components from requirements file
+tau [bit scope add](features/cucumber/features/bit/bit.scope.add.feature) [SCOPE] | Add a bit [SCOPE]
+tau [bit scope inbit](features/cucumber/features/bit/bit.scope.inbit.feature) | Log in to bit remote server
+tau [bit scope list](features/cucumber/features/bit/bit.scope.list.feature) | List bit remote scopes
+tau [bit scope new](features/cucumber/features/bit/bit.scope.new.feature) [SCOPE] | Init a new bit [SCOPE]
+tau [completion bash](features/cucumber/features/completion/completion.bash.feature) | Print bash completion code
+tau [docker check running](features/cucumber/features/docker/docker.check.running.feature) | Check if docker daemon is running
+tau [docker container check existing](features/cucumber/features/docker/docker.container.check.existing.feature) [CONTAINER] | Check if docker [CONTAINER] is existing
+tau [docker container check network](features/cucumber/features/docker/docker.container.check.network.feature) [NETWORK] | Check if docker [NETWORK] is existing
+tau [docker container check orphaned](features/cucumber/features/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned
+tau [docker container command](features/cucumber/features/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
+tau [docker container daemon](features/cucumber/features/docker/docker.container.daemon.feature) | Run docker container in daemon mode
+tau [docker container login](features/cucumber/features/docker/docker.container.login.feature) | Log in to latest local docker container
+tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature) | Remove all docker containers
+tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature) | Remove orphaned docker containers
+tau [docker image check outdated](features/cucumber/features/docker/docker.image.check.outdated.feature) | Check if a docker image is outdated
+tau [docker image tag check local](features/cucumber/features/docker/docker.image.tag.check.local.feature) [TAG] | Check if local docker image [TAG] exists
+tau [docker image tag check remote](features/cucumber/features/docker/docker.image.tag.check.remote.feature) [TAG] | Check if remote docker image [TAG] exists
+tau [docker image tag latest local](features/cucumber/features/docker/docker.image.tag.latest.local.feature) | Print latest local docker image tag
+tau [docker image tag latest remote](features/cucumber/features/docker/docker.image.tag.latest.remote.feature) | Print latest remote docker image tag
+tau [docker image tag list local](features/cucumber/features/docker/docker.image.tag.list.local.feature) | Print local docker image tags
+tau [docker image tag list remote](features/cucumber/features/docker/docker.image.tag.list.remote.feature) | Print remote docker image tags
+tau [docker image update](features/cucumber/features/docker/docker.image.update.feature) | Get latest remote docker container
+tau [docker socket host](features/cucumber/features/docker/docker.socket.host.feature) | Print docker socket host ip address
+tau [docker socket scheme](features/cucumber/features/docker/docker.socket.scheme.feature) | Print docker socket scheme
+tau [docker socket start](features/cucumber/features/docker/docker.socket.start.feature) | Start sockets for docker container
+tau [docker socket stop](features/cucumber/features/docker/docker.socket.stop.feature) | Stop sockets for docker container
+tau [git check clean](features/cucumber/features/git/git.check.clean.feature) | Check if the git workspace is clean
+tau [git check main](features/cucumber/features/git/git.check.main.feature) | Check if we are on the git main branch
+tau [git check workspace](features/cucumber/features/git/git.check.workspace.feature) | Check if a git workspace exists
+tau [info project active](features/cucumber/features/info/info.project.active.feature) | Print active project info
+tau [info project main](features/cucumber/features/info/info.project.main.feature) | Print main project info
+tau [info project private](features/cucumber/features/info/info.project.private.feature) | Print private project info
+tau [self config active](features/cucumber/features/self/self.config.active.feature) | Print active takelage configuration
+tau [self config default](features/cucumber/features/self/self.config.default.feature) | Print takelage default configuration
+tau [self config home](features/cucumber/features/self/self.config.home.feature) | Print takelage home config file configuration
+tau [self config project](features/cucumber/features/self/self.config.project.feature) | Print takelage project config file configuration
+tau [self list](features/cucumber/features/self/self.list.feature) | List all commands
+tau [self version](features/cucumber/features/self/self.version.feature) | Print tau semantic version number
+tau config | Alias for tau [self config active](features/cucumber/features/self/self.config.active.feature)
+tau copy [DIR] [SCOPE] | Alias for tau [bit clipboard copy](features/cucumber/features/bit/bit.clipboard.copy.feature)
+tau list | Alias for tau [self list](features/cucumber/features/self/self.list.feature)
+tau login | Alias for tau [docker container login](features/cucumber/features/docker/docker.container.login.feature)
+tau clean | Alias for tau [docker container clean](features/cucumber/features/docker/docker.container.clean.feature)
+tau paste [COMPONENT] [DIR] | Alias for tau [bit clipboard paste](features/cucumber/features/bit/bit.clipboard.paste.feature)
+tau project | Alias for tau [info project active](features/cucumber/features/info/info.project.active.feature)
+tau pull | Alias for tau [bit clipboard pull](features/cucumber/features/bit/bit.clipboard.pull.feature)
+tau prune | Alias for tau [docker container prune](features/cucumber/features/docker/docker.container.prune.feature)
+tau push | Alias for tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.feature)
+tau update | Alias for tau [docker image update](features/cucumber/features/docker/docker.image.update.feature)
+tau version | Alias for tau [self version](features/cucumber/features/self/self.version.feature)
 
 **Warning: *tau update* will call *docker image prune* and remove all dangling images!**
 
@@ -115,7 +115,7 @@ tau version | Alias for tau [self version](features/takelage/self/self.version.f
 which have different precedences.
 They are merged to an active configuration during runtime
 which can be inspected with 
-*tau [self config active](features/takelage/self/self.config.active.feature)*
+*tau [self config active](features/cucumber/features/self/self.config.active.feature)*
 or *tau config*.
 
 | Filename | Precedence | Description |
@@ -168,7 +168,7 @@ Furthermore, every external command can be reconfigured.
 which have different precedences.
 They are merged to an active configuration during runtime
 which can be inspected with 
-*tau [info project active](features/takelage/info/info.project.active.feature)*
+*tau [info project active](features/cucumber/features/info/info.project.active.feature)*
 or *tau project*.
 
 | Default filename | Config key | Precedence | Description |
@@ -186,8 +186,11 @@ source <(tau completion bash)
 
 ### Software Tests
 
+*takelage-cli* uses
+[minitest](https://github.com/seattlerb/minitest) unit tests.
+
 *takelage-cli* ships with 
-[cucumber](https://github.com/cucumber/cucumber) ruby tests.
+[cucumber](https://github.com/cucumber/cucumber) ruby system tests.
 It uses cucumber's 
 [aruba](https://github.com/cucumber/aruba) extension and especially its
 [filesystem](https://relishapp.com/cucumber/aruba/v/0-11-0/docs/filesystem)

data/lib/takelage.rb

@@ -21,7 +21,7 @@ require_relative 'takelage/lib/config'
 require_relative 'takelage/lib/project'
 
 require_relative 'takelage/git/check/clean'
-require_relative 'takelage/git/check/master'
+require_relative 'takelage/git/check/main'
 require_relative 'takelage/git/check/workspace'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'

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

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitClipboardLib

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

@@ -9,6 +9,8 @@ module BitClipboardCopy
 
     log.debug "Running bit copy \"#{dir}\" to \"#{scope}\""
 
+    return false unless configured? %w[project_root_dir]
+
     return false unless _bit_clipboard_lib_prepare_workspace
 
     unless File.directory? dir
@@ -69,7 +71,7 @@ module BitClipboardCopy
     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 + '.'
+    if scope.start_with? "#{bit_dev}."
       return false unless _bit_clipboard_bit_dev_scope_exists scope
     else
       return false unless _bit_clipboard_custom_scope_exists scope

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

@@ -4,6 +4,14 @@
 module BitClipboardLib
   private
 
+  # Run bit status.
+  def _bit_clipboard_lib_bit_status
+    log.debug 'Running bit status'
+
+    cmd_bit_status = config.active['cmd_bit_clipboard_lib_bit_status']
+    run_and_exit cmd_bit_status
+  end
+
   # Prepare workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_workspace
     unless bit_check_workspace
@@ -18,8 +26,8 @@ module BitClipboardLib
 
   # Prepare git workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_master
-      log.error 'Not on git master branch'
+    unless git_check_main
+      log.error 'Not on git main branch'
       return false
     end
 
@@ -51,7 +59,7 @@ module BitClipboardLib
   def _bit_clipboard_lib_sync_workspace
     log.debug 'Syncing git workspace'
 
-    _rakefile, path = Rake.application.find_rakefile_location
+    path = config.active['project_root_dir']
     file = "#{path}/.bitmap"
     message = 'Update .bitmap'
 
@@ -83,12 +91,14 @@ module BitClipboardLib
     run cmd_bit_clipboard_git_commit
   end
 
-  # git push origin master.
+  # git push origin main.
   def _bit_clipboard_lib_git_push
-    log.debug 'Pushing master branch to origin'
+    log.debug 'Pushing main branch to origin'
 
-    cmd_bit_clipboard_git_push =
-      config.active['cmd_bit_clipboard_git_push']
+    cmd_bit_clipboard_git_push = format(
+      config.active['cmd_bit_clipboard_git_push'],
+      main: config.active['git_main_branch']
+    )
 
     run cmd_bit_clipboard_git_push
   end
@@ -96,8 +106,10 @@ module BitClipboardLib
   # git pull.
   def _bit_clipboard_lib_git_pull
     log.debug 'Updating git workspace'
-    cmd_bit_clipboard_git_pull =
-      config.active['cmd_bit_clipboard_git_pull']
+    cmd_bit_clipboard_git_pull = format(
+      config.active['cmd_bit_clipboard_git_pull'],
+      main: config.active['git_main_branch']
+    )
 
     return true if try cmd_bit_clipboard_git_pull
 

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

@@ -6,6 +6,8 @@ module BitClipboardPaste
   def bit_clipboard_paste(cid, dir)
     log.debug "Running bit paste \"#{cid}\" to \"#{dir}\""
 
+    return false unless configured? %w[project_root_dir]
+
     return false unless _bit_clipboard_lib_prepare_workspace
 
     return false unless _bit_clipboard_paste_cid_exists? cid
@@ -40,7 +42,7 @@ module BitClipboardPaste
 
     bit_list_scope = _bit_clipboard_paste_cid_exists_list_scope scope
 
-    return true if bit_list_scope.include? '"id": "' + cid + '",'
+    return true if bit_list_scope.include? "\"id\": \"#{cid}\","
 
     log.error "No remote component \"#{cid}\""
     false

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

@@ -6,15 +6,15 @@ module BitClipboardPull
   def bit_clipboard_pull
     log.debug 'Running bit pull'
 
+    return false unless configured? %w[project_root_dir]
+
     return false unless _bit_clipboard_lib_prepare_workspace
 
     _bit_clipboard_pull_import_all
     _bit_clipboard_pull_checkout_all
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
-
-    log.info 'Pulled bit components'
-    true
+    _bit_clipboard_lib_bit_status
   end
 
   private

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

@@ -6,15 +6,15 @@ module BitClipboardPush
   def bit_clipboard_push
     log.debug 'Running bit push'
 
+    return false unless configured? %w[project_root_dir]
+
     return false unless _bit_clipboard_lib_prepare_workspace
 
     _bit_clipboard_push_tag_all
     _bit_clipboard_push_export_all
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
-
-    log.info 'Pushed bit components'
-    true
+    _bit_clipboard_lib_bit_status
   end
 
   private

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

@@ -7,7 +7,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckClean
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeList

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

@@ -6,6 +6,8 @@ module BitRequireExport
   def bit_require_export
     log.debug 'Running bit require export'
 
+    return false unless configured? %w[project_root_dir]
+
     components = _bit_require_lib_get_components
     bitrequire_yml = _bit_require_export_get_bitrequire_yml components
 

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

@@ -6,6 +6,8 @@ module BitRequireImport
   def bit_require_import
     log.debug 'Running bit require import'
 
+    return false unless configured? %w[project_root_dir]
+
     return false unless _bit_clipboard_lib_prepare_workspace
 
     return false unless _bit_require_import_check_require_file_exists
@@ -69,7 +71,7 @@ module BitRequireImport
 
   # Check if there are bit components
   def _bit_require_import_check_component_valid(component, scope)
-    return true if (component.class == Hash) && component.key?('name')
+    return true if component.instance_of?(Hash) && component.key?('name')
 
     log.error "No component in #{scope}"
     false
@@ -84,7 +86,9 @@ module BitRequireImport
 
   # Paste bit components.
   def _bit_require_import_paste_components(components)
-    _rakefile, path = Rake.application.find_rakefile_location
+    path = config.active['project_root_dir']
+    return false if path.empty?
+
     components.each do |component|
       next if _bit_require_import_check_component_exists component, path
 

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

@@ -28,9 +28,9 @@ module BitScopeAdd
 
     return true unless git_check_workspace
 
-    return true if git_check_master
+    return true if git_check_main
 
-    log.error 'Not on git master branch'
+    log.error 'Not on git main branch'
     false
   end
 

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

@@ -6,7 +6,7 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include GitCheckMaster
+    include GitCheckMain
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeAdd

data/lib/takelage/default.yml

@@ -6,6 +6,7 @@ bit_root: '/bit'
 bit_ssh: ''
 cmd_bit_check_workspace_bit_list: 'bit list'
 cmd_bit_check_workspace_pwd: 'pwd'
+cmd_bit_clipboard_lib_bit_status: 'bit status'
 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}'
@@ -13,8 +14,8 @@ 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_git_add: 'git add %{file}'
 cmd_bit_clipboard_git_commit: 'git commit --message="%{message}"'
-cmd_bit_clipboard_git_pull: 'git pull origin master'
-cmd_bit_clipboard_git_push: 'git push origin master'
+cmd_bit_clipboard_git_pull: 'git pull origin %{main}'
+cmd_bit_clipboard_git_push: 'git push origin %{main}'
 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'
@@ -53,7 +54,7 @@ cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 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_main_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
@@ -67,5 +68,6 @@ docker_socket_gpg_agent_port: 17874
 docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'
 docker_user: 'takelage'
+git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'

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,13 +24,12 @@ 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?
+      if (addr_info.name == 'docker0') && addr_info.addr.ipv4?
+        socket_host = addr_info.addr.ip_address
+        break
       end
     end
 
-    log.debug "Docker socket host ip address is \"#{socket_host}\""
-
     socket_host
   end
 end

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/lib/config.rb

@@ -21,12 +21,15 @@ module ConfigModule
   # Initialze config
   # rubocop:disable Metrics/AbcSize
   def initialize_config
+    project_root_dir = _get_project_root_dir
+
     log.debug "takelage version: #{Takelage::VERSION}"
     log.debug "Current working directory: #{Dir.pwd}"
+    log.debug "Project root directory: #{project_root_dir}" unless project_root_dir.empty?
 
-    TakelageConfig.instance.default = _config_read_default
+    TakelageConfig.instance.default = _config_read_default project_root_dir
     TakelageConfig.instance.home = _config_read_home
-    TakelageConfig.instance.project = _config_read_project
+    TakelageConfig.instance.project = _config_read_project project_root_dir
     TakelageConfig.instance.active = _config_merge_active
   end
   # rubocop:enable Metrics/AbcSize
@@ -62,19 +65,25 @@ module ConfigModule
     takel_config_key = TakelageConfig.instance.active[config_key]
     return true unless takel_config_key.nil? || takel_config_key.empty?
 
-    log.error "Unset config key. Please configure \"#{config_key}\""
+    if config_key == 'project_root_dir'
+      log.error 'Please create a "Rakefile" in the project root directory'
+    else
+      log.error "Unset config key. Please configure \"#{config_key}\""
+    end
     @configured = false
     false
   end
 
   # Read default config file in lib.
-  def _config_read_default
+  def _config_read_default(project_root_dir)
     default_file = File.expand_path("#{File.dirname(__FILE__)}/../default.yml")
 
-    return {} unless File.exist? default_file
+    return { project_root_dir: project_root_dir } unless File.exist? default_file
 
     default_yaml = read_yaml_file(default_file) || {}
 
+    default_yaml['project_root_dir'] = project_root_dir
+
     default_yaml.sort.to_h
   end
 
@@ -84,21 +93,16 @@ module ConfigModule
 
     return {} unless File.exist? home_file
 
-    home_yaml = read_yaml_file(home_file) || {}
-
-    home_yaml.sort.to_h
+    (read_yaml_file(home_file) || {}).sort.to_h
   end
 
-  # Read custom config file next to Rakefile.
-  def _config_read_project
-    _rakefile, path = Rake.application.find_rakefile_location
-    project_file = "#{path}/takelage.yml"
+  # Read custom config file in project root.
+  def _config_read_project(project_root_dir)
+    project_file = "#{project_root_dir}/takelage.yml"
 
     return {} unless File.exist? project_file
 
-    project_yaml = read_yaml_file(project_file) || {}
-
-    project_yaml.sort.to_h
+    (read_yaml_file(project_file) || {}).sort.to_h
   end
 
   # Merge active config.
@@ -113,4 +117,14 @@ module ConfigModule
     project_over_home = home.merge!(project)
     default.merge!(project_over_home).sort.to_h
   end
+
+  # Get project root directory.
+  # @return [String] project root directory
+  def _get_project_root_dir
+    _rakefile, path = Rake.application.find_rakefile_location
+    return path unless path.nil?
+
+    log.debug 'No "Rakefile" found. Cannot determine project root directory.'
+    ''
+  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

@@ -34,24 +34,24 @@ module ProjectModule
 
   # Read main YAML file.
   def _project_read_main
-    _rakefile, @path = Rake.application.find_rakefile_location
-    main_file = "#{@path}/" \
+    path = TakelageProject.instance.config.active['project_root_dir']
+    main_file = "#{path}/" \
         "#{TakelageProject.instance.config.active['info_project_main']}"
 
     return {} unless File.exist? main_file
 
-    read_yaml_file(main_file).sort.to_h || {}
+    (read_yaml_erb_file(main_file) || {}).sort.to_h
   end
 
   # Read private YAML file.
   def _project_read_private
-    _rakefile, @path = Rake.application.find_rakefile_location
-    private_file = "#{@path}/" \
+    path = TakelageProject.instance.config.active['project_root_dir']
+    private_file = "#{path}/" \
         "#{TakelageProject.instance.config.active['info_project_private']}"
 
     return {} unless File.exist? private_file
 
-    private_yaml = read_yaml_file(private_file) || {}
+    private_yaml = read_yaml_erb_file(private_file) || {}
 
     private_yaml.sort.to_h
   end

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/lib/system.rb

@@ -20,7 +20,19 @@ module SystemModule
     log.debug "Reading YAML file \"#{file}\""
     return nil unless _file_exists? file
     return nil unless _file_read file
-    return nil unless _parse_yaml @content_yaml
+    return nil unless _parse_yaml file, @content_file
+
+    @content
+  end
+
+  # Read yaml file with erb templates.
+  # @return [Hash] content of yaml file
+  def read_yaml_erb_file(file)
+    log.debug "Reading YAML ERB file \"#{file}\""
+    return nil unless _file_exists? file
+    return nil unless _file_read file
+    return nil unless _parse_erb file, @content_file
+    return nil unless _parse_yaml file, @content_yaml
 
     @content
   end
@@ -82,7 +94,7 @@ module SystemModule
   # Read yaml file.
   def _file_read(file)
     begin
-      @content_yaml = File.read file
+      @content_file = File.read file
     rescue SystemCallError
       log.debug "Unable to read file \"#{file}\""
       return false
@@ -90,8 +102,21 @@ module SystemModule
     true
   end
 
+  # Parse erb file.
+  def _parse_erb(file, content_erb)
+    begin
+      @content_yaml = ERB.new(content_erb).result
+    rescue StandardError => e
+      log.debug e.class
+      log.debug "Invalid ERB in YAML file \"#{file}\". " \
+        "#{e.class}: \"#{e.message}\""
+      return false
+    end
+    true
+  end
+
   # Parse yaml file.
-  def _parse_yaml(content_yaml)
+  def _parse_yaml(file, content_yaml)
     begin
       @content = YAML.safe_load content_yaml
     rescue Psych::SyntaxError

data/lib/takelage/self/list.rb

@@ -4,6 +4,13 @@
 module SelfList
   # Backend method for config self.
   def self_list
+    _manipulate_output_(_get_thor_list_)
+  end
+
+  private
+
+  # Get output of thor list command.
+  def _get_thor_list_
     # use Thorfile which requires relative takelage.rb
     thorfile_dir = "#{File.dirname(__FILE__)}/../"
 
@@ -12,20 +19,17 @@ module SelfList
         "cd #{thorfile_dir} && " \
         'thor list' \
         "'"
-    thor_list = `#{cmd_thor_list}`
 
-    # manipulate thor list output
-    _manipulate_output_(thor_list)
+    # call thor list command
+    `#{cmd_thor_list}`
   end
 
-  private
-
   # Manipulate output of thor list command.
   def _manipulate_output_(thor_list)
-    thor_list.gsub!("takelage\n", '')
-    thor_list.gsub!("------\n", '')
-    thor_list.gsub!('thor ', 'tau ')
-    thor_list.gsub!(/(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3')
-    thor_list.gsub!(/.*COMMAND.*\n/, '')
+    tau_list = thor_list.gsub("takelage\n", '')
+    tau_list.gsub!("------\n", '')
+    tau_list.gsub!('thor ', 'tau ')
+    tau_list.gsub!(/(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3')
+    tau_list.gsub!(/.*COMMAND.*\n/, '')
   end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.20.1
+0.22.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.22.1
 platform: ruby
 authors:
 - Geospin
@@ -261,7 +261,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

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# takelage git check master
-module GitCheckMaster
-  # Backend method for git check master.
-  # @return [Boolean] are we on the git master branch?
-  def git_check_master
-    log.debug 'Check if we are on the git master branch'
-
-    return false unless git_check_workspace
-
-    branch = _git_check_master_get_branch
-    log.debug "We are on git branch \"#{branch}\""
-
-    branch == 'master'
-  end
-
-  private
-
-  # Get git branch.
-  def _git_check_master_get_branch
-    cmd_get_branch =
-      config.active['cmd_git_check_master_git_branch']
-    (run cmd_get_branch).strip.split('/')[-1]
-  end
-end