Merge branch 'tidy-multiple-types'

Author: cwarden

application/application.go

@@ -7,6 +7,12 @@ import (
 	"github.com/ForceCLI/force-md/internal"
 )
 
+const NAME = "CustomApplication"
+
+func init() {
+	internal.TypeRegistry.Register(NAME, func(path string) (internal.RegisterableMetadata, error) { return Open(path) })
+}
+
 type ProfileActionOverride struct {
 	ActionName        string  `xml:"actionName"`
 	Content           *string `xml:"content"`
@@ -112,6 +118,10 @@ func (c *CustomApplication) SetMetadata(m internal.MetadataInfo) {
 	c.MetadataInfo = m
 }
 
+func (c *CustomApplication) Type() internal.MetadataType {
+	return NAME
+}
+
 func Open(path string) (*CustomApplication, error) {
 	p := &CustomApplication{}
 	return p, internal.ParseMetadataXml(p, path)

cmd/objects/tidy.go

@@ -38,24 +38,37 @@ Tidy object metadata.
 	* picklist fields missing from Record Types
 `,
 	Args: cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		changes := false
+		list, _ := cmd.Flags().GetBool("list")
+		fixMissing, _ := cmd.Flags().GetBool("fix-missing")
+		fix := fixes{
+			recordTypePicklistOptions: fixMissing,
+		}
 		for _, file := range args {
-			list, _ := cmd.Flags().GetBool("list")
-			fixMissing, _ := cmd.Flags().GetBool("fix-missing")
-			fix := fixes{
-				recordTypePicklistOptions: fixMissing,
+			_, err := internal.Metadata.Open(file)
+			if err != nil {
+				return fmt.Errorf("invalid file %s: %w", file, err)
 			}
+		}
+
+		items := internal.Metadata.Items(objects.NAME)
+		if len(items) == 0 {
+			log.Warn("No objects to tidy")
+		}
+		for _, item := range items {
+			o := item.(*objects.CustomObject)
 			if list {
-				needsTidying := checkIfChanged(file, fix)
+				needsTidying := checkIfChanged(o, fix)
 				changes = needsTidying || changes
 			} else {
-				tidy(file, fix)
+				tidy(o, fix)
 			}
 		}
 		if changes {
 			os.Exit(1)
 		}
+		return nil
 	},
 }
 
@@ -153,13 +166,8 @@ func addMissingRecordTypePicklistFields(o *objects.CustomObject) {
 	}
 }
 
-func checkIfChanged(file string, fix fixes) (changed bool) {
-	o := &objects.CustomObject{}
-	contents, err := internal.ParseMetadataXmlIfPossible(o, file)
-	if err != nil {
-		log.Warn("parse failure:" + err.Error())
-		return
-	}
+func checkIfChanged(o *objects.CustomObject, fix fixes) (changed bool) {
+	contents := o.Contents()
 	if fix.recordTypePicklistOptions {
 		addMissingRecordTypePicklistFields(o)
 	}
@@ -173,25 +181,20 @@ func checkIfChanged(file string, fix fixes) (changed bool) {
 		return
 	}
 	if !bytes.Equal(contents, newContents) {
-		fmt.Println(file)
+		fmt.Println(o.Path())
 		return true
 	}
 	return false
 }
 
-func tidy(file string, fix fixes) {
-	p, err := objects.Open(file)
-	if err != nil {
-		log.Warn("parsing object failed: " + err.Error())
-		return
-	}
+func tidy(o *objects.CustomObject, fix fixes) {
 	if warn {
-		checkUnassignedPicklistOptions(p)
+		checkUnassignedPicklistOptions(o)
 	}
 	if fix.recordTypePicklistOptions {
-		addMissingRecordTypePicklistFields(p)
+		addMissingRecordTypePicklistFields(o)
 	}
-	if err := general.Tidy(p, file); err != nil {
+	if err := general.Tidy(o, o.Path()); err != nil {
 		log.Warn("tidying failed: " + err.Error())
 	}
 }

cmd/tidy.go

@@ -0,0 +1,81 @@
+package cmd
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+
+	_ "github.com/ForceCLI/force-md/flow"
+
+	"github.com/ForceCLI/force-md/general"
+	"github.com/ForceCLI/force-md/internal"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	tidyCmd.Flags().BoolP("list", "l", false, "list files that need tidying")
+
+	RootCmd.AddCommand(tidyCmd)
+}
+
+var tidyCmd = &cobra.Command{
+	Use:   "tidy",
+	Short: "Tidy Metadata",
+	Example: `
+$ force-md tidy sfdx/main/default/objects/*/{fields,validationRules}/* sfdx/main/default/flows/*
+
+$ force-md tidy src/objects/*
+`,
+	Args: cobra.MinimumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		for _, file := range args {
+			_, err := internal.Metadata.Open(file)
+			if err != nil {
+				return fmt.Errorf("invalid file %s: %w", file, err)
+			}
+		}
+		changes := false
+		list, _ := cmd.Flags().GetBool("list")
+		for _, t := range internal.Metadata.Types() {
+			for _, m := range internal.Metadata.Items(t) {
+				file := m.GetMetadataInfo().Path()
+				o, ok := m.(general.Tidyable)
+				if !ok {
+					log.Warnf("file %s of type %T is not tidyable", file, m)
+					continue
+				}
+				if list {
+					orig := m.GetMetadataInfo().Contents()
+					needsTidying := checkIfChanged(o, orig)
+					if needsTidying {
+						fmt.Println(file)
+					}
+					changes = needsTidying || changes
+				} else {
+					if err := general.Tidy(o, file); err != nil {
+						log.Warnf("tidying failed: %s", err.Error())
+					}
+				}
+			}
+		}
+		if changes {
+			os.Exit(1)
+		}
+		return nil
+	},
+}
+
+func checkIfChanged(o general.Tidyable, orig []byte) (changed bool) {
+	o.Tidy()
+	newContents, err := internal.Marshal(o)
+	if err != nil {
+		log.Warn("serializing failed: " + err.Error())
+		return false
+	}
+	if !bytes.Equal(orig, newContents) {
+		return true
+	}
+	return false
+}

docs/force-md.md

@@ -34,6 +34,7 @@ force-md
 * [force-md reporttype](force-md_reporttype.md)	 - Manage Report Types
 * [force-md sharingrules](force-md_sharingrules.md)	 - Manage Sharing Rules
 * [force-md standardvalueset](force-md_standardvalueset.md)	 - Manage Standard Value Sets
+* [force-md tidy](force-md_tidy.md)	 - Tidy Metadata
 * [force-md version](force-md_version.md)	 - Display current version
 * [force-md workflows](force-md_workflows.md)	 - Manage Workflow
 

docs/force-md_tidy.md

@@ -0,0 +1,36 @@
+## force-md tidy
+
+Tidy Metadata
+
+```
+force-md tidy [flags]
+```
+
+### Examples
+
+```
+
+$ force-md tidy sfdx/main/default/objects/*/{fields,validationRules}/* sfdx/main/default/flows/*
+
+$ force-md tidy src/objects/*
+
+```
+
+### Options
+
+```
+  -h, --help   help for tidy
+  -l, --list   list files that need tidying
+```
+
+### Options inherited from parent commands
+
+```
+      --convert-xml-entities   convert numeric xml entities to character entities (default true)
+      --silent                 show errors only
+```
+
+### SEE ALSO
+
+* [force-md](force-md.md)	 - force-md manipulate Salesforce metadata
+