Increment version for new functionality

When it's 'all', architecture-independent packages are built, and so now an x86_64 executable is packaged to noarch packaged.

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-    - 1.9.x
+    - 1.11.x
 script:
   - scripts/devtools.sh
   - make local build

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.9 as builder
+FROM golang:1.11 as builder
 
 WORKDIR /go/src/mikefarah/yq
 

Makefile

@@ -14,7 +14,6 @@ help:
 	@echo '    make build           Build yq binary.'
 	@echo '    make install         Install yq.'
 	@echo '    make xcompile        Build cross-compiled binaries of yq.'
-	@echo '    make snap            Build a snap package of yq.'
 	@echo '    make vendor          Install dependencies using govendor.'
 	@echo '    make format          Run code formatter.'
 	@echo '    make check           Run static code analysis (lint).'
@@ -65,10 +64,6 @@ xcompile: check
 	@find build -type d -exec chmod 755 {} \; || :
 	@find build -type f -exec chmod 755 {} \; || :
 
-.PHONY: snap
-snap:
-	snapcraft
-
 .PHONY: install
 install: build
 	${DOCKRUN} go install

commands_test.go

@@ -3,10 +3,11 @@ package main
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 
-	"gopkg.in/spf13/cobra.v0"
+	cobra "gopkg.in/spf13/cobra.v0"
 )
 
 func getRootCommand() *cobra.Command {
@@ -121,7 +122,7 @@ func TestReadBadDocumentIndexCmd(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Asked to process document index 1 but there are only 1 document(s)`
+	expectedOutput := `asked to process document index 1 but there are only 1 document(s)`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -239,7 +240,7 @@ func TestReadCmd_ArrayYaml_ErrorBadPath(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Error reading path in document index 0: Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `Error reading path in document index 0: error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -249,7 +250,7 @@ func TestReadCmd_ArrayYaml_Splat_ErrorBadPath(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Error reading path in document index 0: Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `Error reading path in document index 0: error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -279,7 +280,12 @@ func TestReadCmd_ErrorUnreadableFile(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to unknown file")
 	}
-	expectedOutput := `open fake-unknown: no such file or directory`
+	var expectedOutput string
+	if runtime.GOOS == "windows" {
+		expectedOutput = `open fake-unknown: The system cannot find the file specified.`
+	} else {
+		expectedOutput = `open fake-unknown: no such file or directory`
+	}
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -301,7 +307,7 @@ func TestReadCmd_ErrorBadPath(t *testing.T) {
 	if result.Error == nil {
 		t.Fatal("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Error reading path in document index 0: Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `Error reading path in document index 0: error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -451,7 +457,7 @@ func TestPrefixBadDocumentIndexCmd(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Asked to process document index 1 but there are only 1 document(s)`
+	expectedOutput := `asked to process document index 1 but there are only 1 document(s)`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 func TestPrefixMultiAllCmd(t *testing.T) {
@@ -493,7 +499,12 @@ func TestPrefixCmd_ErrorUnreadableFile(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to unknown file")
 	}
-	expectedOutput := `open fake-unknown: no such file or directory`
+	var expectedOutput string
+	if runtime.GOOS == "windows" {
+		expectedOutput = `open fake-unknown: The system cannot find the file specified.`
+	} else {
+		expectedOutput = `open fake-unknown: no such file or directory`
+	}
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -636,7 +647,7 @@ func TestWriteBadDocumentIndexCmd(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to invalid path")
 	}
-	expectedOutput := `Asked to process document index 1 but there are only 1 document(s)`
+	expectedOutput := `asked to process document index 1 but there are only 1 document(s)`
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 func TestWriteMultiAllCmd(t *testing.T) {
@@ -693,7 +704,12 @@ func TestWriteCmd_ErrorUnreadableFile(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to unknown file")
 	}
-	expectedOutput := `open fake-unknown: no such file or directory`
+	var expectedOutput string
+	if runtime.GOOS == "windows" {
+		expectedOutput = `open fake-unknown: The system cannot find the file specified.`
+	} else {
+		expectedOutput = `open fake-unknown: no such file or directory`
+	}
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -1019,7 +1035,12 @@ func TestMergeCmd_ErrorUnreadableFile(t *testing.T) {
 	if result.Error == nil {
 		t.Error("Expected command to fail due to unknown file")
 	}
-	expectedOutput := `Error updating document at index 0: open fake-unknown: no such file or directory`
+	var expectedOutput string
+	if runtime.GOOS == "windows" {
+		expectedOutput = `Error updating document at index 0: open fake-unknown: The system cannot find the file specified.`
+	} else {
+		expectedOutput = `Error updating document at index 0: open fake-unknown: no such file or directory`
+	}
 	assertResult(t, expectedOutput, result.Error.Error())
 }
 
@@ -1063,3 +1084,17 @@ c:
 	assertResult(t, expectedOutput, strings.Trim(gotOutput, "\n "))
 	assertResult(t, os.FileMode(int(0666)), info.Mode())
 }
+
+func TestMergeAllowEmptyCmd(t *testing.T) {
+	cmd := getRootCommand()
+	result := runCmd(cmd, "merge --allow-empty examples/data1.yaml examples/empty.yaml")
+	if result.Error != nil {
+		t.Error(result.Error)
+	}
+	expectedOutput := `a: simple
+b:
+- 1
+- 2
+`
+	assertResult(t, expectedOutput, result.Output)
+}

data_navigator.go

@@ -19,9 +19,9 @@ func entryInSlice(context yaml.MapSlice, key interface{}) *yaml.MapItem {
 
 func getMapSlice(context interface{}) yaml.MapSlice {
 	var mapSlice yaml.MapSlice
-	switch context.(type) {
+	switch context := context.(type) {
 	case yaml.MapSlice:
-		mapSlice = context.(yaml.MapSlice)
+		mapSlice = context
 	default:
 		mapSlice = make(yaml.MapSlice, 0)
 	}
@@ -29,9 +29,9 @@ func getMapSlice(context interface{}) yaml.MapSlice {
 }
 
 func getArray(context interface{}) (array []interface{}, ok bool) {
-	switch context.(type) {
+	switch context := context.(type) {
 	case []interface{}:
-		array = context.([]interface{})
+		array = context
 		ok = true
 	default:
 		array = make([]interface{}, 0)
@@ -146,18 +146,18 @@ func readMapSplat(context yaml.MapSlice, tail []string) (interface{}, error) {
 }
 
 func recurse(value interface{}, head string, tail []string) (interface{}, error) {
-	switch value.(type) {
+	switch value := value.(type) {
 	case []interface{}:
 		if head == "*" {
-			return readArraySplat(value.([]interface{}), tail)
+			return readArraySplat(value, tail)
 		}
 		index, err := strconv.ParseInt(head, 10, 64)
 		if err != nil {
-			return nil, fmt.Errorf("Error accessing array: %v", err)
+			return nil, fmt.Errorf("error accessing array: %v", err)
 		}
-		return readArray(value.([]interface{}), index, tail)
+		return readArray(value, index, tail)
 	case yaml.MapSlice:
-		return readMap(value.(yaml.MapSlice), head, tail)
+		return readMap(value, head, tail)
 	default:
 		return nil, nil
 	}

data_navigator_test.go

@@ -92,7 +92,7 @@ b:
 	if err == nil {
 		t.Fatal("Expected error due to invalid path")
 	}
-	expectedOutput := `Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, err.Error())
 }
 
@@ -112,7 +112,7 @@ b:
 	if err == nil {
 		t.Fatal("Expected error due to invalid path")
 	}
-	expectedOutput := `Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, err.Error())
 }
 
@@ -132,7 +132,7 @@ b:
 	if err == nil {
 		t.Fatal("Expected error due to invalid path")
 	}
-	expectedOutput := `Error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
+	expectedOutput := `error accessing array: strconv.ParseInt: parsing "x": invalid syntax`
 	assertResult(t, expectedOutput, err.Error())
 }
 

debian/changelog

@@ -1,3 +1,15 @@
+yq (2.2-1) bionic; urgency=medium
+
+  * Added Windows support for the "--inplace" command flag
+  * Prefix now supports arrays
+  * Add prefix command
+  * Bump Alpine version to 3.8
+  * Improved docker build process
+  * Lint fixes
+  * Build support for all linux architectures supported by gox
+
+ -- Roberto Mier Escandon <rmescandon@gmail.com>  Sat, 19 Jan 2019 15:50:47 +0100
+
 yq (2.1-0) bionic; urgency=medium
 
   * Ability to read multiple documents in a single file

debian/control

@@ -12,7 +12,7 @@ Vcs-Browser: https://github.com/mikefarah/yq.git
 Vcs-Git: https://github.com/mikefarah/yq.git
 
 Package: yq
-Architecture: all
+Architecture: any
 Built-Using: ${misc:Built-Using}
 Depends: ${shlibs:Depends},
          ${misc:Depends}

examples/empty.yaml

@@ -0,0 +1,2 @@
+# a: apple
+# b: cat

json_converter.go

@@ -17,16 +17,16 @@ func jsonToString(context interface{}) (string, error) {
 }
 
 func toJSON(context interface{}) interface{} {
-	switch context.(type) {
+	switch context := context.(type) {
 	case []interface{}:
-		oldArray := context.([]interface{})
+		oldArray := context
 		newArray := make([]interface{}, len(oldArray))
 		for index, value := range oldArray {
 			newArray[index] = toJSON(value)
 		}
 		return newArray
 	case yaml.MapSlice:
-		oldMap := context.(yaml.MapSlice)
+		oldMap := context
 		newMap := make(map[string]interface{})
 		for _, entry := range oldMap {
 			if str, ok := entry.Key.(string); ok {

merge.go

@@ -1,6 +1,6 @@
 package main
 
-import "gopkg.in/imdario/mergo.v0"
+import mergo "gopkg.in/imdario/mergo.v0"
 
 func merge(dst interface{}, src interface{}, overwrite bool, append bool) error {
 	if overwrite {

release_instructions.txt

@@ -1,5 +1,6 @@
 - increment version in version.go
 - increment version in snapcraft.yaml
+- commit
 - tag git with same version number
   - be sure to also tag with 'v' for gopkg.in
 - make sure local build passes
@@ -21,11 +22,11 @@
 
 
 - brew
-  - brew bump-formula-pr --url=https://github.com/mikefarah/yq/archive/2.1.2.tar.gz yq
+  - brew bump-formula-pr --url=https://github.com/mikefarah/yq/archive/2.2.0.tar.gz yq
 
 - docker
   - build and push latest and new version tag
-  - docker build .  --arg -t mikefarah/yq:latest -t mikefarah/yq:VERSION 
+  - docker build .  -t mikefarah/yq:latest -t mikefarah/yq:VERSION 
 
 - debian package
   - execute 

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: yq
-version: 2.2.0
+version: '2.3.0'
 summary: A lightweight and portable command-line YAML processor
 description: |
   The aim of the project is to be the jq or sed of yaml files.

utils_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	yaml "gopkg.in/mikefarah/yaml.v2"
-	"gopkg.in/spf13/cobra.v0"
+	cobra "gopkg.in/spf13/cobra.v0"
 )
 
 type resulter struct {

version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "2.2.0"
+	Version = "2.3.0"
 
 	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release

yq.go

@@ -22,6 +22,7 @@ var writeInplace = false
 var writeScript = ""
 var outputToJSON = false
 var overwriteFlag = false
+var allowEmptyFlag = false
 var appendFlag = false
 var verbose = false
 var version = false
@@ -229,6 +230,7 @@ Note that if you set both flags only overwrite will take effect.
 	cmdMerge.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the yaml file inplace")
 	cmdMerge.PersistentFlags().BoolVarP(&overwriteFlag, "overwrite", "x", false, "update the yaml file by overwriting existing values")
 	cmdMerge.PersistentFlags().BoolVarP(&appendFlag, "append", "a", false, "update the yaml file by appending array values")
+	cmdMerge.PersistentFlags().BoolVarP(&allowEmptyFlag, "allow-empty", "e", false, "allow empty yaml files")
 	cmdMerge.PersistentFlags().StringVarP(&docIndex, "doc", "d", "0", "process document index number (0 based, * for all documents)")
 	return cmdMerge
 }
@@ -255,7 +257,7 @@ func readProperty(cmd *cobra.Command, args []string) error {
 			if errorReading == io.EOF {
 				log.Debugf("done %v / %v", currentIndex, docIndexInt)
 				if !updateAll && currentIndex <= docIndexInt {
-					return fmt.Errorf("Asked to process document index %v but there are only %v document(s)", docIndex, currentIndex)
+					return fmt.Errorf("asked to process document index %v but there are only %v document(s)", docIndex, currentIndex)
 				}
 				return nil
 			}
@@ -370,7 +372,7 @@ func mapYamlDecoder(updateData updateDataFn, encoder *yaml.Encoder) yamlDecoderF
 
 			if errorReading == io.EOF {
 				if !updateAll && currentIndex <= docIndexInt {
-					return fmt.Errorf("Asked to process document index %v but there are only %v document(s)", docIndex, currentIndex)
+					return fmt.Errorf("asked to process document index %v but there are only %v document(s)", docIndex, currentIndex)
 				}
 				return nil
 			} else if errorReading != nil {
@@ -462,11 +464,11 @@ func readAndUpdate(stdOut io.Writer, inputFile string, updateData updateDataFn)
 		if err != nil {
 			return err
 		}
-		err = tempFile.Chmod(info.Mode())
+		destinationName = tempFile.Name()
+		err = os.Chmod(destinationName, info.Mode())
 		if err != nil {
 			return err
 		}
-		destinationName = tempFile.Name()
 		destination = tempFile
 		defer func() {
 			safelyCloseFile(tempFile)
@@ -530,6 +532,9 @@ func mergeProperties(cmd *cobra.Command, args []string) error {
 			for _, f := range filesToMerge {
 				var fileToMerge interface{}
 				if err := readData(f, 0, &fileToMerge); err != nil {
+					if allowEmptyFlag && err == io.EOF {
+						continue
+					}
 					return nil, err
 				}
 				mapDataBucket["root"] = fileToMerge
@@ -589,9 +594,9 @@ func toString(context interface{}) (string, error) {
 }
 
 func yamlToString(context interface{}) (string, error) {
-	switch context.(type) {
+	switch context := context.(type) {
 	case string:
-		return context.(string), nil
+		return context, nil
 	default:
 		return marshalContext(context)
 	}

yq_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"runtime"
 	"testing"
 )
 
@@ -64,6 +65,11 @@ func TestNewYaml_WithUnknownScript(t *testing.T) {
 	if err == nil {
 		t.Error("Expected error due to unknown file")
 	}
-	expectedOutput := `open fake-unknown: no such file or directory`
+	var expectedOutput string
+	if runtime.GOOS == "windows" {
+		expectedOutput = `open fake-unknown: The system cannot find the file specified.`
+	} else {
+		expectedOutput = `open fake-unknown: no such file or directory`
+	}
 	assertResult(t, expectedOutput, err.Error())
 }