feat(scaffolding): add --path for all scaffold, generate and chain commands

starport/cmd/chain.go

@@ -13,6 +13,7 @@ func NewChain() *cobra.Command {
 		Args:    cobra.ExactArgs(1),
 	}
 
+	flagSetAppPath(c)
 	c.AddCommand(NewChainServe())
 	c.AddCommand(NewChainBuild())
 	c.AddCommand(NewChainInit())

starport/cmd/chain_build.go

@@ -33,13 +33,14 @@ Sample usages:
 		Args: cobra.ExactArgs(0),
 		RunE: chainBuildHandler,
 	}
+
 	c.Flags().AddFlagSet(flagSetHome())
 	c.Flags().AddFlagSet(flagSetProto3rdParty("Available only without the --release flag"))
-	c.Flags().StringVarP(&appPath, "path", "p", ".", "path of the app")
 	c.Flags().Bool(flagRelease, false, "build for a release")
 	c.Flags().StringSliceP(flagReleaseTargets, "t", []string{}, "release targets. Available only with --release flag")
 	c.Flags().String(flagReleasePrefix, "", "tarball prefix for each release target. Available only with --release flag")
 	c.Flags().BoolP("verbose", "v", false, "Verbose output")
+
 	return c
 }
 

starport/cmd/chain_faucet.go

@@ -18,9 +18,10 @@ func NewChainFaucet() *cobra.Command {
 		Args:  cobra.ExactArgs(2),
 		RunE:  chainFaucetHandler,
 	}
+
 	c.Flags().AddFlagSet(flagSetHome())
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
 	c.Flags().BoolP("verbose", "v", false, "Verbose output")
+
 	return c
 }
 

starport/cmd/chain_init.go

@@ -17,7 +17,6 @@ func NewChainInit() *cobra.Command {
 	}
 
 	c.Flags().AddFlagSet(flagSetHome())
-	c.Flags().StringVarP(&appPath, "path", "p", "", "Path of the app")
 
 	return c
 }

starport/cmd/chain_serve.go

@@ -5,11 +5,11 @@ import (
 	"github.com/tendermint/starport/starport/services/chain"
 )
 
-const flagForceReset = "force-reset"
-const flagResetOnce = "reset-once"
-const flagConfig = "config"
-
-var appPath string
+const (
+	flagForceReset = "force-reset"
+	flagResetOnce  = "reset-once"
+	flagConfig     = "config"
+)
 
 // NewChainServe creates a new serve command to serve a blockchain.
 func NewChainServe() *cobra.Command {
@@ -20,9 +20,9 @@ func NewChainServe() *cobra.Command {
 		Args:  cobra.ExactArgs(0),
 		RunE:  chainServeHandler,
 	}
+
 	c.Flags().AddFlagSet(flagSetHome())
 	c.Flags().AddFlagSet(flagSetProto3rdParty(""))
-	c.Flags().StringVarP(&appPath, "path", "p", "", "Path of the app")
 	c.Flags().BoolP("verbose", "v", false, "Verbose output")
 	c.Flags().BoolP(flagForceReset, "f", false, "Force reset of the app state on start and every source change")
 	c.Flags().BoolP(flagResetOnce, "r", false, "Reset of the app state on first start")

starport/cmd/cmd.go

@@ -22,13 +22,16 @@ import (
 )
 
 const (
+	flagAppPath       = "path"
 	flagHome          = "home"
 	flagProto3rdParty = "proto-all-modules"
-)
 
-const checkVersionTimeout = time.Millisecond * 600
+	checkVersionTimeout = time.Millisecond * 600
+)
 
 var (
+	appPath string
+
 	infoColor = color.New(color.FgYellow).SprintFunc()
 )
 
@@ -89,6 +92,10 @@ func printEvents(bus events.Bus, s *clispinner.Spinner) {
 	}
 }
 
+func flagSetAppPath(cmd *cobra.Command) {
+	cmd.PersistentFlags().StringVarP(&appPath, flagAppPath, "p", ".", "path of the app")
+}
+
 func flagSetHome() *flag.FlagSet {
 	fs := flag.NewFlagSet("", flag.ContinueOnError)
 	fs.String(flagHome, "", "Home directory used for blockchains")

starport/cmd/generate.go

@@ -16,6 +16,7 @@ Produced source code can be regenerated by running a command again and is not me
 		Args:    cobra.ExactArgs(1),
 	}
 
+	flagSetAppPath(c)
 	c.AddCommand(NewGenerateGo())
 	c.AddCommand(NewGenerateVuex())
 	c.AddCommand(NewGenerateDart())

starport/cmd/scaffold.go

