mirror of
https://github.com/taigrr/yq
synced 2025-01-18 04:53:17 -08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ed8e7017e | ||
|
|
5514d2300b | ||
|
|
5bb0934710 |
1
sample_array.yaml
Normal file
1
sample_array.yaml
Normal file
@@ -0,0 +1 @@
|
|||||||
|
[1,2,3]
|
||||||
1
sample_text.yaml
Normal file
1
sample_text.yaml
Normal file
@@ -0,0 +1 @@
|
|||||||
|
hi
|
||||||
6
vendor/vendor.json
vendored
Normal file
6
vendor/vendor.json
vendored
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"comment": "",
|
||||||
|
"ignore": "test",
|
||||||
|
"package": [],
|
||||||
|
"rootPath": "github.com/mikefarah/yaml"
|
||||||
|
}
|
||||||
75
yaml.go
75
yaml.go
@@ -117,15 +117,26 @@ func readProperty(cmd *cobra.Command, args []string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func read(args []string) interface{} {
|
func read(args []string) interface{} {
|
||||||
|
|
||||||
var parsedData yaml.MapSlice
|
var parsedData yaml.MapSlice
|
||||||
|
var path = ""
|
||||||
|
if len(args) > 1 {
|
||||||
|
path = args[1]
|
||||||
|
}
|
||||||
|
err := readData(args[0], &parsedData, inputJSON)
|
||||||
|
if err != nil {
|
||||||
|
var generalData interface{}
|
||||||
|
readDataOrDie(args[0], &generalData, inputJSON)
|
||||||
|
item := yaml.MapItem{Key: "thing", Value: generalData}
|
||||||
|
parsedData = yaml.MapSlice{item}
|
||||||
|
path = "thing." + path
|
||||||
|
}
|
||||||
|
|
||||||
readData(args[0], &parsedData, inputJSON)
|
if path == "" {
|
||||||
|
|
||||||
if len(args) == 1 {
|
|
||||||
return parsedData
|
return parsedData
|
||||||
}
|
}
|
||||||
|
|
||||||
var paths = parsePath(args[1])
|
var paths = parsePath(path)
|
||||||
|
|
||||||
return readMap(parsedData, paths[0], paths[1:len(paths)])
|
return readMap(parsedData, paths[0], paths[1:len(paths)])
|
||||||
}
|
}
|
||||||
@@ -141,7 +152,7 @@ func newProperty(cmd *cobra.Command, args []string) {
|
|||||||
func newYaml(args []string) interface{} {
|
func newYaml(args []string) interface{} {
|
||||||
var writeCommands yaml.MapSlice
|
var writeCommands yaml.MapSlice
|
||||||
if writeScript != "" {
|
if writeScript != "" {
|
||||||
readData(writeScript, &writeCommands, false)
|
readDataOrDie(writeScript, &writeCommands, false)
|
||||||
} else if len(args) < 2 {
|
} else if len(args) < 2 {
|
||||||
die("Must provide <path_to_update> <value>")
|
die("Must provide <path_to_update> <value>")
|
||||||
} else {
|
} else {
|
||||||
@@ -149,9 +160,18 @@ func newYaml(args []string) interface{} {
|
|||||||
writeCommands[0] = yaml.MapItem{Key: args[0], Value: parseValue(args[1])}
|
writeCommands[0] = yaml.MapItem{Key: args[0], Value: parseValue(args[1])}
|
||||||
}
|
}
|
||||||
|
|
||||||
parsedData := make(yaml.MapSlice, 0)
|
var parsedData yaml.MapSlice
|
||||||
|
var prependCommand = ""
|
||||||
|
var isArray = strings.HasPrefix(writeCommands[0].Key.(string), "[")
|
||||||
|
if isArray {
|
||||||
|
item := yaml.MapItem{Key: "thing", Value: make(yaml.MapSlice, 0)}
|
||||||
|
parsedData = yaml.MapSlice{item}
|
||||||
|
prependCommand = "thing"
|
||||||
|
} else {
|
||||||
|
parsedData = make(yaml.MapSlice, 0)
|
||||||
|
}
|
||||||
|
|
||||||
return updateParsedData(parsedData, writeCommands)
|
return updateParsedData(parsedData, writeCommands, prependCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeProperty(cmd *cobra.Command, args []string) {
|
func writeProperty(cmd *cobra.Command, args []string) {
|
||||||
@@ -166,20 +186,28 @@ func writeProperty(cmd *cobra.Command, args []string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateParsedData(parsedData yaml.MapSlice, writeCommands yaml.MapSlice) yaml.MapSlice {
|
func updateParsedData(parsedData yaml.MapSlice, writeCommands yaml.MapSlice, prependCommand string) interface{} {
|
||||||
|
var prefix = ""
|
||||||
|
if prependCommand != "" {
|
||||||
|
prefix = prependCommand + "."
|
||||||
|
}
|
||||||
for _, entry := range writeCommands {
|
for _, entry := range writeCommands {
|
||||||
path := entry.Key
|
path := prefix + entry.Key.(string)
|
||||||
value := entry.Value
|
value := entry.Value
|
||||||
var paths = parsePath(path.(string))
|
var paths = parsePath(path)
|
||||||
parsedData = writeMap(parsedData, paths, value)
|
parsedData = writeMap(parsedData, paths, value)
|
||||||
}
|
}
|
||||||
|
if prependCommand != "" {
|
||||||
|
return readMap(parsedData, prependCommand, make([]string, 0))
|
||||||
|
}
|
||||||
return parsedData
|
return parsedData
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateYaml(args []string) interface{} {
|
func updateYaml(args []string) interface{} {
|
||||||
var writeCommands yaml.MapSlice
|
var writeCommands yaml.MapSlice
|
||||||
|
var prependCommand = ""
|
||||||
if writeScript != "" {
|
if writeScript != "" {
|
||||||
readData(writeScript, &writeCommands, false)
|
readDataOrDie(writeScript, &writeCommands, false)
|
||||||
} else if len(args) < 3 {
|
} else if len(args) < 3 {
|
||||||
die("Must provide <filename> <path_to_update> <value>")
|
die("Must provide <filename> <path_to_update> <value>")
|
||||||
} else {
|
} else {
|
||||||
@@ -188,9 +216,16 @@ func updateYaml(args []string) interface{} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var parsedData yaml.MapSlice
|
var parsedData yaml.MapSlice
|
||||||
readData(args[0], &parsedData, inputJSON)
|
err := readData(args[0], &parsedData, inputJSON)
|
||||||
|
if err != nil {
|
||||||
|
var generalData interface{}
|
||||||
|
readDataOrDie(args[0], &generalData, inputJSON)
|
||||||
|
item := yaml.MapItem{Key: "thing", Value: generalData}
|
||||||
|
parsedData = yaml.MapSlice{item}
|
||||||
|
prependCommand = "thing"
|
||||||
|
}
|
||||||
|
|
||||||
return updateParsedData(parsedData, writeCommands)
|
return updateParsedData(parsedData, writeCommands, prependCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseValue(argument string) interface{} {
|
func parseValue(argument string) interface{} {
|
||||||
@@ -234,7 +269,14 @@ func yamlToString(context interface{}) string {
|
|||||||
return outStr
|
return outStr
|
||||||
}
|
}
|
||||||
|
|
||||||
func readData(filename string, parsedData interface{}, readAsJSON bool) {
|
func readDataOrDie(filename string, parsedData interface{}, readAsJSON bool) {
|
||||||
|
err := readData(filename, parsedData, readAsJSON)
|
||||||
|
if err != nil {
|
||||||
|
die("error parsing data: ", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func readData(filename string, parsedData interface{}, readAsJSON bool) error {
|
||||||
if filename == "" {
|
if filename == "" {
|
||||||
die("Must provide filename")
|
die("Must provide filename")
|
||||||
}
|
}
|
||||||
@@ -246,10 +288,7 @@ func readData(filename string, parsedData interface{}, readAsJSON bool) {
|
|||||||
rawData = readFile(filename)
|
rawData = readFile(filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
err := yaml.Unmarshal([]byte(rawData), parsedData)
|
return yaml.Unmarshal([]byte(rawData), parsedData)
|
||||||
if err != nil {
|
|
||||||
die("error parsing data: ", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func readStdin() []byte {
|
func readStdin() []byte {
|
||||||
|
|||||||
26
yaml_test.go
26
yaml_test.go
@@ -28,6 +28,16 @@ func TestRead(t *testing.T) {
|
|||||||
assertResult(t, 2, result)
|
assertResult(t, 2, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReadArray(t *testing.T) {
|
||||||
|
result := read([]string{"sample_array.yaml", "[1]"})
|
||||||
|
assertResult(t, 2, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadString(t *testing.T) {
|
||||||
|
result := read([]string{"sample_text.yaml"})
|
||||||
|
assertResult(t, "hi", result)
|
||||||
|
}
|
||||||
|
|
||||||
func TestOrder(t *testing.T) {
|
func TestOrder(t *testing.T) {
|
||||||
result := read([]string{"order.yaml"})
|
result := read([]string{"order.yaml"})
|
||||||
formattedResult := yamlToString(result)
|
formattedResult := yamlToString(result)
|
||||||
@@ -45,6 +55,14 @@ func TestNewYaml(t *testing.T) {
|
|||||||
formattedResult)
|
formattedResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNewYamlArray(t *testing.T) {
|
||||||
|
result := newYaml([]string{"[0].cat", "meow"})
|
||||||
|
formattedResult := fmt.Sprintf("%v", result)
|
||||||
|
assertResult(t,
|
||||||
|
"[[{cat meow}]]",
|
||||||
|
formattedResult)
|
||||||
|
}
|
||||||
|
|
||||||
func TestUpdateYaml(t *testing.T) {
|
func TestUpdateYaml(t *testing.T) {
|
||||||
result := updateYaml([]string{"sample.yaml", "b.c", "3"})
|
result := updateYaml([]string{"sample.yaml", "b.c", "3"})
|
||||||
formattedResult := fmt.Sprintf("%v", result)
|
formattedResult := fmt.Sprintf("%v", result)
|
||||||
@@ -53,6 +71,14 @@ func TestUpdateYaml(t *testing.T) {
|
|||||||
formattedResult)
|
formattedResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUpdateYamlArray(t *testing.T) {
|
||||||
|
result := updateYaml([]string{"sample_array.yaml", "[0]", "3"})
|
||||||
|
formattedResult := fmt.Sprintf("%v", result)
|
||||||
|
assertResult(t,
|
||||||
|
"[3 2 3]",
|
||||||
|
formattedResult)
|
||||||
|
}
|
||||||
|
|
||||||
func TestUpdateYaml_WithScript(t *testing.T) {
|
func TestUpdateYaml_WithScript(t *testing.T) {
|
||||||
writeScript = "instruction_sample.yaml"
|
writeScript = "instruction_sample.yaml"
|
||||||
updateYaml([]string{"sample.yaml"})
|
updateYaml([]string{"sample.yaml"})
|
||||||
|
|||||||
Reference in New Issue
Block a user