Add nash.Setvar and nash.Getvar (#135)

Signed-off-by: Tiago Natel de Moura <tiago.natel@neoway.com.br>

Author: i4ki

internal/sh/shell.go

@@ -294,13 +294,13 @@ func (shell *Shell) SetEnviron(processEnv []string) {
 	}
 }
 
-func (shell *Shell) GetVar(name string) (sh.Obj, bool) {
+func (shell *Shell) Getvar(name string) (sh.Obj, bool) {
 	if value, ok := shell.vars[name]; ok {
 		return value, ok
 	}
 
 	if shell.parent != nil {
-		return shell.parent.GetVar(name)
+		return shell.parent.Getvar(name)
 	}
 
 	return nil, false
@@ -1355,7 +1355,7 @@ func (shell *Shell) evalVariable(a ast.Expr) (sh.Obj, error) {
 	vexpr := a.(*ast.VarExpr)
 	varName := vexpr.Name()
 
-	if v, ok = shell.GetVar(varName[1:]); !ok {
+	if v, ok = shell.Getvar(varName[1:]); !ok {
 		return nil, fmt.Errorf("Variable %s not set on shell %s", varName, shell.name)
 	}
 
@@ -1419,7 +1419,7 @@ func (shell *Shell) executeSetenv(v *ast.SetenvNode) error {
 
 	varName := v.Identifier()
 
-	if varValue, ok = shell.GetVar(varName); !ok {
+	if varValue, ok = shell.Getvar(varName); !ok {
 		return fmt.Errorf("Variable '%s' not set on shell %s", varName, shell.name)
 	}
 
@@ -1492,7 +1492,7 @@ func (shell *Shell) executeExecAssign(v *ast.ExecAssignNode) error {
 
 	outStr := string(varOut.Bytes())
 
-	if ifs, ok := shell.GetVar("IFS"); ok && ifs.Type() == sh.ListType {
+	if ifs, ok := shell.Getvar("IFS"); ok && ifs.Type() == sh.ListType {
 		ifslist := ifs.(*sh.ListObj)
 
 		if len(ifslist.List()) > 0 {

internal/sh/shell_test.go

@@ -1865,7 +1865,7 @@ func TestExecuteErrorSuppressionAll(t *testing.T) {
 		return
 	}
 
-	scode, ok := shell.GetVar("status")
+	scode, ok := shell.Getvar("status")
 
 	if !ok || scode.Type() != sh.StringType || scode.String() != strconv.Itoa(ENotFound) {
 		t.Errorf("Invalid status code %s", scode.String())
@@ -1879,7 +1879,7 @@ func TestExecuteErrorSuppressionAll(t *testing.T) {
 		return
 	}
 
-	scode, ok = shell.GetVar("status")
+	scode, ok = shell.Getvar("status")
 
 	if !ok || scode.Type() != sh.StringType || scode.String() != "0" {
 		t.Errorf("Invalid status code %s", scode)
@@ -1898,7 +1898,7 @@ func TestExecuteErrorSuppressionAll(t *testing.T) {
 		return
 	}
 
-	scode, ok = shell.GetVar("status")
+	scode, ok = shell.Getvar("status")
 
 	if !ok || scode.Type() != sh.StringType || scode.String() != "255|127" {
 		t.Errorf("Invalid status code %s", scode)

nash.go

@@ -141,3 +141,13 @@ func (nash *Shell) SetStdin(in io.Reader) {
 func (nash *Shell) Stdin() io.Reader  { return nash.interp.Stdin() }
 func (nash *Shell) Stdout() io.Writer { return nash.interp.Stdout() }
 func (nash *Shell) Stderr() io.Writer { return nash.interp.Stderr() }
+
+// Setvar sets or updates the variable in the nash session
+func (nash *Shell) Setvar(name string, value sh.Obj) {
+	nash.interp.Setvar(name, value)
+}
+
+// Getvar retrieves a variable from nash session
+func (nash *Shell) Getvar(name string) (sh.Obj, bool) {
+	return nash.interp.Getvar(name)
+}

nash_test.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"os"
 	"testing"
+
+	"github.com/NeowayLabs/nash/sh"
 )
 
 // only testing the public API
@@ -33,19 +35,19 @@ func TestExecuteFile(t *testing.T) {
 
 	var out bytes.Buffer
 
-	sh, err := New()
+	shell, err := New()
 
 	if err != nil {
 		t.Error(err)
 		return
 	}
 
-	sh.SetNashdPath(nashdPath)
-	sh.SetStdout(&out)
-	sh.SetStderr(os.Stderr)
-	sh.SetStdin(os.Stdin)
+	shell.SetNashdPath(nashdPath)
+	shell.SetStdout(&out)
+	shell.SetStderr(os.Stderr)
+	shell.SetStdin(os.Stdin)
 
-	err = sh.ExecuteFile(testfile)
+	err = shell.ExecuteFile(testfile)
 
 	if err != nil {
 		t.Error(err)
@@ -59,7 +61,7 @@ func TestExecuteFile(t *testing.T) {
 }
 
 func TestExecuteString(t *testing.T) {
-	sh, err := New()
+	shell, err := New()
 
 	if err != nil {
 		t.Error(err)
@@ -68,9 +70,9 @@ func TestExecuteString(t *testing.T) {
 
 	var out bytes.Buffer
 
-	sh.SetStdout(&out)
+	shell.SetStdout(&out)
 
-	err = sh.ExecuteString("-ínput-", "echo -n AAA")
+	err = shell.ExecuteString("-ínput-", "echo -n AAA")
 
 	if err != nil {
 		t.Error(err)
@@ -84,7 +86,7 @@ func TestExecuteString(t *testing.T) {
 
 	out.Reset()
 
-	err = sh.ExecuteString("-input-", `
+	err = shell.ExecuteString("-input-", `
         PROMPT="humpback> "
         setenv PROMPT
         `)
@@ -94,7 +96,7 @@ func TestExecuteString(t *testing.T) {
 		return
 	}
 
-	prompt := sh.Prompt()
+	prompt := shell.Prompt()
 
 	if prompt != "humpback> " {
 		t.Errorf("Invalid prompt = %s", prompt)
@@ -104,7 +106,7 @@ func TestExecuteString(t *testing.T) {
 }
 
 func TestSetDotDir(t *testing.T) {
-	sh, err := New()
+	shell, err := New()
 
 	if err != nil {
 		t.Error(err)
@@ -113,18 +115,18 @@ func TestSetDotDir(t *testing.T) {
 
 	var out bytes.Buffer
 
-	sh.SetStdout(&out)
+	shell.SetStdout(&out)
 
-	sh.SetDotDir("/tmp")
+	shell.SetDotDir("/tmp")
 
-	dotDir := sh.DotDir()
+	dotDir := shell.DotDir()
 
 	if dotDir != "/tmp" {
 		t.Errorf("Invalid .nash = %s", dotDir)
 		return
 	}
 
-	err = sh.ExecuteString("-ínput-", "echo -n $NASHPATH")
+	err = shell.ExecuteString("-ínput-", "echo -n $NASHPATH")
 
 	if err != nil {
 		t.Error(err)
@@ -136,3 +138,36 @@ func TestSetDotDir(t *testing.T) {
 		return
 	}
 }
+
+func TestSetvar(t *testing.T) {
+	shell, err := New()
+
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	shell.Setvar("__TEST__", sh.NewStrObj("something"))
+
+	var out bytes.Buffer
+	shell.SetStdout(&out)
+
+	err = shell.Exec("TestSetvar", `echo -n $__TEST__`)
+
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if string(out.Bytes()) != "something" {
+		t.Errorf("Value differ: '%s' != '%s'", string(out.Bytes()), "something")
+		return
+	}
+
+	val, ok := shell.Getvar("__TEST__")
+
+	if !ok || val.String() != "something" {
+		t.Errorf("Getvar doesn't work: '%s' != '%s'", val, "something")
+		return
+	}
+}