Merge pull request #916 from prymitive/go-cmd

chore(backend): move main go code to the cmd folder

.gitignore

@@ -1,12 +1,9 @@
-.build
-.coverage
-.tests
-.vscode
-bindata_assetfs.go
-coverage.txt
-karma
-ui/build
-ui/coverage
-ui/node_modules
-vendor
-TODO.md
+/.build
+/coverage.txt
+/cmd/karma/bindata_assetfs.go
+/karma
+/karma-*
+/ui/build
+/ui/coverage
+/ui/node_modules
+/TODO.md

.travis.yml

@@ -76,7 +76,7 @@ jobs:
       <<: *DEFAULTS_GO
       script:
         - travis_retry make mock-assets
-        - travis_retry go get -d -v
+        - travis_retry go get -d -v ./cmd/karma
         - travis_retry go mod tidy
         - git diff --exit-code
 

Makefile

@@ -48,14 +48,14 @@ endif
 	cd ui && npm run build
 	touch $@
 
-bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/artifacts-ui.ok
-	go-bindata-assetfs -o bindata_assetfs.go ui/build/... ui/src/...
+cmd/karma/bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/artifacts-ui.ok
+	go-bindata-assetfs -o cmd/karma/bindata_assetfs.go ui/build/... ui/src/...
 
-$(NAME): .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES)
-	GO111MODULE=on go build -ldflags "-X main.version=$(VERSION)"
+$(NAME): .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES)
+	GO111MODULE=on go build -ldflags "-X main.version=$(VERSION)" ./cmd/karma
 
 word-split = $(word $2,$(subst -, ,$1))
-cc-%: .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES)
+cc-%: .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES)
 	$(eval GOOS := $(call word-split,$*,1))
 	$(eval GOARCH := $(call word-split,$*,2))
 	$(eval GOARM := $(call word-split,$*,3))
@@ -63,7 +63,7 @@ cc-%: .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES)
 	$(eval GOEXT := $(patsubst $(GOOS),,$(patsubst windows,.exe,$(GOOS))))
 	$(eval BINARY := "karma-$(GOOS)-$(GOARCH)$(GOARMBIN)$(GOEXT)")
 	@echo $(BINARY) $(GOOS) $(GOARCH) $(GOARM) | awk '{ printf "%-25s GOOS=%-10s GOARCH=%-10s GOARM=%1s\n", $$1, $$2, $$3, $$4 }'
-	@env CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -o $(BINARY) -ldflags="-X main.version=$(shell make show-version)"
+	@env CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -o $(BINARY) -ldflags="-X main.version=$(shell make show-version)" ./cmd/karma
 
 PLATFORMS := cc-darwin-386 cc-darwin-amd64 cc-dragonfly-amd64 cc-freebsd-386 cc-freebsd-amd64 cc-freebsd-arm-5 cc-freebsd-arm-6 cc-freebsd-arm-7 cc-linux-386 cc-linux-amd64 cc-linux-arm-5 cc-linux-arm-6 cc-linux-arm-7 cc-linux-arm64 cc-linux-ppc64 cc-linux-ppc64le cc-linux-mips cc-linux-mipsle cc-linux-mips64 cc-linux-mips64le cc-linux-s390x cc-netbsd-386 cc-netbsd-amd64 cc-netbsd-arm-5 cc-netbsd-arm-6 cc-netbsd-arm-7 cc-openbsd-386 cc-openbsd-amd64 cc-openbsd-arm-5 cc-openbsd-arm-6 cc-openbsd-arm-7 cc-solaris-amd64 cc-windows-386 cc-windows-amd64
 crosscompile: $(PLATFORMS)
@@ -71,7 +71,7 @@ crosscompile: $(PLATFORMS)
 
 .PHONY: clean
 clean:
-	rm -fr .build bindata_assetfs.go $(NAME) ui/build ui/node_modules coverage.txt
+	rm -fr .build cmd/karma/bindata_assetfs.go $(NAME) ui/build ui/node_modules coverage.txt
 
 .PHONY: run
 run: $(NAME)
@@ -164,7 +164,7 @@ mock-assets: .build/deps-build-go.ok
 	rm -fr ui/build
 	mkdir ui/build
 	cp ui/public/* ui/build/
-	go-bindata-assetfs -o bindata_assetfs.go -nometadata ui/build/...
+	go-bindata-assetfs -o cmd/karma/bindata_assetfs.go -nometadata ui/build/...
 	# force assets rebuild on next make run
 	rm -f .build/bindata_assetfs.*
 

cmd/karma/assets_test.go

@@ -45,14 +45,14 @@ func TestCustomizationAssets(t *testing.T) {
 			mime:      "text/css",
 		},
 		{
-			customJS: "ui/.env",
+			customJS: "../../ui/.env",
 			path:     "/custom.js",
 			code:     200,
 			body:     "PUBLIC_URL=.\n",
 			mime:     "text/plain; charset=utf-8",
 		},
 		{
-			customCSS: "ui/.env",
+			customCSS: "../../ui/.env",
 			path:      "/custom.css",
 			code:      200,
 			body:      "PUBLIC_URL=.\n",