Merge branch 'release/1.2.0'

Author: gabrielrobert

.goreleaser.yml

@@ -2,16 +2,13 @@ builds:
 - env:
   - CGO_ENABLED=0
 - goos:
-    - darwin
-    - linux
     - windows
 archive:
+  name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
   replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
+    darwin: macOS
+    386: 32-bit
+    amd64: 64-bit
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -35,5 +32,5 @@ scoop:
     owner: gabrielrobert
     name: scoop-bucket
   homepage:  https://github.com/gabrielrobert/xavtool
-  description: Xamarin Automating Version Tool
+  description: Xplat Automating Version Tool
   license: MIT

.travis.yml

@@ -4,7 +4,7 @@ os:
   - linux
 
 go:
-  - 1.x
+  - 1.10.x
 
 script:
   - go test -v

actions.go

@@ -6,11 +6,11 @@ import (
 	"github.com/urfave/cli"
 )
 
-var handlers = []packageHandler{iOSHandler{}, androidHandler{}, uwpHandler{}}
+var handlers = []packageHandler{iOSHandler{}, androidHandler{}, uwpHandler{}, cordovaHandler{}}
 
 // called by executing `xavtool current`
 func current(c *cli.Context) error {
-	allFiles, err := findManifests(getWorkingDir(), handlers)
+	allFiles, err := findManifests(getGivenPathOrWorkingDir(c), handlers)
 
 	// validations
 	if err != nil {
@@ -29,15 +29,15 @@ func current(c *cli.Context) error {
 
 	// show packages
 	for _, file := range allFiles {
-		fmt.Println(fmt.Sprintf("%v - %v (%v)", file.Version, file.Name, file.Path))
+		fmt.Println(fmt.Sprintf("%v [%v] - %v (%v)", file.Version, file.InternalVersion, file.Name, file.Path))
 	}
 
 	return nil
 }
 
 // called by executing `xavtool increment`
 func increment(c *cli.Context) error {
-	allFiles, err := findManifests(getWorkingDir(), handlers)
+	allFiles, err := findManifests(getGivenPathOrWorkingDir(c), handlers)
 
 	// validations
 	if err != nil {
@@ -95,7 +95,7 @@ func set(c *cli.Context) error {
 		return cli.NewExitError(fmt.Sprintf("Version '%v' is not valid", newVersion), 3)
 	}
 
-	allFiles, err := findManifests(getWorkingDir(), handlers)
+	allFiles, err := findManifests(getGivenPathOrWorkingDir(c), handlers)
 
 	// validations
 	if err != nil {

android_handler.go

@@ -38,9 +38,10 @@ func (h androidHandler) getPackageInfo(filePath string) (packageInfo, error) {
 	}
 
 	return packageInfo{
-		Name:    data.Name,
-		Version: data.VersionName,
-		Path:    filePath,
+		Name:            data.Name,
+		Version:         data.VersionName,
+		InternalVersion: data.Code,
+		Path:            filePath,
 	}, nil
 }
 

android_handler_test.go

@@ -35,9 +35,8 @@ func Test_androidHandler_getPackageInfo(t *testing.T) {
 	handler := new(androidHandler)
 	currentVersion, err := handler.getPackageInfo(filePath)
 	require.NoError(t, err)
-	if currentVersion.Version != "1.0.1" {
-		t.Errorf("version mismatch; actual %v, expected %v", currentVersion, "1.0.1")
-	}
+	assert.Equal(t, "1.0.1", currentVersion.Version)
+	assert.Equal(t, "1000100", currentVersion.InternalVersion)
 }
 
 func Test_androidHandler_changePackageVersion(t *testing.T) {

appveyor.yml

@@ -13,17 +13,22 @@ install:
   - go version
   - go env
   - go get github.com/gabrielrobert/xavtool
-  - go get github.com/goreleaser/goreleaser
+  - ps: iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+  - ps: scoop bucket add goreleaser https://github.com/goreleaser/scoop-bucket.git
+  - ps: scoop install goreleaser
+  - goreleaser -v
   - go get -t -v ./...
 
 build_script:
   - go build
-  - goreleaser --rm-dist --snapshot
-  - choco pack
 
 test_script:
   - go test -v
 
+after_test:
+  - goreleaser --rm-dist --snapshot
+  - choco pack
+
 artifacts:
   - path: '**\*.nupkg'
 

cordova_handler.go

@@ -0,0 +1,106 @@
+package main
+
+import (
+	"bytes"
+	"encoding/xml"
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/clbanning/mxj"
+)
+
+type cordovaHandler struct {
+}
+
+type cordovaBundlerHeader struct {
+	XMLName xml.Name `xml:"widget"`
+	Name    string   `xml:"id,attr"`
+
+	// should be less than 2100000000
+	Code string `xml:"android-versionCode,attr"`
+
+	VersionName string     `xml:"version,attr"`
+	Attrs       []xml.Attr `xml:",attr"`
+}
+
+func (h cordovaHandler) isPackage(filename string) bool {
+	return strings.ToLower(getFilename(filename)) == "config.xml"
+}
+
+func (h cordovaHandler) getPackageInfo(filePath string) (packageInfo, error) {
+	byteValue := readFile(filePath)
+	data, err := h.read(byteValue)
+
+	if err != nil {
+		return packageInfo{Path: filePath, HasError: true}, err
+	}
+
+	return packageInfo{
+		Name:            data.Name,
+		Version:         data.VersionName,
+		InternalVersion: data.Code,
+		Path:            filePath,
+	}, nil
+}
+
+func (h cordovaHandler) read(data []byte) (*cordovaBundlerHeader, error) {
+	var header cordovaBundlerHeader
+	err := xml.Unmarshal(data, &header)
+	return &header, err
+}
+
+func (h cordovaHandler) changePackageVersion(file packageInfo, newVersion string) error {
+	fileBytes := readFile(file.Path)
+	processedBytes, err := h.applyVersion(fileBytes, newVersion)
+	if err != nil {
+		return fmt.Errorf("Invalid xml file: %v", file.Path)
+	}
+	saveFile(file.Path, processedBytes)
+	return nil
+}
+
+func (h cordovaHandler) applyVersion(byteValue []byte, newVersion string) ([]byte, error) {
+	fileReader := bytes.NewReader(byteValue)
+	for m, err := mxj.NewMapXmlSeqReader(fileReader); m != nil || err != io.EOF; m, err = mxj.NewMapXmlSeqReader(fileReader) {
+		if err != nil {
+			if err == mxj.NO_ROOT {
+				continue
+			} else {
+				return nil, errors.New("Invalid xml")
+			}
+		}
+		vmap := m["widget"].(map[string]interface{})
+
+		// edit version attr
+		acmt, err := mxj.Map(vmap).ValueForPath("#attr.version.#text")
+		acmt = newVersion
+		mxj.Map(vmap).SetValueForPath(acmt, "#attr.version.#text")
+		err = m.SetValueForPath(vmap, "widget")
+		check(err)
+
+		// edit ios-CFBundleVersion attr
+		acmt, err = mxj.Map(vmap).ValueForPath("#attr.ios-CFBundleVersion.#text")
+		acmt = newVersion
+		mxj.Map(vmap).SetValueForPath(acmt, "#attr.ios-CFBundleVersion.#text")
+		err = m.SetValueForPath(vmap, "widget")
+		check(err)
+
+		// edit android-versionCode attr
+		acmt, err = mxj.Map(vmap).ValueForPath("#attr.android-versionCode.#text")
+		acmt = buildAndroidVersionCode(newVersion)
+		mxj.Map(vmap).SetValueForPath(acmt, "#attr.android-versionCode.#text")
+		err = m.SetValueForPath(vmap, "widget")
+		check(err)
+
+		b, err := m.XmlSeqIndent("", "  ")
+		check(err)
+
+		// Write header
+		header := `<?xml version="1.0" encoding="utf-8"?>` + "\n"
+		return []byte(header + string(b)), nil
+	}
+
+	return nil, nil
+}

cordova_handler_test.go

@@ -0,0 +1,115 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_cordovaHandler_isPackage(t *testing.T) {
+	type args struct {
+		filename string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{"filename", args{"config.xmL"}, true},
+		{"filename with path and \\", args{"c:/dev/config.xml"}, true},
+		{"filename with path and /", args{"c:\\dev\\config.xml"}, true},
+		{"filename with path", args{"c:\\dev/config.xml"}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := new(cordovaHandler)
+			if got := handler.isPackage(tt.args.filename); got != tt.want {
+				t.Errorf("isCordovaPackage() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_cordovaHandler_getPackageInfo(t *testing.T) {
+	handler := new(cordovaHandler)
+	currentVersion, err := handler.getPackageInfo("test/config.xml")
+	require.NoError(t, err)
+	assert.Equal(t, "com.example.xavtool", currentVersion.Name)
+	assert.Equal(t, "1.0.1", currentVersion.Version)
+	assert.Equal(t, "1000100", currentVersion.InternalVersion)
+}
+
+func Test_cordovaHandler_changePackageVersion(t *testing.T) {
+	handler := new(cordovaHandler)
+	currentVersion, err := handler.getPackageInfo("test/config.xml")
+	require.NoError(t, err)
+	if currentVersion.Version != "1.0.1" {
+		t.Errorf("version mismatch; actual %v, expected %v", currentVersion, "1.0.1")
+	}
+
+	handler.changePackageVersion(currentVersion, "1.0.2")
+	currentVersion, err = handler.getPackageInfo("test/config.xml")
+	require.NoError(t, err)
+	if currentVersion.Version != "1.0.2" {
+		t.Errorf("version mismatch; actual %v, expected %v", currentVersion, "1.0.2")
+	}
+
+	// some kind of rollback
+	handler.changePackageVersion(currentVersion, "1.0.1")
+}
+
+func Test_cordovaHandler_applyVersion(t *testing.T) {
+	handler := new(cordovaHandler)
+	processedBytes, err := handler.applyVersion(cordovaSeed, "1.0.2")
+	require.NoError(t, err)
+	xml, _ := handler.read(processedBytes)
+	if xml.VersionName != "1.0.2" {
+		t.Errorf("VersionName mismatch; expected %v", "1.0.2")
+	}
+	if xml.Code != "1000200" {
+		t.Errorf("code mismatch; actual %v, expected %v", xml.Code, "1000200")
+	}
+}
+
+func Test_cordovaHandler_read(t *testing.T) {
+	type args struct {
+		data []byte
+	}
+	tests := []struct {
+		name        string
+		args        args
+		want        string
+		shouldError bool
+	}{
+		{"invalid bytes", args{invalidCordovaSeed}, "", true},
+		{"valid file", args{readFile("test/config.xml")}, "1.0.1", false},
+		{"valid bytes", args{cordovaSeed}, "1.0.1", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := new(cordovaHandler)
+			got, err := handler.read(tt.args.data)
+			if tt.shouldError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			assert.Equal(t, tt.want, got.VersionName)
+		})
+	}
+}
+
+var cordovaSeed = []byte(`
+  <?xml version="1.0" encoding="utf-8"?>
+  <widget android-versionCode="1000100" id="com.example.xavtool" ios-CFBundleVersion="1.0.1" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>xavtool</name>
+    <content src="index.html"/>
+    <access origin="*"/>
+  </widget>
+`)
+
+var invalidCordovaSeed = []byte(`
+	<?xml version="1.0" encoding="utf-8"?>
+	<man
+`)

finders.go

@@ -8,10 +8,11 @@ import (
 )
 
 type packageInfo struct {
-	Name     string
-	Version  string
-	Path     string
-	HasError bool
+	Name            string
+	Version         string
+	InternalVersion string
+	Path            string
+	HasError        bool
 }
 
 func findManifests(root string, handlers []packageHandler) ([]packageInfo, error) {
@@ -45,7 +46,8 @@ func findManifests(root string, handlers []packageHandler) ([]packageInfo, error
 }
 
 func isIgnored(f os.FileInfo) bool {
-	if f.IsDir() && stringInSlice(f.Name(), []string{"bin", "obj", ".git"}) {
+	var ignoredFolders = []string{"bin", "obj", ".git", "CordovaLib", "platforms", "res", "node_modules"}
+	if f.IsDir() && stringInSlice(f.Name(), ignoredFolders) {
 		return true
 	}
 	return false