Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sub-commands runner. #4

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Fix sub-commands runner. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 29 additions & 34 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func main() {
Aliases: []string{"i"},
Usage: "runs as ddev/lando composer install ...",
Action: func(cCtx *cli.Context) error {
cmdComposerBased("install ", cCtx)
cmdComposerBased("install", cCtx)
return nil
},
},
Expand All @@ -51,7 +51,7 @@ func main() {
Aliases: []string{"r"},
Usage: "runs as ddev/lando composer require ...",
Action: func(cCtx *cli.Context) error {
cmdComposerBased("require ", cCtx)
cmdComposerBased("require", cCtx)
return nil
},
},
Expand All @@ -60,7 +60,7 @@ func main() {
Aliases: []string{"u"},
Usage: "runs as ddev/lando composer update ...",
Action: func(cCtx *cli.Context) error {
cmdComposerBased("update ", cCtx)
cmdComposerBased("update", cCtx)
return nil
},
},
Expand All @@ -69,7 +69,7 @@ func main() {
Aliases: []string{"si"},
Usage: "runs as ddev/lando drush site-install profile_name",
Action: func(cCtx *cli.Context) error {
cmdDrushBased("site-install ", cCtx)
cmdDrushBased("site-install", cCtx)
return nil
},
},
Expand All @@ -78,7 +78,7 @@ func main() {
Aliases: []string{"en"},
Usage: "runs as ddev/lando drush pm-enable module_name",
Action: func(cCtx *cli.Context) error {
cmdDrushBased("pm:enable ", cCtx)
cmdDrushBased("pm:enable", cCtx)
return nil
},
},
Expand All @@ -87,7 +87,7 @@ func main() {
Aliases: []string{"pmu"},
Usage: "runs as ddev/lando drush pm-uninstall module_name",
Action: func(cCtx *cli.Context) error {
cmdDrushBased("pm:uninstall ", cCtx)
cmdDrushBased("pm:uninstall", cCtx)
return nil
},
},
Expand Down Expand Up @@ -115,8 +115,8 @@ func main() {
// Handle when user is not very lazy.
func mainAction(cCtx *cli.Context) error {

devTool, strArgs := helper(cCtx)
runner.Run(devTool, strArgs)
devTool, strArr := helper(cCtx)
runner.Run(devTool, strArr...)

return nil

Expand All @@ -125,8 +125,9 @@ func mainAction(cCtx *cli.Context) error {
// Handle any command which has composer as first argument.
func cmdComposer(cCtx *cli.Context) error {

devTool, strArgs := helper(cCtx)
runner.Run(devTool, "composer "+strArgs)
devTool, strArr := helper(cCtx)
strArr = append([]string{"composer"}, strArr...)
runner.Run(devTool, strArr...)

return nil

Expand All @@ -135,8 +136,9 @@ func cmdComposer(cCtx *cli.Context) error {
// Handle any command which has drush as first argument.
func cmdDrush(cCtx *cli.Context) error {

devTool, strArgs := helper(cCtx)
runner.Run(devTool, "drush "+strArgs)
devTool, strArr := helper(cCtx)
strArr = append([]string{"drush"}, strArr...)
runner.Run(devTool, strArr...)

return nil

Expand All @@ -145,37 +147,40 @@ func cmdDrush(cCtx *cli.Context) error {
// Handle any command which has a composer's second argument and idk sub-command.
func cmdComposerBased(subCmd string, cCtx *cli.Context) error {

devTool, strArgs := helper(cCtx)
cmd := "composer " + subCmd + strArgs

runner.Run(devTool, cmd)
devTool, strArr := helper(cCtx)
strArr = append([]string{"composer", subCmd}, strArr...)
runner.Run(devTool, strArr...)

return nil
}

// Handle any command which has a drush's second argument and idk sub-command.
func cmdDrushBased(subCmd string, cCtx *cli.Context) error {

devTool, strArgs := helper(cCtx)
cmd := "drush " + subCmd + strArgs

runner.Run(devTool, cmd)
devTool, strArr := helper(cCtx)
strArr = append([]string{"drush", subCmd}, strArr...)
runner.Run(devTool, strArr...)

return nil
}

// Helper for all commands.
func helper(cCtx *cli.Context) (string, string) {
func helper(cCtx *cli.Context) (string, []string) {

strArgs := ""
strArgs = argsToString(cCtx.Args())
// Make array of stings for the arguments.
args := cCtx.Args()
var strArr []string
for i := 0; i < args.Len(); i++ {
strArr = append(strArr, args.Get(i))
}

fmt.Println("Checking which dev tool configuration files are present...")
fmt.Println()

devTool := ""
devTool = checkForDevTool()

return devTool, strArgs
return devTool, strArr
}

// Check for dev tool's(ddev or lando) config files are present.
Expand Down Expand Up @@ -208,13 +213,3 @@ func checkForDevTool() string {
}
return ""
}

// Convert the cli.Args into string arguments.
func argsToString(args cli.Args) string {
var str strings.Builder
for i := 0; i < args.Len(); i++ {
str.WriteString(args.Get(i))
str.WriteString(" ")
}
return str.String()
}
12 changes: 8 additions & 4 deletions runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ import (
"fmt"
"os"
"os/exec"
"strings"
)

// Run command as lando OR ddev.
func Run(devTool string, args string) {
func Run(devTool string, args ...string) {

fmt.Println("Running: " + devTool + " " + args)
msg := "Running: " + devTool + " "
for i := 0; i < len(args); i++ {
msg += args[i] + " "
}
fmt.Println(msg)
fmt.Println()

command := exec.Command(devTool, strings.TrimSpace(args))
command := exec.Command(devTool, args...)
command.Stdout = os.Stdout
command.Stderr = os.Stderr
err := command.Run()
Expand Down