Merge branch version/0-35-0-RC1 to adopt changes from PR #2112

Author: as-builds

cmd/state/internal/cmdtree/use.go

@@ -23,7 +23,6 @@ func newUseCommand(prime *primer.Values) *captain.Command {
 			{
 				Name:        locale.T("arg_state_use_namespace"),
 				Description: locale.T("arg_state_use_namespace_description"),
-				Required:    true,
 				Value:       params.Namespace,
 			},
 		},

internal/runbits/findproject/project.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
+	"github.com/ActiveState/cli/internal/osutils"
 	"github.com/ActiveState/cli/internal/prompt"
 	"github.com/ActiveState/cli/pkg/project"
 	"github.com/ActiveState/cli/pkg/projectfile"
@@ -52,10 +53,19 @@ func FromPath(path string, ns *project.Namespaced) (*project.Project, error) {
 	return pj, nil
 }
 
-// FromNamespaceLocal returns a local project (if any) that matches the given namespace.
+// FromNamespaceLocal returns a local project (if any) that matches the given namespace (or the
+// project in the current working directory if namespace was not given).
 // This is primarily used by `state use` in order to fetch a project to switch to if it already
 // exists locally. The namespace may omit the owner.
 func FromNamespaceLocal(ns *project.Namespaced, cfg projectfile.ConfigGetter, prompt prompt.Prompter) (*project.Project, error) {
+	if ns == nil || !ns.IsValid() {
+		root, err := osutils.Getwd()
+		if err != nil {
+			return nil, locale.WrapInputError(err, "Unable to determine current working directory. Please specify a project to use.")
+		}
+		return project.FromPath(root)
+	}
+
 	matchingProjects := make(map[string][]string)
 	matchingNamespaces := make([]string, 0)
 	for namespace, paths := range projectfile.GetProjectMapping(cfg) {

test/integration/use_int_test.go

@@ -105,6 +105,39 @@ func (suite *UseIntegrationTestSuite) TestUse() {
 	cp.ExpectExitCode(1)
 }
 
+func (suite *UseIntegrationTestSuite) TestUseCwd() {
+	suite.OnlyRunForTags(tagsuite.Use)
+
+	ts := e2e.New(suite.T(), false)
+	defer ts.Close()
+
+	pythonDir := filepath.Join(ts.Dirs.Work, "MyPython3")
+
+	cp := ts.SpawnWithOpts(
+		e2e.WithArgs("checkout", "ActiveState-CLI/Python3", pythonDir),
+		e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
+	)
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
+	cp = ts.SpawnWithOpts(
+		e2e.WithArgs("use"),
+		e2e.WithWorkDirectory(pythonDir),
+		e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
+	)
+	cp.Expect("Switched to project")
+	cp.ExpectExitCode(0)
+
+	emptyDir := filepath.Join(ts.Dirs.Work, "EmptyDir")
+	suite.Require().NoError(fileutils.Mkdir(emptyDir))
+	cp = ts.SpawnWithOpts(
+		e2e.WithArgs("use"),
+		e2e.WithWorkDirectory(emptyDir),
+	)
+	cp.Expect("Unable to use project")
+	cp.ExpectExitCode(1)
+}
+
 func (suite *UseIntegrationTestSuite) TestReset() {
 	suite.OnlyRunForTags(tagsuite.Use)