pack: added TCM file packaging

Closes #TNTP-1097

cli/cmdcontext/cmdcontext.go

@@ -30,6 +30,12 @@ type TarantoolCli struct {
 	version version.Version
 }
 
+// TcmCli describes tarantool executable.
+type TcmCli struct {
+	// Executable is a path to tcm executable.
+	Executable string
+}
+
 // GetVersion returns and caches the tarantool version.
 func (tntCli *TarantoolCli) GetVersion() (version.Version, error) {
 	if tntCli.version.Str != "" {
@@ -104,6 +110,8 @@ type CliCtx struct {
 	Verbose bool
 	// TarantoolCli is current tarantool cli.
 	TarantoolCli TarantoolCli
+	// Tcmcli is current tcm cli.
+	TcmCli
 	// IntegrityCheck is a public key used for integrity check.
 	IntegrityCheck string
 	// IntegrityCheckPeriod is an period during which the integrity check is reproduced.

cli/configure/configure.go

@@ -422,6 +422,9 @@ func Cli(cmdCtx *cmdcontext.CmdCtx) error {
 	// Set default (system) tarantool binary, can be replaced by "local" or "system" later.
 	cmdCtx.Cli.TarantoolCli.Executable, _ = exec.LookPath("tarantool")
 
+	// Set default (system) tcm binary, can be replaced by "local" or "system" later.
+	cmdCtx.Cli.TcmCli.Executable, _ = exec.LookPath("tcm")
+
 	switch {
 	case cmdCtx.Cli.IsSystem:
 		return configureSystemCli(cmdCtx)
@@ -552,6 +555,30 @@ func detectLocalTt(cliOpts *config.CliOpts) (string, error) {
 	return localCli, nil
 }
 
+// detectLocalTcm searches for available Tcm executable.
+func detectLocalTcm(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) (string, error) {
+	localTcm, err := util.JoinAbspath(cliOpts.Env.BinDir, "tcm")
+	if err != nil {
+		return "", err
+	}
+
+	if _, err := os.Stat(localTcm); err == nil {
+		if _, err := exec.LookPath(localTcm); err != nil {
+			return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,
+				localTcm, err)
+		}
+
+		cmdCtx.Cli.TcmCli.Executable = localTcm
+	} else if !os.IsNotExist(err) {
+		return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)
+	}
+
+	log.Debugf("tcm executable found: '%s'", cmdCtx.Cli.TcmCli.Executable)
+
+	return localTcm, nil
+}
+
+
 // configureLocalCli configures Tarantool CLI if the launch is local.
 func configureLocalCli(cmdCtx *cmdcontext.CmdCtx) error {
 	launchDir, err := os.Getwd()
@@ -595,6 +622,11 @@ func configureLocalCli(cmdCtx *cmdcontext.CmdCtx) error {
 		return err
 	}
 
+	_, err = detectLocalTcm(cmdCtx, cliOpts)
+	if err != nil {
+		return err
+	}
+
 	var localCli string
 	if !cmdCtx.Cli.IsSelfExec {
 		localCli, err = detectLocalTt(cliOpts)

cli/pack/common.go

@@ -266,6 +266,18 @@ func copyBinaries(bundleEnvPath string, packCtx *PackCtx, cmdCtx *cmdcontext.Cmd
 	if err := util.CopyFileDeep(ttExecutable, util.JoinPaths(pkgBin, "tt")); err != nil {
 		return fmt.Errorf("failed copying tt: %s", err)
 	}
+
+	// Copy tcm.
+	if packCtx.WithBinaries {
+		if cmdCtx.Cli.TcmCli.Executable == "" {
+			log.Warnf("Skip copying tcm binary: not found")
+		} else {
+			if err := util.CopyFileDeep(cmdCtx.Cli.TcmCli.Executable,
+				util.JoinPaths(pkgBin, "tcm")); err != nil {
+				return fmt.Errorf("failed copying tarantool: %s", err)
+			}
+		}
+	}
 	return nil
 }
 

test/integration/pack/test_pack.py

@@ -787,6 +787,7 @@ def test_pack_tgz_compat_with_binaries(tt_cmd, tmp_path):
 
     assert os.path.isfile(os.path.join(app_path, "tt"))
     assert os.path.isfile(os.path.join(app_path, "tarantool"))
+    assert os.path.isfile(os.path.join(app_path, "tcm"))
 
     script = ("cat > tarantool <<EOF\n"
               "#!/bin/bash\n"
@@ -1014,6 +1015,8 @@ def test_pack_tgz_links_to_binaries(tt_cmd, tmp_path):
 
     tt_is_link = os.path.islink(os.path.join(extract_path, "bin", "tt"))
     tnt_is_link = os.path.islink(os.path.join(extract_path, "bin", "tarantool"))
+    tnt_is_link = os.path.islink(os.path.join(extract_path, "bin", "tcm"))
+
     assert not tt_is_link
     assert not tnt_is_link