Merge pull request #26 from deadcheat/feature/issue-24-and-25

Feature/issue 24 and 25

README.md

@@ -47,7 +47,7 @@ USAGE:
    goblet [global options] command [command options] [arguments...]
 
 VERSION:
-   1.2.0
+   1.2.2
 
 COMMANDS:
      help, h  Shows a list of commands or help for one command

cmd/goblet/main.go

@@ -19,7 +19,7 @@ func main() {
 
 	app.Name = "goblet"
 	app.Usage = "make a binary contain some assets"
-	app.Version = "1.2.1"
+	app.Version = "1.2.2"
 
 	app.Flags = values.FlagDefs
 	// mount presenter

generator/presenter/file/presenter.go

@@ -14,6 +14,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/deadcheat/goblet"
 	"github.com/deadcheat/goblet/generator"
 	pt "github.com/deadcheat/goblet/generator/presenter/file/template"
 	"github.com/deadcheat/goblet/generator/values"
@@ -77,6 +78,7 @@ func (p *Presenter) action(c *cli.Context) error {
 		DirMap:             e.DirMap,
 		FileMap:            e.FileMap,
 		Paths:              e.Paths,
+		HasFileData: hasAnyData(e.FileMap),
 	}
 	targetPaths := paths
 	var writer io.Writer = os.Stdout
@@ -119,6 +121,15 @@ func (p *Presenter) action(c *cli.Context) error {
 	return nil
 }
 
+func hasAnyData(m map[string]*goblet.File) bool {
+	for _, v := range m {
+		if len(v.Data ) != 0 {
+			return true
+		}
+	}
+	return false
+}
+
 func executedCommand(c *cli.Context, argPaths []string) string {
 	var buf bytes.Buffer
 	// write command itself

generator/presenter/file/presenter_test.go

@@ -155,7 +155,7 @@ func TestActionSuccessWithStdout(t *testing.T) {
 	// stdout pattern
 	ctx := cli.NewContext(a, set, nil)
 	if err := p.action(ctx); err != nil {
-		t.Error("Mount should not return any error: ", err)
+		t.Error("action should not return any error: ", err)
 	}
 }
 

generator/presenter/file/template/template.go

@@ -11,6 +11,7 @@ type Assets struct {
 	DirMap             map[string][]string
 	FileMap            map[string]*goblet.File
 	Paths              []string
+	HasFileData        bool
 }
 
 // AssetFileTemplate template for asset file
@@ -36,15 +37,16 @@ var {{ $VarName }} = goblet.NewFS(
 	},
 	map[string]*goblet.File {
 		{{- range $p := .Paths }}{{ with (index $FileMap $p)}}
-		"{{$p}}": goblet.NewFile("{{$p}}", {{if .IsDir }}nil{{ else }}[]byte(_{{ $VarName }}{{ sha1 $p }}){{ end }}, {{ printf "%#v" .FileMode }}, time.Unix({{ .ModifiedAt.Unix }}, {{ .ModifiedAt.UnixNano }})),{{ end }}
+		"{{$p}}": goblet.NewFile("{{$p}}", {{if .IsDir }}nil{{ else if eq (len .Data) 0 }}[]byte{}{{ else }}_{{ $VarName }}{{ sha1 $p }}{{ end }}, {{ printf "%#v" .FileMode }}, time.Unix({{ .ModifiedAt.Unix }}, {{ .ModifiedAt.UnixNano }})),{{ end }}
 		{{- end }}
 	},
 )
-
+{{ if .HasFileData }}
 // binary data
 var (
 	{{- range $p := .Paths }}{{ with (index $FileMap $p) }}
-	{{if not .IsDir }}_{{ $VarName }}{{ sha1 $p}} = {{ printData .Data }}{{ end }}{{ end }}
+	{{if and (not .IsDir) ( ne (len .Data) 0) }}_{{ $VarName }}{{ sha1 $p}} = []byte({{ printData .Data }}){{ end }}{{ end }}
 	{{- end }}
 )
+{{ end }}
 `

generator/usecase/file/usecase.go

@@ -50,7 +50,7 @@ func (u *UseCase) LoadFiles(paths []string, option generator.OptionFlagEntity) (
 		path := paths[i]
 		if err := u.addFile(path); err != nil {
 			if err == ErrFileIsNotMatchExpression {
-				log.Printf("path %s is not matched pattern given in 'expression(e)' flag", path)
+				log.Printf("%s is excluded because it is not matched with specified condition", path)
 				continue
 			}
 			return nil, err
@@ -105,7 +105,7 @@ func (u *UseCase) addFile(path string) (err error) {
 		err = u.addFile(childPath)
 		if err != nil {
 			if err == ErrFileIsNotMatchExpression {
-				log.Printf("path %s is not matched pattern given in 'expression(e)' flag", path)
+				log.Printf("%s is excluded because it is not matched with specified condition", childPath)
 				continue
 			}
 			return err