suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-12-19 20:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract out reading of write commands

Browse Source
This commit is contained in:
Mike Farah 2018-06-13 09:13:58 +10:00
parent ab852ceafa
commit f340db5795
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
yq.go
View File

@ -88,7 +88,7 @@ func createReadCmd() *cobra.Command {
yq read things.yaml a.b.c yq read things.yaml a.b.c
yq r - a.b.c (reads from stdin) yq r - a.b.c (reads from stdin)
yq r things.yaml a.*.c yq r things.yaml a.*.c
yq r things.yaml a.array[0].blah yq r -d1 things.yaml a.array[0].blah
yq r things.yaml a.array[*].blah yq r things.yaml a.array[*].blah
`, `,
Long: "Outputs the value of the given path in the yaml file to STDOUT", Long: "Outputs the value of the given path in the yaml file to STDOUT",
@ -297,16 +297,9 @@ func newProperty(cmd *cobra.Command, args []string) error {
} }
func newYaml(args []string) (interface{}, error) { func newYaml(args []string) (interface{}, error) {
var writeCommands yaml.MapSlice var writeCommands, writeCommandsError = readWriteCommands(args, 2, "Must provide <path_to_update> <value>")
if writeScript != "" { if writeCommandsError != nil {
if err := readData(writeScript, 0, &writeCommands); err != nil { return nil, writeCommandsError
return nil, err
}
} else if len(args) < 2 {
return nil, errors.New("Must provide <path_to_update> <value>")
} else {
writeCommands = make(yaml.MapSlice, 1)
writeCommands[0] = yaml.MapItem{Key: args[0], Value: parseValue(args[1])}
} }
var parsedData yaml.MapSlice var parsedData yaml.MapSlice
@ -424,20 +417,28 @@ func updateParsedData(parsedData yaml.MapSlice, writeCommands yaml.MapSlice, pre
return parsedData, nil return parsedData, nil
} }
func updateYaml(args []string) (interface{}, error) { func readWriteCommands(args []string, expectedArgs int, badArgsMessage string) (yaml.MapSlice, error) {
var writeCommands yaml.MapSlice var writeCommands yaml.MapSlice
var prependCommand = ""
if writeScript != "" { if writeScript != "" {
if err := readData(writeScript, 0, &writeCommands); err != nil { if err := readData(writeScript, 0, &writeCommands); err != nil {
return nil, err return nil, err
} }
} else if len(args) < 3 { } else if len(args) < expectedArgs {
return nil, errors.New("Must provide <filename> <path_to_update> <value>") return nil, errors.New(badArgsMessage)
} else { } else {
writeCommands = make(yaml.MapSlice, 1) writeCommands = make(yaml.MapSlice, 1)
writeCommands[0] = yaml.MapItem{Key: args[1], Value: parseValue(args[2])} writeCommands[0] = yaml.MapItem{Key: args[expectedArgs-2], Value: parseValue(args[expectedArgs-1])}
}
return writeCommands, nil
}
func updateYaml(args []string) (interface{}, error) {
var writeCommands, writeCommandsError = readWriteCommands(args, 3, "Must provide <filename> <path_to_update> <value>")
if writeCommandsError != nil {
return nil, writeCommandsError
} }
var prependCommand = ""
var parsedData yaml.MapSlice var parsedData yaml.MapSlice
if err := readData(args[0], 0, &parsedData); err != nil { if err := readData(args[0], 0, &parsedData); err != nil {
var generalData interface{} var generalData interface{}