chore: more consistent commands and add --nobuild flag

cmd/yap/command/build.go

@@ -41,7 +41,7 @@ var (
 				log.Fatal(err)
 			}
 
-			if project.NoCache {
+			if project.CleanBuild {
 				if err := mpc.Clean(); err != nil {
 					fmt.Printf("%s❌ :: %sError:\n%s",
 						string(constants.ColorBlue),
@@ -65,16 +65,18 @@ var (
 func init() {
 	rootCmd.AddCommand(buildCmd)
 	buildCmd.AddCommand(listTargetsCmd)
-	buildCmd.Flags().StringVarP(&source.SSHPassword,
-		"ssh-password", "p", "", "Optional SSH password to use for private repositories")
-	buildCmd.Flags().BoolVarP(&project.SkipSyncBuildEnvironmentDeps,
-		"ignore-makedeps", "d", false, "Ignore make dependencies resolution")
-	buildCmd.Flags().BoolVarP(&project.NoCache,
-		"no-cache", "c", false, "Do not use cache when building the project")
+	buildCmd.Flags().BoolVarP(&project.CleanBuild,
+		"cleanbuild", "c", false, "Remove $srcdir/ dir before building the package")
+	buildCmd.Flags().BoolVarP(&project.NoMakeDeps,
+		"nomakedeps", "d", false, "Skip all make dependency (makedeps) checks")
+	buildCmd.Flags().BoolVarP(&project.NoBuild,
+		"nobuild", "o", false, "Download and extract files only")
 	buildCmd.PersistentFlags().StringVarP(&parser.OverridePkgver,
-		"override-pkgver", "o", "", "Override package version (pkgver)")
-	buildCmd.Flags().BoolVarP(&project.SkipSyncFlag,
+		"pkgver", "w", "", "Use a custom package version (pkgver)")
+	buildCmd.Flags().BoolVarP(&project.SkipSyncDeps,
 		"skip-sync", "s", false, "Skip sync with remotes for package managers")
+	buildCmd.Flags().StringVarP(&source.SSHPassword,
+		"ssh-password", "p", "", "Optional SSH password to use for private repositories")
 	buildCmd.Flags().StringVarP(&project.FromPkgName,
 		"from", "", "", "Build starting from a defined package name")
 	buildCmd.Flags().StringVarP(&project.ToPkgName,

cmd/yap/command/prepare.go

@@ -25,7 +25,7 @@ var (
 			distro := split[0]
 
 			packageManager := packer.GetPackageManager(&pkgbuild.PKGBUILD{}, distro)
-			if !project.SkipSyncFlag {
+			if !project.SkipSyncDeps {
 				if err := packageManager.Update(); err != nil {
 					log.Fatal(err)
 				}
@@ -53,7 +53,7 @@ var (
 
 func init() {
 	rootCmd.AddCommand(prepareCmd)
-	prepareCmd.Flags().BoolVarP(&project.SkipSyncFlag,
+	prepareCmd.Flags().BoolVarP(&project.SkipSyncDeps,
 		"skip-sync", "s", false, "Skip sync with remotes for package managers")
 	prepareCmd.Flags().BoolVarP(&GoLang,
 		"golang", "g", false, "Additionally install golang")

pkg/builder/builder.go

@@ -16,9 +16,8 @@ type Builder struct {
 
 // Compile manages all the instructions that lead to a single project artifact.
 // It returns any error if occurred.
-func (builder *Builder) Compile() error {
-	err := builder.initDirs()
-	if err != nil {
+func (builder *Builder) Compile(noBuild bool) error {
+	if err := builder.initDirs(); err != nil {
 		return err
 	}
 
@@ -27,29 +26,28 @@ func (builder *Builder) Compile() error {
 		string(constants.ColorYellow),
 		string(constants.ColorWhite))
 
-	err = builder.getSources()
-	if err != nil {
+	if err := builder.getSources(); err != nil {
 		return err
 	}
 
-	fmt.Printf("%s🏗️  :: %sBuilding ...%s\n",
-		string(constants.ColorBlue),
-		string(constants.ColorYellow),
-		string(constants.ColorWhite))
+	if !noBuild {
+		fmt.Printf("%s🏗️  :: %sBuilding ...%s\n",
+			string(constants.ColorBlue),
+			string(constants.ColorYellow),
+			string(constants.ColorWhite))
 
-	err = builder.processFunction(builder.PKGBUILD.Build)
-	if err != nil {
-		return err
-	}
+		if err := builder.processFunction(builder.PKGBUILD.Build); err != nil {
+			return err
+		}
 
-	fmt.Printf("%s📦 :: %sGenerating package ...%s\n",
-		string(constants.ColorBlue),
-		string(constants.ColorYellow),
-		string(constants.ColorWhite))
+		fmt.Printf("%s📦 :: %sGenerating package ...%s\n",
+			string(constants.ColorBlue),
+			string(constants.ColorYellow),
+			string(constants.ColorWhite))
 
-	err = builder.processFunction(builder.PKGBUILD.Package)
-	if err != nil {
-		return err
+		if err := builder.processFunction(builder.PKGBUILD.Package); err != nil {
+			return err
+		}
 	}
 
 	return nil

pkg/project/project.go

@@ -18,9 +18,10 @@ import (
 )
 
 var (
-	NoCache                      bool
-	SkipSyncFlag                 bool
-	SkipSyncBuildEnvironmentDeps bool
+	CleanBuild   bool
+	NoBuild      bool
+	NoMakeDeps   bool
+	SkipSyncDeps bool
 )
 
 // FromPkgName is used to start the build process from a specific package.
@@ -104,16 +105,15 @@ func (mpc *MultipleProject) BuildAll() error {
 			proj.Builder.PKGBUILD.PkgRel,
 		)
 
-		if err := proj.Builder.Compile(); err != nil {
+		if err := proj.Builder.Compile(NoBuild); err != nil {
 			return err
 		}
 
-		err := mpc.createPackages(proj)
-		if err != nil {
-			return err
-		}
+		if proj.HasToInstall && !NoBuild {
+			if err := mpc.createPackages(proj); err != nil {
+				return err
+			}
 
-		if proj.HasToInstall {
 			fmt.Printf("%s🤓 :: %sInstalling package: %s%s %s-%s\n",
 				string(constants.ColorBlue),
 				string(constants.ColorYellow),
@@ -145,7 +145,7 @@ func (mpc *MultipleProject) Clean() error {
 			return err
 		}
 
-		if NoCache {
+		if CleanBuild {
 			if err := utils.RemoveAll(project.Builder.PKGBUILD.SourceDir); err != nil {
 				return err
 			}
@@ -180,7 +180,7 @@ func (mpc *MultipleProject) MultiProject(distro, release, path string) error {
 	}
 
 	mpc.packageManager = packer.GetPackageManager(&pkgbuild.PKGBUILD{}, distro)
-	if !SkipSyncFlag {
+	if !SkipSyncDeps {
 		if err := mpc.packageManager.Update(); err != nil {
 			return err
 		}
@@ -191,7 +191,7 @@ func (mpc *MultipleProject) MultiProject(distro, release, path string) error {
 		return err
 	}
 
-	if !SkipSyncBuildEnvironmentDeps {
+	if !NoMakeDeps {
 		mpc.getMakeDeps()
 
 		if err := mpc.packageManager.Prepare(mpc.makeDepends); err != nil {

pkg/project/project_test.go

@@ -108,7 +108,7 @@ func TestBuildMultipleProjectFromJSON(t *testing.T) {
 
 	defer os.Remove(prj2)
 
-	project.SkipSyncFlag = true
+	project.SkipSyncDeps = true
 
 	var mpc = project.MultipleProject{}
 	err = mpc.MultiProject("ubuntu", "", testDir)