takeltau 0.34.15 → 0.35.15

data/lib/takeltau.rb

@@ -20,30 +20,17 @@ require_relative 'takeltau/lib/system'
 require_relative 'takeltau/lib/config'
 require_relative 'takeltau/lib/project'
 
+require_relative 'takeltau/completion/cli'
 require_relative 'takeltau/git/check/clean'
-require_relative 'takeltau/git/check/bit'
+require_relative 'takeltau/git/check/hg'
 require_relative 'takeltau/git/check/workspace'
 require_relative 'takeltau/git/check/cli'
+require_relative 'takeltau/git/lib'
 require_relative 'takeltau/git/cli'
-require_relative 'takeltau/bit/check/workspace'
-require_relative 'takeltau/bit/check/cli'
-require_relative 'takeltau/bit/scope/add'
-require_relative 'takeltau/bit/scope/ssh'
-require_relative 'takeltau/bit/scope/list'
-require_relative 'takeltau/bit/scope/new'
-require_relative 'takeltau/bit/scope/cli'
-require_relative 'takeltau/bit/clipboard/lib'
-require_relative 'takeltau/bit/clipboard/copy'
-require_relative 'takeltau/bit/clipboard/paste'
-require_relative 'takeltau/bit/clipboard/pull'
-require_relative 'takeltau/bit/clipboard/push'
-require_relative 'takeltau/bit/clipboard/cli'
-require_relative 'takeltau/bit/require/lib'
-require_relative 'takeltau/bit/require/export'
-require_relative 'takeltau/bit/require/import'
-require_relative 'takeltau/bit/require/cli'
-require_relative 'takeltau/bit/cli'
-require_relative 'takeltau/completion/cli'
+require_relative 'takeltau/hg/export'
+require_relative 'takeltau/hg/pull'
+require_relative 'takeltau/hg/push'
+require_relative 'takeltau/hg/cli'
 require_relative 'takeltau/init/lib'
 require_relative 'takeltau/init/packer/docker'
 require_relative 'takeltau/init/packer/cli'
@@ -138,9 +125,6 @@ module Takeltau
     # Subcommands
     #
 
-    desc 'bit [COMMAND] ', 'Manage bit'
-    subcommand 'bit', Bit
-
     desc 'completion [COMMAND] ', 'Print shell completion code'
     subcommand 'completion', Completion
 
@@ -150,10 +134,13 @@ module Takeltau
     desc 'git [COMMAND] ', 'Manage git'
     subcommand 'git', Git
 
+    desc 'hg [COMMAND] ', 'Manage hg'
+    subcommand 'hg', Hg
+
     desc 'info [COMMAND] ', 'Get information'
     subcommand 'info', Info
 
-    desc 'init [COMMAND] ', 'Init projects'
+    desc 'init [COMMAND] ', 'Init project'
     subcommand 'init', Init
 
     desc 'mutagen [COMMAND] ', 'Manage mutagen'
@@ -166,80 +153,68 @@ module Takeltau
     # Top-level commands
     #
 
+    desc 'clean', 'Alias for tau docker container clean'
+    # tau clean: {Takeltau::DockerContainer#clean}
+    def clean
+      Takeltau::DockerContainer.new.clean
+    end
+
     desc 'config', 'Alias for tau self config active'
-    # takeltau config: {takelage::SelfConfig#active}
+    # tau config: {Takeltau::SelfConfig#active}
     def config
       Takeltau::SelfConfig.new.active
     end
 
-    desc 'copy [DIR] [SCOPE]', 'Alias for tau bit clipboard copy'
-    # takeltau copy: {takelage::BitClipboard#copy}
-    def copy(dir_or_file, scope)
-      Takeltau::BitClipboard.new.copy dir_or_file, scope
-    end
-
-    desc 'project', 'Alias for tau info project active'
-    # takeltau project: {takelage::InfoProject#active}
-    def project
-      Takeltau::InfoProject.new.active
-    end
-
     desc 'login', 'Alias for tau docker container login'
-    # takeltau login: {takelage::DockerContainer#login}
+    # tau login: {Takeltau::DockerContainer#login}
     def login
       Takeltau::DockerContainer.new.login
     end
 
     desc 'list', 'Alias for tau self list'
