Skip to content

Commit

Permalink
Release v0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
btnguyen2k committed Jan 20, 2020
1 parent 0d86e75 commit 76b7db1
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Features:
- [x] Generate template output from local directory (protocol `file://`).
- [x] Support scaffolding.

Latest version: [v0.4.0](RELEASE-NOTES.md).
Latest version: [v0.4.1](RELEASE-NOTES.md).

## Installation

Expand All @@ -22,7 +22,7 @@ go get github.com/btnguyen2k/go-giter8/g8
or you can specified a specific version:

```
go get github.com/btnguyen2k/go-giter8/[email protected].0
go get github.com/btnguyen2k/go-giter8/[email protected].1
```

## Upgrading
Expand All @@ -36,7 +36,7 @@ go get -u github.com/btnguyen2k/go-giter8/g8
or you can specified a specific version:

```
go get -u github.com/btnguyen2k/go-giter8/[email protected].0
go get -u github.com/btnguyen2k/go-giter8/[email protected].1
```

## Giter8 template
Expand Down
6 changes: 6 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# go-giter8 release notes

## 2020-01-20 - v0.4.1

- Fix: filename of file in "verbatim" list is kept intact.
- Fix: `text/template`'s default delims (`{{` and `}}`) may cause issue sometimes.


## 2020-01-01 - v0.4.0

- Support scaffolding & `scaffold` command.
Expand Down
12 changes: 8 additions & 4 deletions g8/cmd_new.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,15 @@ func newProject(repo *url.URL, fields map[string]string) error {
}

relativePath := path[prefixLen:] // relativePathToTemp is absolute; let's strip off the prefix
// transform filename
destFileName, err := transformFilename(target+relativePath, fields)
if err != nil {
return err
var destFileName = target + relativePath
// transform filename if not in "verbatim" list
if !isFileMatched(relativePath, f, verbatim) {
destFileName, err = transformFilename(destFileName, fields)
if err != nil {
return err
}
}

// ensure the directory exists
if err = mkdir(filepath.Dir(destFileName), 0755); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion g8/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

const (
// Version of go-giter8
Version = "0.4.0"
Version = "0.4.1"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions g8/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/gobwas/glob"
"github.com/savaki/properties"
"io/ioutil"
"log"
"net/url"
"os"
"path/filepath"
Expand All @@ -19,7 +18,8 @@ import (
// exitIfError terminates application in case of error
func exitIfError(err error) {
if err != nil {
log.Fatalln(err)
panic(err)
// log.Fatalln(err)
}
}

Expand Down
4 changes: 3 additions & 1 deletion template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ var (
func Parse(text []byte) (*text_template.Template, error) {
text = transform(text)

return text_template.New("template").Funcs(funcMap).Parse(string(text))
leftDelim := "{\000{{\000{{{\000{{{{"
rightDelim := "}}}}\000}}}\000}}\000}"
return text_template.New("template").Funcs(funcMap).Delims(leftDelim, rightDelim).Parse(string(text))
}

func Render(text []byte, data interface{}) ([]byte, error) {
Expand Down

0 comments on commit 76b7db1

Please sign in to comment.