updating to pull back in the fileuri code and dependency

go.mod

@@ -5,6 +5,7 @@ go 1.12
 require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/xeipuuv/gojsonschema v1.2.0
+	neilpa.me/go-x v0.1.0
 
 	sigs.k8s.io/yaml v1.2.0
 )

go.sum

@@ -19,5 +19,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+neilpa.me/go-x v0.1.0 h1:bry050ou4HtEhZ3vZEFRKrzqvObodseVvfcQvK/M8U4=
+neilpa.me/go-x v0.1.0/go.mod h1:aIemU+pQYLLV3dygXotHKF7SantXe5HzZR6VIjzY/4g=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

main.go

@@ -19,7 +19,7 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 	"sigs.k8s.io/yaml"
 
-	//"neilpa.me/go-x/fileuri"
+	"neilpa.me/go-x/fileuri"
 )
 
 const (
@@ -271,25 +271,10 @@ func usageError(msg string) int {
 }
 
 func fileUri(path string) string {
-	abs, err := filepath.Abs(path)
+	uri, err := fileuri.FromPath(path)
 	if err != nil {
 		log.Fatalf("%s: %s", path, err)
 	}
-
-	uri := "file://"
-
-	if runtime.GOOS == "windows" {
-		// This is not formally correct for all corner cases in windows
-		// file handling but should work for all standard cases. See:
-		// https://docs.microsoft.com/en-us/archive/blogs/ie/file-uris-in-windows
-		uri = uri + "/" + strings.ReplaceAll(
-			strings.ReplaceAll(abs, "\\", "/"),
-			" ", "%20",
-		)
-	} else {
-		uri = uri + abs
-	}
-
 	return uri
 }