-    # takeltau version: {takelage::Self#list}
+    # tau version: {Takeltau::Self#list}
     def list
       Takeltau::Self.new.list
     end
 
-    desc 'clean', 'Alias for tau docker container clean'
-    # takeltau clean: {takelage::DockerContainer#clean}
-    def clean
-      Takeltau::DockerContainer.new.clean
-    end
-
-    desc 'paste [COMPONENT] [DIR]', 'Alias for tau bit clipboard paste'
-    # takeltau paste: {takelage::BitClipboard#paste}
-    def paste(cid, dir)
-      Takeltau::BitClipboard.new.paste cid, dir
-    end
-
-    desc 'pull', 'Alias for tau bit clipboard pull'
-    # takeltau pull: {takelage::BitClipboard#pull}
-    def pull
-      Takeltau::BitClipboard.new.pull
+    desc 'project', 'Alias for tau info project active'
+    # tau project: {Takeltau::InfoProject#active}
+    def project
+      Takeltau::InfoProject.new.active
     end
 
     desc 'prune', 'Alias for tau docker container prune'
-    # takeltau prune: {takelage::DockerContainer#prune}
+    # tau prune: {Takeltau::DockerContainer#prune}
     def prune
       Takeltau::DockerContainer.new.prune
     end
 
-    desc 'push', 'Alias for tau bit clipboard push'
-    # takeltau push: {takelage::BitClipboard#push}
+    desc 'pull', 'Alias for tau hg pull'
+    # tau pull: {Takeltau::Hg#pull}
+    def pull
+      Takeltau::Hg.new.pull
+    end
+
+    desc 'push', 'Alias for tau hg push'
+    # tau push: {Takeltau::Hg#push}
     def push
-      Takeltau::BitClipboard.new.push
+      Takeltau::Hg.new.push
     end
 
     desc 'status', 'Alias for tau info status bar'
-    # takeltau status: {takelage::InfoStatus#bar}
+    # tau status: {Takeltau::InfoStatus#bar}
     def status
       Takeltau::InfoStatus.new.bar
     end
 
     desc 'update', 'Alias for tau docker image update'
-    # takeltau update: {takelage::DockerImage#update}
+    # tau update: {Takeltau::DockerImage#update}
     def update
       Takeltau::DockerImage.new.update
     end
 
     desc 'version', 'Alias for tau self version'
-    # takeltau version: {takelage::Self#version}
+    # tau version: {Takeltau::Self#version}
     def version
       Takeltau::Self.new.version
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.34.15
+  version: 0.35.15
 platform: ruby
 authors:
 - Takelwerk
@@ -205,24 +205,6 @@ files:
 - bin/tau
 - lib/Thorfile
 - lib/takeltau.rb
-- lib/takeltau/bit/check/cli.rb
-- lib/takeltau/bit/check/workspace.rb
-- lib/takeltau/bit/cli.rb
-- lib/takeltau/bit/clipboard/cli.rb
-- lib/takeltau/bit/clipboard/copy.rb
-- lib/takeltau/bit/clipboard/lib.rb
-- lib/takeltau/bit/clipboard/paste.rb
-- lib/takeltau/bit/clipboard/pull.rb
-- lib/takeltau/bit/clipboard/push.rb
-- lib/takeltau/bit/require/cli.rb
-- lib/takeltau/bit/require/export.rb
-- lib/takeltau/bit/require/import.rb
-- lib/takeltau/bit/require/lib.rb
-- lib/takeltau/bit/scope/add.rb
-- lib/takeltau/bit/scope/cli.rb
-- lib/takeltau/bit/scope/list.rb
-- lib/takeltau/bit/scope/new.rb
-- lib/takeltau/bit/scope/ssh.rb
 - lib/takeltau/completion/cli.rb
 - lib/takeltau/default.yml
 - lib/takeltau/docker/check/cli.rb
@@ -245,11 +227,16 @@ files:
 - lib/takeltau/docker/image/tag/latest.rb
 - lib/takeltau/docker/image/tag/list.rb
 - lib/takeltau/docker/image/update.rb
