add: implemented the executable tool for prereqs

Author: michele-sciabarra

common.go

@@ -32,7 +32,9 @@ import (
 // default files
 const OPSFILE = "opsfile.yml"
 const OPSROOT = "opsroot.json"
-const DOCOPTS = "docopts.txt"
+const DOCOPTS_TXT = "docopts.txt"
+const DOCOPTS_MD = "docopts.txt"
+
 const PREREQ = "prereq.yml"
 const CONFIGFILE = "config.json"
 

ops.go

@@ -41,8 +41,8 @@ func (e *TaskNotFoundErr) Error() string {
 }
 
 func help() error {
-	if os.Getenv("OPS_NO_DOCOPTS") == "" && exists(".", DOCOPTS) {
-		os.Args = []string{"envsubst", "-no-unset", "-i", DOCOPTS}
+	if os.Getenv("OPS_NO_DOCOPTS") == "" && exists(".", DOCOPTS_TXT) {
+		os.Args = []string{"envsubst", "-no-unset", "-i", DOCOPTS_TXT}
 		return envsubst.EnvsubstMain()
 	}
 	// In case of syntax error, Task will return an error
@@ -223,9 +223,9 @@ func Ops(base string, args []string) error {
 	savedArgs := loadSavedArgs()
 
 	// parsed args
-	if os.Getenv("OPS_NO_DOCOPTS") == "" && exists(".", DOCOPTS) {
+	if os.Getenv("OPS_NO_DOCOPTS") == "" && exists(".", DOCOPTS_TXT) {
 		debug("PREPARSE:", rest)
-		opts := readfile(DOCOPTS)
+		opts := readfile(DOCOPTS_TXT)
 		trace("DOCOPTS: size=", len(opts))
 		parsedArgs := parseArgs(opts, rest)
 		trace("DOCOPTS: parsedargs=", parsedArgs)

prereq.go

@@ -22,9 +22,9 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 
+	"github.com/apache/openserverless-cli/tools"
 	"github.com/mitchellh/go-homedir"
 	"gopkg.in/yaml.v3"
 )
@@ -88,27 +88,11 @@ func loadPrereq(dir string) (Prereq, error) {
 	return prereq, err
 }
 
-func getOS() string {
-	res := os.Getenv("__OS")
-	if res == "" {
-		res = runtime.GOOS
-	}
-	return res
-}
-
-func getARCH() string {
-	res := os.Getenv("__ARCH")
-	if res == "" {
-		res = runtime.GOARCH
-	}
-	return res
-}
-
 func binDir() (string, error) {
 	var err error
 	bindir := os.Getenv("OPS_BIN")
 	if bindir == "" {
-		bindir, err = homedir.Expand(fmt.Sprintf("~/.ops/%s-%s/bin", getOS(), getARCH()))
+		bindir, err = homedir.Expand(fmt.Sprintf("~/.ops/%s-%s/bin", tools.GetOS(), tools.GetARCH()))
 		if err != nil {
 			return "", err
 		}
@@ -118,7 +102,7 @@ func binDir() (string, error) {
 }
 
 func addExeExt(name string) string {
-	if getOS() == "windows" {
+	if tools.GetOS() == "windows" {
 		return name + ".exe"
 	}
 	return name

tests/utils.bats

@@ -67,18 +67,21 @@ setup() {
 }
 
 @test "-executable"  {
-    skip
     touch _hello
-    run __OS=linux ops -executable _hello
+    chmod 0600 _hello
+    run env __OS=linux ops -executable _hello
     assert_success
+    assert_line "Successfully added execute permissions to _hello"
     assert test -x _hello
-    run __OS=windows ops -executable _hello
+    run env __OS=windows ops -executable _hello
     assert_success
     assert test -e _hello.exe
-    run __OS=windows ops -executable _hello.exe
+    assert_line "Successfully renamed _hello to _hello.exe"
+    run env __OS=windows ops -executable _hello.exe
     assert_success
     assert test -e _hello.exe
-    rm _hello
+    assert_line "Nothing to do"
+    rm _hello.exe
 }
 
 @test "-copy"  {

tools/tools.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"runtime"
 	"strings"
 
 	gojq "github.com/itchyny/gojq/cli"
@@ -39,6 +40,23 @@ func trace(args ...any) {
 	}
 }
 
+// shared with main
+func GetOS() string {
+	res := os.Getenv("__OS")
+	if res == "" {
+		res = runtime.GOOS
+	}
+	return res
+}
+
+func GetARCH() string {
+	res := os.Getenv("__ARCH")
+	if res == "" {
+		res = runtime.GOARCH
+	}
+	return res
+}
+
 // available in taskfiles
 // note some of them are implemented in main.go (config, retry)
 // Note the comment with @DOC which is used to generate the list of tools in documentation
@@ -64,6 +82,7 @@ var ToolList = []string{
 	"gron", "jj",
 	"rename",
 	"remove",
+	"executable",
 	"empty",
 	"extract",
 }
@@ -190,6 +209,10 @@ func RunTool(name string, args []string) (int, error) {
 		os.Args = append([]string{"remove"}, args...)
 		return Remove()
 
+	case "executable":
+		os.Args = append([]string{"executable"}, args...)
+		return Executable()
+
 	case "extract":
 		os.Args = append([]string{"extract"}, args...)
 		return Extract()