added file system interface to process config files from any file system

.travis.yml

@@ -10,12 +10,10 @@ branches:
     - /^v[0-9]\.[0-9]/
 
 go:
-  - 1.6
-  - 1.7
-  - 1.8
+  - 1.11.x
   - tip
 
-go_import_path: aahframework.org/forge.v0
+go_import_path: github.com/go-aah/forge
 
 script:
   - bash <(curl -s https://aahframework.org/go-test)

README.md

@@ -3,14 +3,14 @@ forge
 
 [![Build Status](https://travis-ci.org/go-aah/forge.svg?branch=master)](https://travis-ci.org/go-aah/forge)
 [![codecov](https://codecov.io/gh/go-aah/forge/branch/master/graph/badge.svg)](https://codecov.io/gh/go-aah/forge)
-[![GoDoc](https://godoc.org/aahframework.org/forge.v0?status.svg)](https://godoc.org/aahframework.org/forge.v0)
+[![GoDoc](https://godoc.org/github.com/go-aah/forge?status.svg)](https://godoc.org/github.com/go-aah/forge)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 
 Forge is a configuration syntax and parser forked for [aah framework](https://aahframework.org).
 
 ## Installation
 
-`go get -u aahframework.org/forge.v0`
+`go get -u github.com/go-aah/forge`
 
 ## Example
 
@@ -64,7 +64,7 @@ import (
 	"fmt"
 	"json"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 func main() {

benchmark_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 var exampleConfigBytes = []byte(`

example/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 func main() {

example_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 func Example() {

forge.go

@@ -106,7 +106,7 @@ import (
 )
 
 // Version represent current release version of forge.
-var Version = "0.4.4"
+var Version = "0.7.0"
 
 // ParseBytes takes a []byte representation of the config file, parses it
 // and responds with `*Section` and potentially an `error` if it cannot

forge_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 var testConfigBytes = []byte(`

fs.go

@@ -0,0 +1,39 @@
+package forge
+
+import (
+	"io"
+	"os"
+	"path/filepath"
+)
+
+var fs FileSystem = new(NativeFS)
+
+// FileSystem interface to expand configuration file parsing possiblities.
+type FileSystem interface {
+	Open(filename string) (io.Reader, error)
+	Glob(pattern string) ([]string, error)
+}
+
+// RegisterFS method to register new file system into forge.
+func RegisterFS(fileSystem FileSystem) {
+	fs = fileSystem
+}
+
+// NativeFS type defines methods for native file system.
+type NativeFS uint8
+
+func (NativeFS) Open(filename string) (io.Reader, error) {
+	return os.Open(filename)
+}
+
+func (NativeFS) Glob(pattern string) ([]string, error) {
+	return filepath.Glob(pattern)
+}
+
+// Close method closes the give file if its compliant to `io.Closer`
+func close(f interface{}) error {
+	if c, ok := f.(io.Closer); ok {
+		return c.Close()
+	}
+	return nil
+}

go.mod

@@ -0,0 +1 @@
+module github.com/go-aah/forge

parser.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"aahframework.org/forge.v0/token"
+	"github.com/go-aah/forge/token"
 )
 
 func isSemicolonOrNewline(id token.TokenID) bool {
@@ -39,7 +39,7 @@ func NewParser(reader io.Reader) *Parser {
 
 // NewFileParser will create and initialize a new Parser from a provided from a filename string
 func NewFileParser(filename string) (*Parser, error) {
-	reader, err := os.Open(filename)
+	reader, err := fs.Open(filename)
 	if err != nil {
 		return nil, err
 	}
@@ -242,7 +242,7 @@ func (parser *Parser) parseInclude() error {
 		pattern = filepath.Join(filepath.Dir(parser.files[0]), filepath.Clean(pattern))
 	}
 
-	filenames, err := filepath.Glob(pattern)
+	filenames, err := fs.Glob(pattern)
 	if err != nil {
 		return err
 	}
@@ -253,7 +253,7 @@ func (parser *Parser) parseInclude() error {
 		if parser.hasParsed(filename) {
 			continue
 		}
-		reader, err := os.Open(filename)
+		reader, err := fs.Open(filename)
 		if err != nil {
 			return err
 		}

primative_test.go

@@ -3,7 +3,7 @@ package forge_test
 import (
 	"testing"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 func TestNewPrimative(t *testing.T) {

scanner.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"aahframework.org/forge.v0/token"
+	"github.com/go-aah/forge/token"
 )
 
 var eof = rune(0)
@@ -223,9 +223,7 @@ func (scanner *Scanner) NextToken() token.Token {
 	case ch == eof:
 		scanner.curTok.ID = token.EOF
 		scanner.curTok.Literal = "EOF"
-		if f, ok := scanner.freader.(io.ReadCloser); ok {
-			_ = f.Close()
-		}
+		_ = close(scanner.freader)
 	default:
 		scanner.readRune()
 		scanner.curTok.Literal = string(ch)

section_test.go

@@ -2,10 +2,9 @@ package forge_test
 
 import (
 	"encoding/json"
-	"fmt"
 	"testing"
 
-	"aahframework.org/forge.v0"
+	"github.com/go-aah/forge"
 )
 
 func TestSectionKeys(t *testing.T) {
@@ -111,7 +110,7 @@ prod {
 	}
 
 	bytes, _ := json.MarshalIndent(config1.ToMap(), "", "   ")
-	fmt.Println(string(bytes))
+	t.Log(string(bytes))
 }
 
 func TestMergeSectionFailSectionToField(t *testing.T) {

token/token.go

@@ -11,7 +11,7 @@ type Token struct {
 
 func (this Token) String() string {
 	return fmt.Sprintf(
-		"ID<%s> Literal<%s> Line<%s> Column<%s>",
+		"ID<%s> Literal<%s> Line<%v> Column<%v>",
 		this.ID, this.Literal, this.Line, this.Column,
 	)
 }