-- lib/takeltau/git/check/bit.rb
 - lib/takeltau/git/check/clean.rb
 - lib/takeltau/git/check/cli.rb
+- lib/takeltau/git/check/hg.rb
 - lib/takeltau/git/check/workspace.rb
 - lib/takeltau/git/cli.rb
+- lib/takeltau/git/lib.rb
+- lib/takeltau/hg/cli.rb
+- lib/takeltau/hg/export.rb
+- lib/takeltau/hg/pull.rb
+- lib/takeltau/hg/push.rb
 - lib/takeltau/info/cli.rb
 - lib/takeltau/info/project/cli.rb
 - lib/takeltau/info/status/bar.rb
@@ -264,13 +251,13 @@ files:
 - lib/takeltau/init/packer/cli.rb
 - lib/takeltau/init/packer/docker.rb
 - lib/takeltau/init/packer/templates/ansiblelint.tt
-- lib/takeltau/init/packer/templates/bitrequireyml.tt
 - lib/takeltau/init/packer/templates/groupvarsprojectyml.tt
+- lib/takeltau/init/packer/templates/hgclone.tt
 - lib/takeltau/init/packer/templates/playbooksiteyml.tt
 - lib/takeltau/init/packer/templates/projectyml.tt
 - lib/takeltau/init/takelage/cli.rb
 - lib/takeltau/init/takelage/rake.rb
-- lib/takeltau/init/takelage/templates/bitrequireyml.tt
+- lib/takeltau/init/takelage/templates/hgclone.tt
 - lib/takeltau/init/takelage/templates/projectyml.tt
 - lib/takeltau/init/templates/Rakefile.tt
 - lib/takeltau/init/templates/gitignore.tt

data/lib/takeltau/bit/check/cli.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Takeltau
-  # takeltau bit check
-  class BitCheck < SubCommandBase
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
-    include BitCheckWorkspace
-
-    #
-    # bit check workspace
-    #
-    desc 'workspace', 'Check if a bit workspace exists'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Check if a bit workspace exists
-    LONGDESC
-    # Check if a bit workspace exists.
-    def workspace
-      exit bit_check_workspace
-    end
-  end
-end

data/lib/takeltau/bit/check/workspace.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-# takeltau bit check workspace
-module BitCheckWorkspace
-  # Backend method for bit check workspace.
-  # @return [Boolean] is this a bit workspace?
-  def bit_check_workspace
-    log.debug 'Check if this is a bit workspace'
-
-    status_repo = _bit_check_workspace_bit_repo
-    return true if status_repo.exitstatus.zero?
-
-    dir = _bit_check_workspace_dir
-    log.debug "No bit workspace found in \"#{dir}\""
-    false
-  end
-
-  private
-
-  # Check bit repo.
-  def _bit_check_workspace_bit_repo
-    cmd_bit_repo =
-      config.active['cmd_bit_check_workspace_bit_list']
-
-    try cmd_bit_repo
-  end
-
-  # Get current working directory.
-  def _bit_check_workspace_dir
-    cmd_pwd =
-      config.active['cmd_bit_check_workspace_pwd']
-
-    stdout_str_dir = run cmd_pwd
-
-    stdout_str_dir.chomp
-  end
-end

