Merge pull request #16 from sloppyio/feature/composelib

feature/composelib

GNUmakefile

@@ -6,7 +6,7 @@ SRCPATH := ./cmd
 APPNAME := sloppose
 VERSION_NAMESPACE := github.com/sloppyio/sloppose/command
 
-.PHONY: all test build-dev osx linux win clean
+.PHONY: all generate test build-dev osx linux win clean
 
 define build
 	GOOS=$(1) GOARCH=$(2) go build -ldflags "-X ${VERSION_NAMESPACE}.VersionName=`git describe --exact-match --abbrev=0` -X ${VERSION_NAMESPACE}.BuildName=`git log -1 --format=%h`" -o $(BUILDPATH)/$(APPNAME)_$(1)_$(2)$(3) $(SRCPATH)
@@ -17,7 +17,7 @@ define zip
 endef
 
 test:
-	go test -v -race -timeout 30s -covermode=atomic -coverprofile=coverage.txt ./pkg/...
+	go test -v -race -timeout 30s -covermode=atomic -coverprofile=coverage.txt ./pkg/converter
 
 coverage-show:
 	go tool cover -html=coverage.txt
@@ -34,6 +34,9 @@ dev-osx:
 build-dev:
 	go build -ldflags "-X ${VERSION_NAMESPACE}.VersionName=`git describe --exact-match --abbrev=0`" -o ./$(APPNAME) $(SRCPATH)
 
+generate:
+	go run pkg/config/schemas/generate.go
+
 osx:
 	@echo "Building osx binaries..."
 	@$(call build,darwin,amd64,)

Gopkg.toml

@@ -20,7 +20,6 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
-
-[[constraint]]
-  name = "github.com/docker/libcompose"
-  branch = "master"
+[prune]
+  non-go = true
+  go-tests = true

README.md

@@ -4,7 +4,7 @@
 
 Small tool to convert docker-compose files to sloppy.io compatible ones.
 
-Supports docker-compose versions **2** and **3**.
+Supports docker-compose version **3**.
 
 ## Usage
 

command/convert.go

@@ -38,7 +38,7 @@ func (c *Convert) Run(args []string) error {
 	}
 
 	reader := &converter.ComposeReader{}
-	buf, err := reader.ReadAll(flagSet.Args())
+	buf, err := reader.Read(flagSet.Args()[0])
 	if err != nil {
 		return err
 	}

pkg/config/README.md

@@ -0,0 +1,5 @@
+# sloppose/pkg/config
+
+Contains auto generated code from json schemas in `./schemas`.
+
+Schema Source: https://github.com/docker/compose/tree/master/compose/config .