Merge pull request #378 from weitenghuang/master

Add default project lookup values

Author: joshwget

docker/project.go

@@ -1,9 +1,6 @@
 package docker
 
 import (
-	"os"
-	"path/filepath"
-
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
@@ -17,31 +14,11 @@ import (
 	"github.com/docker/libcompose/docker/service"
 	"github.com/docker/libcompose/docker/volume"
 	"github.com/docker/libcompose/labels"
-	"github.com/docker/libcompose/lookup"
 	"github.com/docker/libcompose/project"
 )
 
 // NewProject creates a Project with the specified context.
 func NewProject(context *ctx.Context, parseOptions *config.ParseOptions) (project.APIProject, error) {
-	if context.ResourceLookup == nil {
-		context.ResourceLookup = &lookup.FileResourceLookup{}
-	}
-
-	if context.EnvironmentLookup == nil {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return nil, err
-		}
-		context.EnvironmentLookup = &lookup.ComposableEnvLookup{
-			Lookups: []config.EnvironmentLookup{
-				&lookup.EnvfileLookup{
-					Path: filepath.Join(cwd, ".env"),
-				},
-				&lookup.OsEnvLookup{},
-			},
-		}
-	}
-
 	if context.AuthLookup == nil {
 		context.AuthLookup = auth.NewConfigLookup(context.ConfigFile)
 	}

project/project.go

@@ -3,13 +3,16 @@ package project
 import (
 	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
 	"strings"
 
 	"golang.org/x/net/context"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/logger"
+	"github.com/docker/libcompose/lookup"
 	"github.com/docker/libcompose/project/events"
 	"github.com/docker/libcompose/utils"
 	"github.com/docker/libcompose/yaml"
@@ -57,6 +60,26 @@ func NewProject(context *Context, runtime RuntimeProject, parseOptions *config.P
 		context.LoggerFactory = &logger.NullLogger{}
 	}
 
+	if context.ResourceLookup == nil {
+		context.ResourceLookup = &lookup.FileResourceLookup{}
+	}
+
+	if context.EnvironmentLookup == nil {
+		cwd, err := os.Getwd()
+		if err != nil {
+			log.Errorf("Could not get the rooted path name to the current directory: %v", err)
+			return nil
+		}
+		context.EnvironmentLookup = &lookup.ComposableEnvLookup{
+			Lookups: []config.EnvironmentLookup{
+				&lookup.EnvfileLookup{
+					Path: filepath.Join(cwd, ".env"),
+				},
+				&lookup.OsEnvLookup{},
+			},
+		}
+	}
+
 	context.Project = p
 
 	p.listeners = []chan<- events.Event{NewDefaultListener(p)}

project/project_test.go

@@ -110,6 +110,19 @@ func TestParseWithGoodContent(t *testing.T) {
 	}
 }
 
+func TestParseWithDefaultEnvironmentLookup(t *testing.T) {
+	p := NewProject(&Context{
+		ComposeBytes: [][]byte{
+			[]byte("not-garbage:\n  image: foo:${version}"),
+		},
+	}, nil, nil)
+
+	err := p.Parse()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
 type TestEnvironmentLookup struct {
 }