@@ -30,6 +30,7 @@ CRUD stands for "create, read, update, delete".`,
 		Args:    cobra.ExactArgs(1),
 	}
 
+	flagSetAppPath(c)
 	c.AddCommand(NewScaffoldChain())
 	c.AddCommand(NewScaffoldModule())
 	c.AddCommand(NewScaffoldList())

starport/cmd/scaffold_chain.go

@@ -37,14 +37,15 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		noDefaultModule, _ = cmd.Flags().GetBool(flagNoDefaultModule)
 	)
 
-	sc, err := scaffolder.New("",
+	sc, err := scaffolder.New(
+		appPath,
 		scaffolder.AddressPrefix(addressPrefix),
 	)
 	if err != nil {
 		return err
 	}
 
-	appdir, err := sc.Init(placeholder.New(), name, noDefaultModule)
+	appdir, err := sc.Init(placeholder.New(), name, appPath, noDefaultModule)
 	if err != nil {
 		return err
 	}

starport/cmd/scaffold_list.go

@@ -14,7 +14,6 @@ func NewScaffoldList() *cobra.Command {
 		RunE:  scaffoldListHandler,
 	}
 
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
 	c.Flags().AddFlagSet(flagSetScaffoldType())
 
 	return c

starport/cmd/scaffold_map.go

@@ -18,7 +18,6 @@ func NewScaffoldMap() *cobra.Command {
 		RunE:  scaffoldMapHandler,
 	}
 
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
 	c.Flags().AddFlagSet(flagSetScaffoldType())
 	c.Flags().StringSlice(FlagIndexes, []string{"index"}, "fields that index the value")
 

starport/cmd/scaffold_message.go

@@ -19,7 +19,7 @@ func NewScaffoldMessage() *cobra.Command {
 		Args:  cobra.MinimumNArgs(1),
 		RunE:  messageHandler,
 	}
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
+
 	c.Flags().String(flagModule, "", "Module to add the message into. Default: app's main module")
 	c.Flags().StringSliceP(flagResponse, "r", []string{}, "Response fields")
 	c.Flags().StringP(flagDescription, "d", "", "Description of the command")

starport/cmd/scaffold_query.go

@@ -21,7 +21,7 @@ func NewScaffoldQuery() *cobra.Command {
 		Args:  cobra.MinimumNArgs(1),
 		RunE:  queryHandler,
 	}
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
+
 	c.Flags().String(flagModule, "", "Module to add the query into. Default: app's main module")
 	c.Flags().StringSliceP(flagResponse, "r", []string{}, "Response fields")
 	c.Flags().StringP(flagDescription, "d", "", "Description of the command")

starport/cmd/scaffold_single.go

@@ -14,7 +14,6 @@ func NewScaffoldSingle() *cobra.Command {
 		RunE:  scaffoldSingleHandler,
 	}
 
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
 	c.Flags().AddFlagSet(flagSetScaffoldType())
 
 	return c

starport/cmd/scaffold_type.go

@@ -14,7 +14,6 @@ func NewScaffoldType() *cobra.Command {
 		RunE:  scaffoldTypeHandler,
 	}
 
-	c.Flags().StringVarP(&appPath, "path", "p", "", "path of the app")
 	c.Flags().AddFlagSet(flagSetScaffoldType())
 
 	return c

starport/pkg/xgenny/run.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"os"
+	"path/filepath"
 
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/logger"
@@ -36,7 +37,10 @@ func RunWithValidation(
 ) (sm SourceModification, err error) {
 	// run executes the provided runner with the provided generator
 	run := func(runner *genny.Runner, gen *genny.Generator) error {
-		runner.With(gen)
+		err := runner.With(gen)
+		if err != nil {
+			return err
+		}
 		return runner.Run()
 	}
 	for _, gen := range gens {
@@ -55,17 +59,22 @@ func RunWithValidation(
 		// fetch the source modification
 		sm = NewSourceModification()
 		for _, file := range dryRunner.Results().Files {
-			_, err := os.Stat(file.Name())
+			fileName := file.Name()
+			if !filepath.IsAbs(fileName) {
+				fileName = filepath.Join(dryRunner.Root, fileName)
+			}
+
+			_, err := os.Stat(fileName)
 
 			// nolint:gocritic
 			if os.IsNotExist(err) {
 				// if the file doesn't exist in the source, it means it has been created by the runner
-				sm.AppendCreatedFiles(file.Name())
+				sm.AppendCreatedFiles(fileName)
 			} else if err != nil {
 				return sm, err
 			} else {
 				// the file has been modified by the runner
-				sm.AppendModifiedFiles(file.Name())
+				sm.AppendModifiedFiles(fileName)
 			}
 		}
 

starport/pkg/xgenny/xgenny.go

@@ -13,12 +13,13 @@ import (
 type Walker struct {
 	fs         embed.FS
 	trimPrefix string
+	path       string
 }
 
 // NewEmbedWalker returns a new Walker for fs.
 // trimPrefix is used to trim parent paths from the paths of found files.
-func NewEmbedWalker(fs embed.FS, trimPrefix string) Walker {
-	return Walker{fs, trimPrefix}
+func NewEmbedWalker(fs embed.FS, trimPrefix, path string) Walker {
+	return Walker{fs: fs, trimPrefix: trimPrefix, path: path}
 }
 
 // Walk implements packd.Walker.
@@ -46,7 +47,7 @@ func (w Walker) walkDir(wl packd.WalkFunc, path string) error {
 		}
 
 		ppath := strings.TrimPrefix(path, w.trimPrefix)
-
+		ppath = filepath.Join(w.path, ppath)
 		f, err := packd.NewFile(ppath, bytes.NewReader(data))
 		if err != nil {
 			return err

starport/services/scaffolder/init.go

@@ -30,16 +30,26 @@ var (
 
 // Init initializes a new app with name and given options.
 // path is the relative path to the scaffoled app.
-func (s *Scaffolder) Init(tracer *placeholder.Tracer, name string, noDefaultModule bool) (path string, err error) {
+func (s *Scaffolder) Init(tracer *placeholder.Tracer, name, appPath string, noDefaultModule bool) (path string, err error) {
 	pathInfo, err := gomodulepath.Parse(name)
 	if err != nil {
 		return "", err
 	}
+
 	pwd, err := os.Getwd()
 	if err != nil {
 		return "", err
 	}
-	absRoot := filepath.Join(pwd, pathInfo.Root)
+	// if the path is not set, use the current directory
+	if appPath == "" {
+		appPath = pwd
+	} else {
+		appPath, err = filepath.Abs(appPath)
+		if err != nil {
+			return "", err
+		}
+	}
+	absRoot := filepath.Join(appPath, pathInfo.Root)
 
 	// create the project
 	if err := s.generate(tracer, pathInfo, absRoot, noDefaultModule); err != nil {
@@ -51,10 +61,16 @@ func (s *Scaffolder) Init(tracer *placeholder.Tracer, name string, noDefaultModu
 	}
 
 	// initialize git repository and perform the first commit
-	if err := initGit(pathInfo.Root); err != nil {
+	if err := initGit(absRoot); err != nil {
+		return "", err
+	}
+
+	// get the relative app path from the current directory
+	relativePath, err := filepath.Rel(pwd, appPath)
+	if err != nil {
 		return "", err
 	}
-	return pathInfo.Root, nil
+	return filepath.Join(relativePath, pathInfo.Root), nil
 }
 
 //nolint:interfacer
@@ -73,7 +89,7 @@ func (s *Scaffolder) generate(
 		// generate application template
 		ModulePath:       pathInfo.RawPath,
 		AppName:          pathInfo.Package,
-		AppPath:          s.path,
+		AppPath:          absRoot,
 		OwnerName:        owner(pathInfo.RawPath),
 		OwnerAndRepoName: gu.UserAndRepo(),
 		BinaryNamePrefix: pathInfo.Root,
@@ -98,6 +114,7 @@ func (s *Scaffolder) generate(
 			ModuleName: pathInfo.Package, // App name
 			ModulePath: pathInfo.RawPath,
 			AppName:    pathInfo.Package,
+			AppPath:    absRoot,
 			OwnerName:  owner(pathInfo.RawPath),
 			IsIBC:      false,
 		}

starport/services/scaffolder/message.go

@@ -2,7 +2,6 @@ package scaffolder
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/gobuffalo/genny"
 	"github.com/tendermint/starport/starport/pkg/field"
@@ -103,6 +102,7 @@ func (s *Scaffolder) AddMessage(
 		g    *genny.Generator
 		opts = &message.Options{
 			AppName:    path.Package,
+			AppPath:    s.path,
 			ModulePath: path.RawPath,
 			ModuleName: moduleName,
 			OwnerName:  owner(path.RawPath),
@@ -124,6 +124,7 @@ func (s *Scaffolder) AddMessage(
 			ModuleName: opts.ModuleName,
 			ModulePath: opts.ModulePath,
 			AppName:    opts.AppName,
+			AppPath:    opts.AppPath,
 			OwnerName:  opts.OwnerName,
 		},
 	)
@@ -141,11 +142,7 @@ func (s *Scaffolder) AddMessage(
 	if err != nil {
 		return sm, err
 	}
-	pwd, err := os.Getwd()
-	if err != nil {
-		return sm, err
-	}
-	return sm, s.finish(pwd, path.RawPath)
+	return sm, s.finish(opts.AppPath, path.RawPath)
 }
 
 // checkForbiddenMessageField returns true if the name is forbidden as a message name