WIP

pkg/commands/os.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"sync"
 
@@ -117,36 +116,6 @@ func (c *OSCommand) ExecutableFromString(commandStr string) *exec.Cmd {
 	return cmd
 }
 
-// RunCommandWithOutputLive runs RunCommandWithOutputLiveWrapper
-func (c *OSCommand) RunCommandWithOutputLive(command string, output func(string) string) error {
-	return RunCommandWithOutputLiveWrapper(c, command, output)
-}
-
-// DetectUnamePass detect a username / password question in a command
-// ask is a function that gets executen when this function detect you need to fillin a password
-// The ask argument will be "username" or "password" and expects the user's password or username back
-func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) error {
-	ttyText := ""
-	errMessage := c.RunCommandWithOutputLive(command, func(word string) string {
-		ttyText = ttyText + " " + word
-
-		prompts := map[string]string{
-			"password": `Password\s*for\s*'.+':`,
-			"username": `Username\s*for\s*'.+':`,
-		}
-
-		for askFor, pattern := range prompts {
-			if match, _ := regexp.MatchString(pattern, ttyText); match {
-				ttyText = ""
-				return ask(askFor)
-			}
-		}
-
-		return ""
-	})
-	return errMessage
-}
-
 // RunCommand runs a command and just returns the error
 func (c *OSCommand) RunCommand(formatString string, formatArgs ...interface{}) error {
 	_, err := c.RunCommandWithOutput(formatString, formatArgs...)

pkg/config/app_config.go

@@ -305,6 +305,8 @@ keybinding:
     prevScreenMode: '_'
     undo: 'z'
     redo: '<c-z>'
+    install: 'i'
+    cleanInstall: 'I'
   status:
     checkForUpdate: 'u'
   main:

pkg/gui/dependencies_panel.go

@@ -25,3 +25,14 @@ func (gui *Gui) handleDepSelect(g *gocui.Gui, v *gocui.View) error {
 	}
 	return nil
 }
+
+// linkPathMap returns the set of link paths of the current package's dependencies
+func (gui *Gui) linkPathMap() map[string]bool {
+	linkPathMap := map[string]bool{}
+	for _, dep := range gui.State.Deps {
+		if dep.Linked() {
+			linkPathMap[dep.LinkPath] = true
+		}
+	}
+	return linkPathMap
+}

pkg/gui/keybindings.go

@@ -439,6 +439,12 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleLinkPackage,
 		},
+		{
+			ViewName: "",
+			Key:      gui.getKey("universal.install"),
+			Modifier: gocui.ModNone,
+			Handler:  gui.wrappedHandler(gui.handleInstall),
+		},
 	}
 
 	for _, viewName := range []string{"status", "packages", "deps", "scripts", "menu"} {

pkg/gui/packages_panel.go

@@ -116,15 +116,31 @@ func (gui *Gui) handleLinkPackage(g *gocui.Gui, v *gocui.View) error {
 
 	var cmdStr string
 	if selectedPkg == currentPkg {
-		cmdStr = "npm link"
+		if gui.linkPathMap()[selectedPkg.Path] {
+			cmdStr = "npm unlink"
+		} else {
+			cmdStr = "npm link"
+		}
 	} else {
-		cmdStr = fmt.Sprintf("npm link %s", selectedPkg.Config.Name)
+		if gui.linkPathMap()[selectedPkg.Path] {
+			cmdStr = fmt.Sprintf("npm unlink --no-save %s", selectedPkg.Config.Name)
+		} else {
+			cmdStr = fmt.Sprintf("npm link %s", selectedPkg.Config.Name)
+		}
 	}
 
 	cmd := gui.OSCommand.ExecutableFromString(cmdStr)
-	if err := gui.newCmdTask("main", cmd); err != nil {
+	if err := gui.newPtyTask("main", cmd); err != nil {
 		gui.Log.Error(err)
 	}
 
 	return nil
 }
+
+func (gui *Gui) handleInstall() error {
+	cmd := gui.OSCommand.ExecutableFromString("npm install")
+	if err := gui.newPtyTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
+	return nil
+}