takelage 0.29.10 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b28f6c30df4d3f1e62b9f8ad4c282a828eb186521b168bda7f79dfb9a2a483b
-  data.tar.gz: 6adc87395967eac65059df51f82140ee3b879fa19d869082924aaf44d04826b4
+  metadata.gz: 692df780c364ffae6d6b8fda96b8afc12eeadf7e15dd4276f2e9a64294a86922
+  data.tar.gz: 5e78a8e8aa6df34ab7f0a2cf7404ecf504f5ea0396518a79448e0acb354b3a58
 SHA512:
-  metadata.gz: 68bfc3ff719f4fdbd300e38cded2a0379b78bad467259fd7f1b79b773d7137567ca22451f581a7c684070feaff6296c58e6c73ad4c9cdacbe793daf9019b98a6
-  data.tar.gz: c21632713ec979285748664c5076f20499bb2ac58efeda6f957c904421d21ee078bfc4a1e424c9e69ed38bf2f31dc52bf629276df4704f633e19a009e414c70d
+  metadata.gz: c1a251c7b85c8e575e2b619010b73eb02a6ccdab47ed9a71e343456bbbbe327a4d3889c7a8e7fa72f8439282cb59514b342da34cec4dac344a2307650afdf9db
+  data.tar.gz: e9c5faccc90daff8261f1dbc1facfffa618eea2425d389a2d456eeaf490bfe2c95a356b465946d01813b9acc679d9c36d4226f4a4300f70c2c2ab8a0c2bcb041

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
@@ -108,7 +106,7 @@ tau [mutagen socket check](features/cucumber/features/mutagen/mutagen.socket.che
 tau [mutagen socket create](features/cucumber/features/mutagen/mutagen.socket.create.feature) [NAME] [IN] [OUT] | Create a mutagen socket [NAME] from [IN] to [OUT] of the container
 tau [mutagen socket list](features/cucumber/features/mutagen/mutagen.socket.list.feature) | List mutagen sockets
 tau [mutagen socket tidy](features/cucumber/features/mutagen/mutagen.socket.tidy.feature) | Remove mutagen daemon files
-tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) | Terminate a mutagen socket
+tau [mutagen socket terminate](features/cucumber/features/mutagen/mutagen.socket.terminate.feature) [SOCKET] | Terminate a mutagen [SOCKET]
 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

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

@@ -48,7 +48,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'
@@ -76,11 +76,11 @@ 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'
 mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'
 mutagen_socket_path_ssh: '~/.gnupg/S.gpg-agent.ssh'
-mutagen_socket_takelage_label: 'type=takelage-socket'
+mutagen_socket_takelage_label: 'type=takelage'

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/mutagen/socket/cli.rb

@@ -79,11 +79,11 @@ module Takelage
     #
     # mutagen socket terminate
     #
-    desc 'terminate', 'Terminate a mutagen socket'
+    desc 'terminate [SOCKET]', 'Terminate a mutagen [SOCKET]'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Terminate a mutagen socket
+    Terminate a mutagen [SOCKET]
     LONGDESC
-    # Terminate a mutagen socket.
+    # Terminate a mutagen [SOCKET].
     def terminate(socket)
       exit mutagen_socket_terminate socket
     end

data/lib/takelage/version

@@ -1 +1 @@
-0.29.10
+0.30.1

metadata

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