Merge branch '27-fix-shell' into 'master'

Resolve "jumper shell outside project does not detect the project"

Closes #27

See merge request asannikov/mgt!27

Author: asannikov

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.5.7 (13.01.2021)
+- bugfix
+    - 27 Fix shell type detection outside project
+
 ## 1.5.6 (13.01.2021)
 - bugfix
     - refactoring: changed files hierarchy in project

Readme.md

@@ -6,7 +6,7 @@ I was inspired by [Mark's Shust](https://github.com/markshust/docker-magento) so
 
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/asannikov/jumper/blob/master/LICENSE)
 [![Build Status](https://travis-ci.com/asannikov/jumper.svg?branch=master)](https://travis-ci.com/asannikov/jumper)
-[![Release](https://img.shields.io/badge/release-1.5.3-brightgreen.svg)](https://github.com/asannikov/jumper/releases/tag/v1.5.6)
+[![Release](https://img.shields.io/badge/release-1.5.3-brightgreen.svg)](https://github.com/asannikov/jumper/releases/tag/v1.5.7)
 
 It was not tested on Windows.
 
@@ -103,7 +103,7 @@ Every stable release has attached sources for "linux/amd64", "linux/386", "darwi
 
 For example:
 ```
-https://github.com/asannikov/jumper/releases/tag/v1.5.6
+https://github.com/asannikov/jumper/releases/tag/v1.5.7
 ```
 Find related source there and download it. Now you can place use source at any place you want on your machine or make it global in a standard way.
 

app/test.go app/app_test.goapp/test.go renamed to app/app_test.go

@@ -90,6 +90,7 @@ func (tfs *testFileSystem) GetWd() (string, error) {
 	return tfs.getWd()
 }
 
+// TestDefinePaths tests definePaths
 func TestDefinePaths(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -116,6 +117,7 @@ func TestDefinePaths(t *testing.T) {
 	assert.EqualError(t, err, "Cannot read directory")
 }
 
+// TestSeekPathDefinePaths tests seekPath
 func TestSeekPathDefinePaths(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -133,6 +135,7 @@ func TestSeekPathDefinePaths(t *testing.T) {
 	assert.EqualError(t, err, "Cannot read directory")
 }
 
+// TestSeekPathLoadConfig tests seekPath
 func TestSeekPathLoadConfig(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -155,6 +158,7 @@ func TestSeekPathLoadConfig(t *testing.T) {
 	assert.EqualError(t, err, "Cannot read config file")
 }
 
+// TestSeekPathGetWd tests seekPath
 func TestSeekPathGetWd(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -180,6 +184,7 @@ func TestSeekPathGetWd(t *testing.T) {
 	assert.EqualError(t, err, "Cannot get current directory")
 }
 
+// TestSeekPathGetProjectNameList tests seekPath
 func TestSeekPathGetProjectNameList(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -217,6 +222,7 @@ func TestSeekPathGetProjectNameList(t *testing.T) {
 	assert.Equal(t, 2, len(pl))
 }
 
+// TestSeekPathrunDialogCase1 tests seekPath
 func TestSeekPathrunDialogCase1(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -255,6 +261,7 @@ func TestSeekPathrunDialogCase1(t *testing.T) {
 	assert.EqualError(t, err, "Error SelectProject dialog")
 }
 
+// TestSeekPathrunDialogCase2 tests seekPath
 func TestSeekPathrunDialogCase2(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -305,6 +312,7 @@ func TestSeekPathrunDialogCase2(t *testing.T) {
 	assert.EqualError(t, err, "Is ok")
 }
 
+// TestSeekPathrunDialogCase3 tests seekPath
 func TestSeekPathrunDialogCase3(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -358,6 +366,7 @@ func TestSeekPathrunDialogCase3(t *testing.T) {
 	assert.EqualError(t, err, "Is ok")
 }
 
+// TestSeekPathrunDialogCase4 tests seekPath
 func TestSeekPathrunDialogCase4(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -411,6 +420,7 @@ func TestSeekPathrunDialogCase4(t *testing.T) {
 	assert.EqualError(t, err, "Add project name dialog error")
 }
 
+// TestSeekPathrunDialogCase5 tests seekPath
 func TestSeekPathrunDialogCase5(t *testing.T) {
 	cfg := &config.Config{
 		ProjectFile: confgFile,
@@ -487,7 +497,7 @@ func TestSeekPathrunDialogCase5(t *testing.T) {
 	assert.EqualError(t, err, "Cannot save project config file")
 }
 
-// The same as TestSeekPathrunDialogCase5, but checks return nil for seek function
+// TestSeekPathrunDialogCase6 tests seekPath. The same as TestSeekPathrunDialogCase5, but checks return nil for seek function
 // see saveConfigFile return change
 func TestSeekPathrunDialogCase6(t *testing.T) {
 	cfg := &config.Config{

app/command/cli.go

@@ -10,15 +10,18 @@ import (
 	"github.com/urfave/cli/v2" // imports as package "cli"
 )
 
+type commandHandler func(chc commandHandleProjectConfig) string
+
 type cliCommand struct {
 	usage   map[string]string
 	aliases map[string]string
 	args    map[string][]string
-	command map[string]string
+	command map[string]func(commandHandleProjectConfig) string
 }
 
-func (cli *cliCommand) GetCommand(cmd string) string {
-	return cli.command[cmd]
+func (cli *cliCommand) GetCommand(cmd string, cfg commandHandleProjectConfig) string {
+	command := cli.command[cmd]
+	return command(cfg)
 }
 
 func (cli *cliCommand) GetArgs() map[string][]string {
@@ -35,6 +38,10 @@ type callCliCommandDialog interface {
 	SetMainContaner([]string) (int, string, error)
 }
 
+type commandHandleProjectConfig interface {
+	GetShell() string
+}
+
 // CallCliCommand calls a range of differnt cli commands
 func CallCliCommand(commandName string, initf func(bool) string, cfg cliCommandHandleProjectConfig, d callCliCommandDialog, cl containerlist) *cli.Command {
 	clic := &cliCommand{
@@ -59,12 +66,22 @@ func CallCliCommand(commandName string, initf func(bool) string, cfg cliCommandH
 			"clinotty":     []string{"-i"},
 			"clirootnotty": []string{"-u", "root", "-i"},
 		},
-		command: map[string]string{
-			"cli":          "",
-			"sh":           cfg.GetShell(),
-			"clinotty":     "",
-			"cliroot":      "",
-			"clirootnotty": "",
+		command: map[string]func(commandHandleProjectConfig) string{
+			"cli": func(c commandHandleProjectConfig) string {
+				return ""
+			},
+			"sh": func(c commandHandleProjectConfig) string {
+				return c.GetShell()
+			},
+			"clinotty": func(c commandHandleProjectConfig) string {
+				return ""
+			},
+			"cliroot": func(c commandHandleProjectConfig) string {
+				return ""
+			},
+			"clirootnotty": func(c commandHandleProjectConfig) string {
+				return ""
+			},
 		},
 	}
 
@@ -95,7 +112,7 @@ func CallCliCommand(commandName string, initf func(bool) string, cfg cliCommandH
 }
 
 type cliCommandInterface interface {
-	GetCommand(string) string
+	GetCommand(string, commandHandleProjectConfig) string
 	GetArgs() map[string][]string
 }
 
@@ -125,11 +142,11 @@ func cliCommandHandle(index string, cfg cliCommandHandleProjectConfig, d cliComm
 
 	initArgs = append(initArgs, cfg.GetProjectMainContainer())
 
-	if c.GetCommand(index) != "" {
-		initArgs = append(initArgs, c.GetCommand(index))
+	if c.GetCommand(index, cfg) != "" {
+		initArgs = append(initArgs, c.GetCommand(index, cfg))
 	}
 
-	if c.GetCommand(index) == "" && a.Get(0) == "" {
+	if c.GetCommand(index, cfg) == "" && a.Get(0) == "" {
 		return []string{}, errors.New("Please specify a CLI command (ex. ls)")
 	}
 

app/command/cli_test.go

@@ -41,7 +41,7 @@ type testCli struct {
 	command map[string]string
 }
 
-func (tc *testCli) GetCommand(cmd string) string {
+func (tc *testCli) GetCommand(cmd string, cfg commandHandleProjectConfig) string {
 	return tc.command[cmd]
 }
 

main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-const version = "1.5.6"
+const version = "1.5.7"
 
 func main() {