Merge branch 'run-cmd'

# Conflicts:
#	src/app/project_runner.go
#	src/tui/proc-info-form.go
#	src/types/validators.go

flake.nix

@@ -14,14 +14,19 @@
         commit = self.shortRev or "dirty";
       };
     in
-    (flake-utils.lib.eachDefaultSystem (system:
-      {
-        packages.process-compose = mkPackage nixpkgs.legacyPackages.${system};
+    (flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+        packages.process-compose = mkPackage pkgs;
         defaultPackage = self.packages."${system}".process-compose;
         apps.process-compose = flake-utils.lib.mkApp {
           drv = self.packages."${system}".process-compose;
         };
         apps.default = self.apps."${system}".process-compose;
+        checks.default = self.packages."${system}".process-compose.overrideAttrs (prev: {
+          doCheck = true;
+          nativeBuildInputs = prev.nativeBuildInputs ++ (with pkgs; [python3]);
+        });
       })
     ) // {
       overlays.default = final: prev: {

src/app/commander_interface.go

@@ -15,4 +15,5 @@ type Commander interface {
 	StderrPipe() (io.ReadCloser, error)
 	Stop(int, bool) error
 	SetCmdArgs()
+	AttachIo()
 }

src/app/process.go

@@ -53,6 +53,9 @@ type Process struct {
 	liveProber    *health.Prober
 	readyProber   *health.Prober
 	shellConfig   command.ShellConfig
+	printLogs     bool
+	isMain        bool
+	extraArgs     []string
 }
 
 func NewProcess(
@@ -62,6 +65,9 @@ func NewProcess(
 	processState *types.ProcessState,
 	procLog *pclog.ProcessLogBuffer,
 	shellConfig command.ShellConfig,
+	printLogs bool,
+	isMain bool,
+	extraArgs []string,
 ) *Process {
 	colNumeric := rand.Intn(int(color.FgHiWhite)-int(color.FgHiBlack)) + int(color.FgHiBlack)
 
@@ -78,6 +84,9 @@ func NewProcess(
 		shellConfig:   shellConfig,
 		procStateChan: make(chan string, 1),
 		procReadyChan: make(chan string, 1),
+		printLogs:     printLogs,
+		isMain:        isMain,
+		extraArgs:     extraArgs,
 	}
 
 	proc.procReadyCtx, proc.readyCancelFn = context.WithCancel(context.Background())
@@ -92,7 +101,7 @@ func (p *Process) run() int {
 	}
 
 	if err := p.validateProcess(); err != nil {
-		log.Error().Err(err).Msgf("Failed to run command %s for process %s", p.getCommand(), p.getName())
+		log.Error().Err(err).Msgf(`Failed to run command ["%v"] for process %s`, strings.Join(p.getCommand(), `" "`), p.getName())
 		p.onProcessEnd(types.ProcessStateError)
 		return 1
 	}
@@ -101,7 +110,7 @@ func (p *Process) run() int {
 	for {
 		err := p.setStateAndRun(p.getStartingStateName(), p.getProcessStarter())
 		if err != nil {
-			log.Error().Err(err).Msgf("Failed to run command %s for process %s", p.getCommand(), p.getName())
+			log.Error().Err(err).Msgf(`Failed to run command ["%v"] for process %s`, strings.Join(p.getCommand(), `" "`), p.getName())
 			p.logBuffer.Write(err.Error())
 			p.onProcessEnd(types.ProcessStateError)
 			return 1
@@ -151,16 +160,23 @@ func (p *Process) run() int {
 
 func (p *Process) getProcessStarter() func() error {
 	return func() error {
-		p.command = command.BuildCommandShellArg(p.shellConfig, p.getCommand())
+		p.command = command.BuildCommand(
+			p.procConf.Executable,
+			append(p.procConf.Args, p.extraArgs...),
+		)
 		p.command.SetEnv(p.getProcessEnvironment())
 		p.command.SetDir(p.procConf.WorkingDir)
-		p.command.SetCmdArgs()
-		stdout, _ := p.command.StdoutPipe()
-		stderr, _ := p.command.StderrPipe()
-		go p.handleOutput(stdout, p.handleInfo)
-		go p.handleOutput(stderr, p.handleError)
-		//stdin, _ := p.command.StdinPipe()
-		//go p.handleInput(stdin)
+
+		if p.isMain {
+			p.command.AttachIo()
+		} else {
+			p.command.SetCmdArgs()
+			stdout, _ := p.command.StdoutPipe()
+			stderr, _ := p.command.StderrPipe()
+			go p.handleOutput(stdout, p.handleInfo)
+			go p.handleOutput(stderr, p.handleError)
+		}
+
 		return p.command.Start()
 	}
 }
@@ -346,8 +362,11 @@ func (p *Process) getNameWithSmartReplica() string {
 	return p.procConf.Name
 }
 
-func (p *Process) getCommand() string {
-	return p.procConf.Command
+func (p *Process) getCommand() []string {
+	return append(
+		[]string{(*p.procConf).Executable},
+		append(p.procConf.Args, p.extraArgs...)...,
+	)
 }
 
 func (p *Process) updateProcState() {
@@ -401,13 +420,17 @@ func (p *Process) handleOutput(pipe io.ReadCloser, handler func(message string))
 
 func (p *Process) handleInfo(message string) {
 	p.logger.Info(message, p.getName(), p.procConf.ReplicaNum)
-	fmt.Printf("[%s\t] %s\n", p.procColor(p.getName()), message)
+	if p.printLogs {
+		fmt.Printf("[%s\t] %s\n", p.procColor(p.getName()), message)
+	}
 	p.logBuffer.Write(message)
 }
 
 func (p *Process) handleError(message string) {
 	p.logger.Error(message, p.getName(), p.procConf.ReplicaNum)
-	fmt.Printf("[%s\t] %s\n", p.procColor(p.getName()), p.redColor(message))
+	if p.printLogs {
+		fmt.Printf("[%s\t] %s\n", p.procColor(p.getName()), p.redColor(message))
+	}
 	p.logBuffer.Write(message)
 }
 

src/app/project_runner.go

@@ -26,6 +26,8 @@ type ProjectRunner struct {
 	waitGroup        sync.WaitGroup
 	exitCode         int
 	projectState     *types.ProjectState
+	mainProcess      string
+	mainProcessArgs  []string
 }
 
 func (p *ProjectRunner) GetLexicographicProcessNames() ([]string, error) {
@@ -84,7 +86,25 @@ func (p *ProjectRunner) runProcess(config *types.ProcessConfig) {
 		procLog = pclog.NewLogBuffer(0)
 	}
 	procState, _ := p.GetProcessState(config.ReplicaName)
-	process := NewProcess(p.project.Environment, procLogger, config, procState, procLog, *p.project.ShellConfig)
+	isMain := config.Name == p.mainProcess
+	hasMain := p.mainProcess != ""
+	printLogs := !hasMain
+	extraArgs := []string{}
+	if isMain {
+		extraArgs = p.mainProcessArgs
+		config.RestartPolicy.ExitOnEnd = true
+	}
+	process := NewProcess(
+		p.project.Environment,
+		procLogger,
+		config,
+		procState,
+		procLog,
+		*p.project.ShellConfig,
+		printLogs,
+		isMain,
+		extraArgs,
+	)
 	p.addRunningProcess(process)
 	p.waitGroup.Add(1)
 	go func() {
@@ -574,7 +594,13 @@ func (p *ProjectRunner) GetProjectState() (*types.ProjectState, error) {
 	return p.projectState, nil
 }
 
-func NewProjectRunner(project *types.Project, processesToRun []string, noDeps bool) (*ProjectRunner, error) {
+func NewProjectRunner(
+	project *types.Project,
+	processesToRun []string,
+	noDeps bool,
+	mainProcess string,
+	mainProcessArgs []string,
+) (*ProjectRunner, error) {
 
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -590,6 +616,8 @@ func NewProjectRunner(project *types.Project, processesToRun []string, noDeps bo
 	}
 	runner := &ProjectRunner{
 		project: project,
+		mainProcess: mainProcess,
+		mainProcessArgs: mainProcessArgs,
 		projectState: &types.ProjectState{
 			FileNames: project.FileNames,
 			StartTime: time.Now(),

src/app/system_test.go

@@ -28,7 +28,7 @@ func TestSystem_TestFixtures(t *testing.T) {
 				t.Errorf(err.Error())
 				return
 			}
-			runner, err := NewProjectRunner(project, []string{}, false)
+			runner, err := NewProjectRunner(project, []string{}, false, "", []string{})
 			if err != nil {
 				t.Errorf(err.Error())
 				return
@@ -48,7 +48,7 @@ func TestSystem_TestComposeWithLog(t *testing.T) {
 			t.Errorf(err.Error())
 			return
 		}
-		runner, err := NewProjectRunner(project, []string{}, false)
+		runner, err := NewProjectRunner(project, []string{}, false, "", []string{})
 		if err != nil {
 			t.Errorf(err.Error())
 			return
@@ -81,7 +81,7 @@ func TestSystem_TestComposeChain(t *testing.T) {
 			t.Errorf(err.Error())
 			return
 		}
-		runner, err := NewProjectRunner(project, []string{}, false)
+		runner, err := NewProjectRunner(project, []string{}, false, "", []string{})
 		if err != nil {
 			t.Errorf(err.Error())
 			return
@@ -117,7 +117,7 @@ func TestSystem_TestComposeChainExit(t *testing.T) {
 			t.Errorf(err.Error())
 			return
 		}
-		runner, err := NewProjectRunner(project, []string{}, false)
+		runner, err := NewProjectRunner(project, []string{}, false, "", []string{})
 		if err != nil {
 			t.Errorf(err.Error())
 			return
@@ -162,7 +162,7 @@ func TestSystem_TestComposeScale(t *testing.T) {
 			t.Errorf(err.Error())
 			return
 		}
-		runner, err := NewProjectRunner(project, []string{}, false)
+		runner, err := NewProjectRunner(project, []string{}, false, "", []string{})
 		if err != nil {
 			t.Errorf(err.Error())
 			return

src/cmd/project_runner.go

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-func getProjectRunner(process []string, noDeps bool) *app.ProjectRunner {
+func getProjectRunner(process []string, noDeps bool, mainProcess string, mainProcessArgs []string) *app.ProjectRunner {
 	if *pcFlags.HideDisabled {
 		opts.AddAdmitter(&admitter.DisabledProcAdmitter{})
 	}
@@ -23,7 +23,7 @@ func getProjectRunner(process []string, noDeps bool) *app.ProjectRunner {
 		log.Fatal().Msg(err.Error())
 	}
 
-	runner, err := app.NewProjectRunner(project, process, noDeps)
+	runner, err := app.NewProjectRunner(project, process, noDeps, mainProcess, mainProcessArgs)
 	if err != nil {
 		fmt.Println(err)
 		log.Fatal().Msg(err.Error())

src/cmd/root.go

@@ -34,7 +34,7 @@ func run(cmd *cobra.Command, args []string) error {
 	defer func() {
 		_ = logFile.Close()
 	}()
-	runner := getProjectRunner([]string{}, false)
+	runner := getProjectRunner([]string{}, false, "", []string{})
 	api.StartHttpServer(!*pcFlags.Headless, *pcFlags.PortNum, runner)
 	runProject(runner)
 	return nil

src/cmd/run.go

@@ -0,0 +1,54 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"github.com/f1bonacc1/process-compose/src/api"
+	"github.com/spf13/cobra"
+)
+
+// runCmd represents the up command
+var runCmd = &cobra.Command{
+	Use:   "run PROCESS [flags] -- [process_args]",
+	Short: "Run PROCESS in the foreground, and its dependencies in the background",
+	Long: `Run selected process with std(in|out|err) attached, while other processes run in the background.
+Command line arguments, provided after --, are passed to the PROCESS.`,
+	Args: cobra.MinimumNArgs(1),
+	// Args: cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		*pcFlags.Headless = false
+
+		processName := args[0]
+
+		if len(args) > 1 {
+			argsLenAtDash := cmd.ArgsLenAtDash()
+			if argsLenAtDash != 1 {
+				message := "Extra positional arguments provided! To pass args to PROCESS, separate them from process-compose arguments with: --"
+				fmt.Println(message)
+				os.Exit(1)
+			}
+			args = args[argsLenAtDash:]
+		} else {
+			// Clease args as they will contain the processName
+			args = []string{}
+		}
+
+		runner := getProjectRunner(
+			[]string{processName},
+			*pcFlags.NoDependencies,
+			processName,
+			args,
+		)
+
+		api.StartHttpServer(false, *pcFlags.PortNum, runner)
+		runProject(runner)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(runCmd)
+
+	runCmd.Flags().BoolVarP(pcFlags.NoDependencies, "no-deps", "", *pcFlags.NoDependencies, "don't start dependent processes")
+	runCmd.Flags().AddFlag(rootCmd.Flags().Lookup("config"))
+
+}

src/cmd/up.go

@@ -14,7 +14,7 @@ var upCmd = &cobra.Command{
 If one or more process names are passed as arguments,
 will start them and their dependencies only`,
 	Run: func(cmd *cobra.Command, args []string) {
-		runner := getProjectRunner(args, *pcFlags.NoDependencies)
+		runner := getProjectRunner(args, *pcFlags.NoDependencies, "", []string{})
 		api.StartHttpServer(!*pcFlags.Headless, *pcFlags.PortNum, runner)
 		runProject(runner)
 	},

src/command/command.go

@@ -8,9 +8,10 @@ import (
 	"runtime"
 )
 
-func BuildCommandShellArg(shell ShellConfig, cmd string) *CmdWrapper {
+
+func BuildCommand(cmd string, args []string) *CmdWrapper {
 	return &CmdWrapper{
-		cmd: exec.Command(shell.ShellCommand, shell.ShellArgument, cmd),
+		cmd: exec.Command(cmd, args...),
 	}
 	//return NewMockCommand()
 }

src/command/command_wrapper.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"io"
+	"os"
 	"os/exec"
 )
 
@@ -37,6 +38,12 @@ func (c *CmdWrapper) StderrPipe() (io.ReadCloser, error) {
 	return c.cmd.StderrPipe()
 }
 
+func (c *CmdWrapper) AttachIo() () {
+	c.cmd.Stdin = os.Stdin
+	c.cmd.Stdout = os.Stdout
+	c.cmd.Stderr = os.Stderr
+}
+
 func (c *CmdWrapper) SetEnv(env []string) {
 	c.cmd.Env = env
 }

src/tui/proc-info-form.go

@@ -20,6 +20,7 @@ func (pv *pcView) createProcInfoForm(info *types.ProcessConfig, ports *types.Pro
 	f.SetButtonsAlign(tview.AlignCenter)
 	f.SetTitle("Process " + info.Name + " Info")
 	addStringIfNotEmpty("Description:", info.Description, f)
+	addStringIfNotEmpty("Entrypoint:", strings.Join(info.Entrypoint, " "), f)
 	addStringIfNotEmpty("Command:", info.Command, f)
 	addStringIfNotEmpty("Working Directory:", info.WorkingDir, f)
 	addStringIfNotEmpty("Log Location:", info.LogLocation, f)

src/types/process.go

@@ -16,6 +16,7 @@ type ProcessConfig struct {
 	Disabled          bool                   `yaml:"disabled,omitempty"`
 	IsDaemon          bool                   `yaml:"is_daemon,omitempty"`
 	Command           string                 `yaml:"command"`
+	Entrypoint        []string               `yaml:"entrypoint"`
 	LogLocation       string                 `yaml:"log_location,omitempty"`
 	LoggerConfig      *LoggerConfig          `yaml:"log_configuration,omitempty"`
 	Environment       Environment            `yaml:"environment,omitempty"`
@@ -33,6 +34,8 @@ type ProcessConfig struct {
 	Vars              Vars                   `yaml:"vars"`
 	ReplicaNum        int
 	ReplicaName       string
+	Executable        string
+	Args              []string
 }
 
 func (p *ProcessConfig) GetDependencies() []string {