takelage 0.29.14 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c6d77ae92c40f011ba7aa9773767b57b2a0691e64dd867ee37803223ccfd51
-  data.tar.gz: ec9f7bc983baff7c6cabc0db84edd8e37e2744b85aa52e522393ff0b9066c7bc
+  metadata.gz: 8e474304722d66fb300d61b9802a63887e813d4d6fa15894fc3ed8d7a325e798
+  data.tar.gz: 4eb757cb8eb7b441b7d3f2f700b4891201bcba0caf46ec8acaa256cde3ca8add
 SHA512:
-  metadata.gz: 66905dbaf0c9628f197680844110986d7d5389bf995fc6de8736e30cc67d0fc4197002daee2264fb4a77e13fbab22e098c2365a7485bb5cd7fd838d665cee81d
-  data.tar.gz: 21b3dadad5f583a9cc80778217aa2cd8bfce25b2fa6e100508847168fe68c2572d8211e33ca74fab8a767167bb7aa8cfd519c87b8d7839f16a79b3dd5fff2b8c
+  metadata.gz: f110bf58872049c6900262fa5eb28a7f58516845fc887917b605fe1eac90098f88073ba39a37e53bbed9e6cd5cdd88f1500afa8b6a5e5dbf4c9e09bc4b2b158c
+  data.tar.gz: 0fc82eb52b09b927079b470673b9adde8f4a28d5b8e4126f7ab7ed21dac548999bb993ffcf2d31e55bab2a97978a02f28619f9c11acab807461c9a9956854186

data/README.md

@@ -26,7 +26,6 @@ command line script using the
 | *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/bitboard/latest?label=hub.docker.com&sort=semver&color=blue)](https://hub.docker.com/r/takelage/bitboard) | 
 | *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelslim/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelslim) | 
 | *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/takelbase/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/takelbase) | 
-| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![hub.docker.com](https://img.shields.io/docker/v/takelage/multipostgres/latest?label=hub.docker.com&color=blue)](https://hub.docker.com/r/takelage/multipostgres) | 
 
 ## Framework Status
 
@@ -38,7 +37,6 @@ command line script using the
 | *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build,%20test%20and%20deploy%20project?label=deploy%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_deploy_project_on_push.yml) | [![test project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Build%20and%20test%20project?label=test%20project)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_project_nightly.yml) | [![test roles](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-bit/Test%20roles?label=test%20roles)](https://github.com/geospin-takelage/takelage-bit/actions/workflows/build_test_roles_nightly.yml) |
 | *[takelage-img-takelslim](https://github.com/geospin-takelage/takelage-img-takelslim)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelslim/Build%20and%20deploy%20takelslim?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelslim/actions/workflows/build_deploy_takelslim_nightly.yml) |
 | *[takelage-img-takelbase](https://github.com/geospin-takelage/takelage-img-takelbase)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-takelbase/Build%20and%20deploy%20takelbase?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-takelbase/actions/workflows/build_deploy_takelbase_nightly.yml) |
-| *[takelage-img-multipostgres](https://github.com/geospin-takelage/takelage-img-multipostgres)* | [![deploy project](https://img.shields.io/github/workflow/status/geospin-takelage/takelage-img-multipostgres/Build%20and%20deploy%20multipostgres?label=deploy%20project)](https://github.com/geospin-takelage/takelage-img-multipostgres/actions/workflows/build_deploy_multipostgres_nightly.yml) |
 
 ## Installation
 
@@ -73,7 +71,7 @@ tau [bit clipboard push](features/cucumber/features/bit/bit.clipboard.push.featu
 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 ssh](features/cucumber/features/bit/bit.scope.ssh.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
@@ -91,7 +89,7 @@ tau [docker image tag latest](features/cucumber/features/docker/docker.image.tag
 tau [docker image tag list](features/cucumber/features/docker/docker.image.tag.list.feature) | Print local docker image tags
 tau [docker image update](features/cucumber/features/docker/docker.image.update.feature) | Get latest remote 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 bit](features/cucumber/features/git/git.check.bit.feature) | Check if we are on the git bit 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 dir](features/cucumber/features/info/info.project.dir.feature) | Print project root directory

data/lib/takelage.rb

@@ -21,14 +21,14 @@ require_relative 'takelage/lib/config'
 require_relative 'takelage/lib/project'
 
 require_relative 'takelage/git/check/clean'
-require_relative 'takelage/git/check/main'
+require_relative 'takelage/git/check/bit'
 require_relative 'takelage/git/check/workspace'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'
 require_relative 'takelage/bit/check/workspace'
 require_relative 'takelage/bit/check/cli'
 require_relative 'takelage/bit/scope/add'
-require_relative 'takelage/bit/scope/inbit'
+require_relative 'takelage/bit/scope/ssh'
 require_relative 'takelage/bit/scope/list'
 require_relative 'takelage/bit/scope/new'
 require_relative 'takelage/bit/scope/cli'

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

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

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

@@ -26,7 +26,7 @@ module BitClipboardLib
 
   # Prepare git workspace for bit clipboard.
   def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_main
+    unless git_check_bit
       log.error 'Not on git main branch'
       return false
     end
@@ -97,7 +97,7 @@ module BitClipboardLib
 
     cmd_bit_clipboard_git_push = format(
       config.active['cmd_bit_clipboard_git_push'],
-      main: config.active['git_main_branch']
+      main: config.active['git_bit_branch']
     )
 
     run cmd_bit_clipboard_git_push
@@ -108,7 +108,7 @@ module BitClipboardLib
     log.debug 'Updating git workspace'
     cmd_bit_clipboard_git_pull = format(
       config.active['cmd_bit_clipboard_git_pull'],
-      main: config.active['git_main_branch']
+      main: config.active['git_bit_branch']
     )
 
     return true if try cmd_bit_clipboard_git_pull

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

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

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

@@ -28,7 +28,7 @@ module BitScopeAdd
 
     return true unless git_check_workspace
 
-    return true if git_check_main
+    return true if git_check_bit
 
     log.error 'Not on git main branch'
     false

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

@@ -6,11 +6,11 @@ module Takelage
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
     include BitCheckWorkspace
     include BitScopeAdd
-    include BitScopeInbit
+    include BitScopeSSH
     include BitScopeList
     include BitScopeNew
 
@@ -60,15 +60,15 @@ module Takelage
     end
 
     #
-    # bit scope inbit
+    # bit scope ssh
     #
-    desc 'inbit', 'Log in to bit remote server'
+    desc 'ssh', 'Log in to bit remote server'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Log in to bit remote server
     LONGDESC
     # Log in to bit remote server.
-    def inbit
-      exit bit_scope_inbit
+    def ssh
+      exit bit_scope_ssh
     end
   end
 end

data/lib/takelage/bit/scope/{inbit.rb → ssh.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# takelage bit scope inbit
-module BitScopeInbit
-  # Backend method for bit scope inbit.
-  def bit_scope_inbit
+# takelage bit scope ssh
+module BitScopeSSH
+  # Backend method for bit scope ssh.
+  def bit_scope_ssh
     log.debug 'Logging in to bit remote server'
 
     return false unless configured? %w[bit_ssh]

data/lib/takelage/default.yml

@@ -29,6 +29,7 @@ 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'
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
+cmd_docker: 'docker'
 cmd_docker_check_daemon_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}$'
@@ -48,7 +49,7 @@ cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
-cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
+cmd_git_check_bit_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
 cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
@@ -60,6 +61,7 @@ cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
+cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
 cmd_mutagen_check_daemon_version: 'mutagen version'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
@@ -76,7 +78,7 @@ docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/defau
 docker_shm_size: '512M'
 docker_tag: 'latest'
 docker_user: 'takelage'
-git_main_branch: 'main'
+git_bit_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'

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

@@ -8,7 +8,7 @@ module DockerCheckDaemon
   def docker_check_daemon
     return true if @docker_daemon_running
 
-    return false unless command_available? 'docker'
+    return false unless command_available_else_error? config.active['cmd_docker']
 
     log.debug 'Check if the docker daemon is running'
 

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

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

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

@@ -7,31 +7,31 @@ module Takelage
     include SystemModule
     include ConfigModule
     include GitCheckClean
-    include GitCheckMain
+    include GitCheckBit
     include GitCheckWorkspace
 
     #
-    # git check clean
+    # git check bit
     #
-    desc 'clean', 'Check if the git workspace is clean'
+    desc 'bit', 'Check if we are on the git bit branch'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if the git workspace is clean
+    Check if we are on the git bit branch
     LONGDESC
-    # Check if the git workspace is clean.
-    def clean
-      exit git_check_clean
+    # Check if we are on the git bit branch.
+    def bit
+      exit git_check_bit
     end
 
     #
-    # git check main
+    # git check clean
     #
-    desc 'main', 'Check if we are on the git main branch'
+    desc 'clean', 'Check if the git workspace is clean'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if we are on the git main branch
+    Check if the git workspace is clean
     LONGDESC
-    # Check if we are on the git main branch.
-    def main
-      exit git_check_main
+    # Check if the git workspace is clean.
+    def clean
+      exit git_check_clean
     end
 
     #

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

@@ -32,7 +32,7 @@ module InfoStatusBar
     return unless _file_exists? takelage_version_file
 
     _file_read takelage_version_file
-    @bar_list << "takelage: #{@content_file.chomp.green}"
+    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
   end
 
   # Add tau version info to bar

data/lib/takelage/lib/system.rb

@@ -7,22 +7,26 @@ require 'yaml'
 # Interaction with the operating system
 # rubocop:disable Metrics/ModuleLength
 module SystemModule
-  # Check if a command is available
+  # Check if a command is available else log error message
   # @return [Boolean] is the command available?
-  def command_available?(command)
-    return true if instance_variable_get("@command_available_#{command}")
-
-    log.debug "Check if the command \"#{command}\" is available"
+  def command_available_else_error?(command)
+    unless _command_available? command
+      log.error "The command \"#{command}\" is not available"
+      return false
+    end
 
-    status = try "which #{command}"
+    command_available command
+  end
 
-    unless status.exitstatus.zero?
-      log.debug "The command \"#{command}\" is not available"
+  # Check if a command is available else log warning message
+  # @return [Boolean] is the command available?
+  def command_available_else_warn?(command)
+    unless _command_available? command
+      log.warn "The command \"#{command}\" is not available"
       return false
     end
 
-    log.debug "The command \"#{command}\" is available"
-    instance_variable_set("@command_available_#{command}", true)
+    command_available command
   end
 
   # Convert hash to yaml.
@@ -118,6 +122,23 @@ module SystemModule
 
   private
 
+  # Check if command is available
+  def _command_available?(command)
+    return true if instance_variable_get("@command_available_#{command}")
+
+    log.debug "Check if the command \"#{command}\" is available"
+    status = try "which #{command}"
+    return false unless status.exitstatus.zero?
+
+    true
+  end
+
+  # Command is available
+  def command_available(command)
+    log.debug "The command \"#{command}\" is available"
+    instance_variable_set("@command_available_#{command}", true)
+  end
+
   # Check if file exists.
   def _file_exists?(file)
     unless File.exist? File.expand_path(file)

data/lib/takelage/mutagen/check/daemon.rb

@@ -9,7 +9,7 @@ module MutagenCheckDaemon
   def mutagen_check_daemon
     return true if @mutagen_daemon_available
 
-    return false unless command_available? 'mutagen'
+    return false unless command_available_else_warn? config.active['cmd_mutagen']
 
     log.debug 'Check mutagen status'
 

data/lib/takelage/version

@@ -1 +1 @@
-0.29.14
+0.31.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.29.14
+  version: 0.31.0
 platform: ruby
 authors:
 - Geospin
@@ -126,16 +126,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,9 @@ files:
 - lib/takelage/bit/require/lib.rb
 - lib/takelage/bit/scope/add.rb
 - lib/takelage/bit/scope/cli.rb
-- lib/takelage/bit/scope/inbit.rb
 - lib/takelage/bit/scope/list.rb
 - lib/takelage/bit/scope/new.rb
+- lib/takelage/bit/scope/ssh.rb
 - lib/takelage/completion/cli.rb
 - lib/takelage/default.yml
 - lib/takelage/docker/check/cli.rb
@@ -245,9 +245,9 @@ files:
 - lib/takelage/docker/image/tag/latest.rb
 - lib/takelage/docker/image/tag/list.rb
 - lib/takelage/docker/image/update.rb
+- lib/takelage/git/check/bit.rb
 - lib/takelage/git/check/clean.rb
 - lib/takelage/git/check/cli.rb
-- lib/takelage/git/check/main.rb
 - lib/takelage/git/check/workspace.rb
 - lib/takelage/git/cli.rb
 - lib/takelage/info/cli.rb
@@ -290,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,26 +0,0 @@
-# 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).chomp.split('/')[-1]
-  end
-end