data/lib/takeltau/bit/cli.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Takeltau
-  # takeltau bit
-  class Bit < SubCommandBase
-    desc 'check [COMMAND]', 'Check bit state'
-    subcommand 'check', BitCheck
-
-    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
-end

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

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-module Takeltau
-  # takeltau bit clipboard
-  class BitClipboard < SubCommandBase
-    include LoggingModule
-    include ConfigModule
-    include SystemModule
-    include GitCheckClean
-    include GitCheckBit
-    include GitCheckWorkspace
-    include BitCheckWorkspace
-    include BitClipboardLib
-    include BitClipboardCopy
-    include BitClipboardPaste
-    include BitClipboardPull
-    include BitClipboardPush
-
-    #
-    # bit copy
-    #
-    desc 'copy [DIR] [SCOPE]', 'Copy new [DIR] to [SCOPE]'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Copy a directory as a bit component to a bit remote scope
-    This command will add a directory as a bit component and tag it.
-    The id of the component will be created from the directory name.
-    The directory needs to contain a README.bit file
-    or else a new README.bit file will be created.
-    The README.bit will be the main file of the component which must not be deleted.
-    The tagged bit component will be exported to a bit remote scope.
-    LONGDESC
-    # Copy a file or directory as a bit component to a bit remote scope.
-    def copy(dir_or_file, scope)
-      exit bit_clipboard_copy dir_or_file, scope
-    end
-
-    #
-    # bit paste
-    #
-    desc 'paste [COMPONENT] [DIR]', 'Paste bit [COMPONENT] into [DIR]'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Paste a bit component into a directory
-    LONGDESC
-    # Paste a bit component into a directory.
-    def paste(cid, dir)
-      exit bit_clipboard_paste cid, dir
-    end
-
-    #
-    # bit pull
-    #
-    desc 'pull', 'Pull all updates for bit components from bit remote scopes'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Pull all updates for bit components from bit remote scopes
-    LONGDESC
-    # Pull all updates for bit components from bit remote scopes.
-    def pull
-      exit bit_clipboard_pull
-    end
-
-    #
-    # bit push
-    #
-    desc 'push', 'Push all updates of bit components to bit remote scopes'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Push all updates of bit components to bit remote scopes
-    LONGDESC
-    # Push all updates of bit components to bit remote scopes.
-    def push
-      exit bit_clipboard_push
-    end
-  end
-end

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

@@ -1,142 +0,0 @@
-# frozen_string_literal: true
-
-# takeltau bit clipboard copy
-module BitClipboardCopy
-  # Backend method for bit copy.
-  def bit_clipboard_copy(dir, scope)
-    # remove trailing slash
-    dir = dir.chomp('/')
-
-    log.info "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
-      log.error "The directory \"#{dir}\" does not exist"
-      return false
-    end
-
-    _bit_clipboard_copy_dir dir, scope
-  end
-
-  private
-
-  # rubocop:disable Metrics/MethodLength
-  def _bit_clipboard_copy_dir(dir, scope)
-    log.debug "Adding the directory \"#{dir}\" as a tagged bit component"
-
-    return false unless _bit_clipboard_copy_dir_scope_exists? scope
-
-    return false if _bit_clipboard_copy_readme_bit_exists_in_subdir? dir
-
-    id = _bit_clipboard_lib_id(dir)
-
-    _bit_clipboard_copy_touch_readme_bit dir
-    _bit_clipboard_copy_add_dir id, dir
-    _bit_clipboard_copy_tag_dir id
-    _bit_clipboard_copy_export_to_scope scope
-    _bit_clipbpard_lib_remove_bit_artifacts
-    _bit_clipboard_lib_sync_workspace
-
-    log.info "Copied directory \"#{dir}\" as bit component \"#{id}\" " \
-             "to bit remote scope \"#{scope}\""
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  # Touch README.bit if necessary.
-  def _bit_clipboard_copy_touch_readme_bit(dir)
-    readme_bit = "#{dir}/README.bit"
-    return if File.file? readme_bit
-
-    log.info "Creating \"README.bit\" in \"#{dir}\""
-    File.open(readme_bit, 'w') {}
-  end
-
-  # 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"
-        log.error 'Nested README.bit file detected'
-        return true
-      end
-    end
-
-    false
-  end
-
-  # Check if bit scope exists.
-  def _bit_clipboard_copy_dir_scope_exists?(scope)
-    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}."
-      return false unless _bit_clipboard_bit_dev_scope_exists scope
-    else
-      return false unless _bit_clipboard_custom_scope_exists scope
-    end
-
-    true
-  end
-
-  # 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'],
-      scope: scope
-    )
-
-    status = try cmd_bit_list_scope
-
-    return true if status.exitstatus.zero?
-
-    log.error "No bit.dev remote scope \"#{scope}\" found"
-    false
-  end
-
-  # 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']
-
-    stdout_str = run cmd_bit_list_remotes
-
-    return true if /.*\s+#{scope}\s+.*/m.match? stdout_str
-
-    log.error "No bit remote scope \"#{scope}\" " \
-                    'found in local bit workspace'
-    false
-  end
-
-  # 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'],
-      id: id,
-      dir: dir
-    )
-
-    run cmd_bit_add_dir
-  end
-
-  # bit tag dir.
-  def _bit_clipboard_copy_tag_dir(id)
-    cmd_bit_tag_id = format(
-      config.active['cmd_bit_clipboard_copy_bit_tag_id'],
-      id: id
-    )
-
-    run cmd_bit_tag_id
-  end
-
-  # 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'],
-      scope: scope
-    )
-
-    run cmd_bit_export_to_scope
-  end
-end

data/lib/takeltau/bit/clipboard/lib.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-# takeltau bit clipboard lib
-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
-      log.error 'No bit workspace'
-      return false
-    end
-
-    return true unless git_check_workspace
-
-    _bit_clipboard_lib_prepare_git_workspace
-  end
-
-  # Prepare git workspace for bit clipboard.
-  def _bit_clipboard_lib_prepare_git_workspace
-    unless git_check_bit
-      log.error 'Not on git main branch'
-      return false
-    end
-
-    unless git_check_clean
-      log.error 'No clean git workspace'
-      return false
-    end
-
-    _bit_clipboard_lib_git_pull
-  end
-
-  # Remove bit artifacts.
-  def _bit_clipbpard_lib_remove_bit_artifacts
-    log.debug 'Removing bit artifacts'
-
-    # Remove node_modules directory.
-    FileUtils.remove_entry_secure('node_modules', force: true)
-
-    # Remove index.bit files recursively.
-    Dir.glob('./**/index.bit').each do |file|
-      FileUtils.remove_entry_secure(file, force: true)
-    end
-
-    # Remove package.json file.
-    FileUtils.remove_entry_secure('package.json', force: true)
-  end
-
-  # Sync workspace with upstream.
-  def _bit_clipboard_lib_sync_workspace
-    log.info 'Syncing git workspace'
-
-    path = config.active['project_root_dir']
-    file = "#{path}/.bitmap"
-    message = 'Update .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(file)
-    log.debug "Adding \"#{file}\" to git"
-
-    cmd_bit_clipboard_git_add = format(
-      config.active['cmd_bit_clipboard_git_add'],
-      file: file
-    )
-    run cmd_bit_clipboard_git_add
-  end
-
-  # 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'],
-      message: message
-    )
-
-    run cmd_bit_clipboard_git_commit
-  end
-
-  # git push origin main.
-  def _bit_clipboard_lib_git_push
-    log.debug 'Pushing main branch to origin'
-
-    cmd_bit_clipboard_git_push = format(
-      config.active['cmd_bit_clipboard_git_push'],
-      main: config.active['git_bit_branch']
-    )
-
-    run cmd_bit_clipboard_git_push
-  end
-
-  # git pull.
-  def _bit_clipboard_lib_git_pull
-    log.info 'Updating git workspace'
-    cmd_bit_clipboard_git_pull = format(
-      config.active['cmd_bit_clipboard_git_pull'],
-      main: config.active['git_bit_branch']
-    )
-
-    return true if try cmd_bit_clipboard_git_pull
-
-    log.error 'Unable to update git workspace'
-    false
-  end
-
-  # Generate bit component ID.
-  def _bit_clipboard_lib_id(name)
-    id = ''
-
-    # bit restrictions:
-    # component names can only contain alphanumeric,
-    # lowercase characters, and the following ["-", "_", "$", "!", "/"]
-
-    # convert directory name to lowercase characters
-    dir_downcase = name.downcase
-
-    # construct array of allowed characters
-    allowed_chars = [*('a'..'z'), *('0'..'9'), '-', '_', '$', '!', '/']
-
-    # iterate over directory or file name
-    # and replace invalid characters with underscore
-    dir_downcase.split('').each do |char|
-      id += allowed_chars.include?(char) ? char : '_'
-    end
-
-    log.debug "Generated bit id \"#{id}\" from \"#{name}\""
-    id
-  end
-end