refactor to better file structure (close #100)

gnames · Mar 9, 2023 · 9359b98 · 9359b98
1 parent 4bb6e34
commit 9359b98
Show file tree

Hide file tree

Showing 42 changed files with 38 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,10 @@
-FROM alpine:3.14
+FROM alpine:3.17
 
 LABEL maintainer="Dmitry Mozzherin"
 
-ENV LAST_FULL_REBUILD 2021-04-09
-
 WORKDIR /bin
 
-COPY ./gnverifier/gnverifier /bin
+COPY ./gnverifier /bin
 
 ENTRYPOINT [ "gnverifier" ]
 

diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
+PROJ_NAME = gnverifier
+
 VERSION = $(shell git describe --tags)
 VER = $(shell git describe --tags --abbrev=0)
 DATE = $(shell date -u '+%Y-%m-%d_%H:%M:%S%Z')
-FLAG_MODULE = GO111MODULE=on
-FLAGS_SHARED = $(FLAG_MODULE) CGO_ENABLED=0 GOARCH=amd64
+
+NO_C = CGO_ENABLED=0
+FLAGS_SHARED = $(NO_C) GOARCH=amd64
 FLAGS_LD=-ldflags "-w -s \
-                  -X github.com/gnames/gnverifier.Build=${DATE} \
-                  -X github.com/gnames/gnverifier.Version=${VERSION}"
+                  -X github.com/gnames/$(PROJ_NAME).Build=${DATE} \
+                  -X github.com/gnames/$(PROJ_NAME).Version=${VERSION}"
 GOCMD=go
 GOINSTALL=$(GOCMD) install $(FLAGS_LD)
 GOBUILD=$(GOCMD) build $(FLAGS_LD)
@@ -17,48 +20,57 @@ all: install
 
 test: deps install
 	@echo Run tests
-	$(FLAG_MODULE) go test -race ./...
+	$(GOCMD) test -shuffle=on -count=1 -race -coverprofile=coverage.txt ./...
+
+tools: deps
+	@echo Installing tools from tools.go
+	@cat tools.go | grep _ | awk -F'"' '{print $$2}' | xargs -tI % go install %
 
 deps:
 	@echo Download go.mod dependencies
 	$(GOCMD) mod download; \
 	$(GOGENERATE)
 
-tools: deps
-	@echo Installing tools from tools.go
-	@cat gnverifier/tools.go | grep _ | awk -F'"' '{print $$2}' | xargs -tI % go install %
-
 build:
+	@echo Building
+	$(GOGENERATE)
+	$(GOCLEAN); \
+	$(NO_C) $(GOBUILD);
+
+buildrel:
+	@echo Building release binary
 	$(GOGENERATE)
-	cd gnverifier; \
 	$(GOCLEAN); \
-	$(FLAGS_SHARED) $(GOBUILD);
+	$(NO_C) $(GORELEASE);
+
+install:
+	@echo Build and install locally
+	$(GOGENERATE)
+	$(NO_C) $(GOINSTALL);
 
 release: dockerhub
 	@echo Building releases for Linux, Mac, Windows
-	cd gnverifier; \
 	$(GOCLEAN); \
 	$(FLAGS_SHARED) GOOS=linux $(GOBUILD); \
-	tar zcvf /tmp/gnverifier-${VER}-linux.tar.gz gnverifier; \
+	tar zcvf /tmp/$(PROJ_NAME)-${VER}-linux.tar.gz $(PROJ_NAME); \
 	$(GOCLEAN); \
 	$(FLAGS_SHARED) GOOS=darwin $(GOBUILD); \
-	tar zcvf /tmp/gnverifier-${VER}-mac.tar.gz gnverifier; \
+	tar zcvf /tmp/$(PROJ_NAME)-${VER}-mac.tar.gz $(PROJ_NAME); \
+	$(GOCLEAN); \
+	$(NO_C) GOOS=darwin GOARCH=arm64 $(GOBUILD); \
+	tar zcvf /tmp/$(PROJ_NAME)-${VER}-mac-arm64.tar.gz $(PROJ_NAME); \
 	$(GOCLEAN); \
 	$(FLAGS_SHARED) GOOS=windows $(GOBUILD); \
-	zip -9 /tmp/gnverifier-${VER}-win-64.zip gnverifier.exe; \
+	zip -9 /tmp/$(PROJ_NAME)-${VER}-win-64.zip $(PROJ_NAME).exe; \
 	$(GOCLEAN);
 
-install:
-	$(GOGENERATE)
-	cd gnverifier; \
-	$(FLAGS_SHARED) $(GOINSTALL);
-
 docker: build
-	docker build -t gnames/gnverifier:latest -t gnames/gnverifier:$(VERSION) .; \
-	cd gnverifier; \
+	@echo Build Docker images
+	docker buildx build -t gnames/$(PROJ_NAME):latest -t gnames/$(PROJ_NAME):$(VERSION) .; \
 	$(GOCLEAN);
 
 dockerhub: docker
-	docker push gnames/gnverifier; \
-	docker push gnames/gnverifier:$(VERSION)
+	@echo Push Docker images to DockerHub
+	docker push gnames/$(PROJ_NAME); \
+	docker push gnames/$(PROJ_NAME):$(VERSION)
 
diff --git a/ent/output/output.go → internal/ent/output/output.go b/ent/output/output.go → internal/ent/output/output.go
diff --git a/ent/output/output_test.go → internal/ent/output/output_test.go b/ent/output/output_test.go → internal/ent/output/output_test.go
diff --git a/ent/verifier/interface.go → internal/ent/verifier/interface.go b/ent/verifier/interface.go → internal/ent/verifier/interface.go
diff --git a/...verifier/verifiertesting/fake_verifier.go → ...verifier/verifiertesting/fake_verifier.go b/...verifier/verifiertesting/fake_verifier.go → ...verifier/verifiertesting/fake_verifier.go
diff --git a/io/verifrest/fixtures/capitalize.yaml → ...nal/io/verifrest/fixtures/capitalize.yaml b/io/verifrest/fixtures/capitalize.yaml → ...nal/io/verifrest/fixtures/capitalize.yaml
diff --git a/io/verifrest/fixtures/ds4.yaml → internal/io/verifrest/fixtures/ds4.yaml b/io/verifrest/fixtures/ds4.yaml → internal/io/verifrest/fixtures/ds4.yaml
diff --git a/io/verifrest/fixtures/dss.yaml → internal/io/verifrest/fixtures/dss.yaml b/io/verifrest/fixtures/dss.yaml → internal/io/verifrest/fixtures/dss.yaml
diff --git a/io/verifrest/fixtures/name.yaml → internal/io/verifrest/fixtures/name.yaml b/io/verifrest/fixtures/name.yaml → internal/io/verifrest/fixtures/name.yaml
diff --git a/io/verifrest/fixtures/name_pref.yaml → ...rnal/io/verifrest/fixtures/name_pref.yaml b/io/verifrest/fixtures/name_pref.yaml → ...rnal/io/verifrest/fixtures/name_pref.yaml
diff --git a/io/verifrest/fixtures/names.yaml → internal/io/verifrest/fixtures/names.yaml b/io/verifrest/fixtures/names.yaml → internal/io/verifrest/fixtures/names.yaml
diff --git a/io/verifrest/fixtures/search.yaml → internal/io/verifrest/fixtures/search.yaml b/io/verifrest/fixtures/search.yaml → internal/io/verifrest/fixtures/search.yaml
diff --git a/io/verifrest/verifrest.go → internal/io/verifrest/verifrest.go b/io/verifrest/verifrest.go → internal/io/verifrest/verifrest.go
diff --git a/io/verifrest/verifrest_internal_test.go → ...l/io/verifrest/verifrest_internal_test.go b/io/verifrest/verifrest_internal_test.go → ...l/io/verifrest/verifrest_internal_test.go
diff --git a/io/web/server.go → internal/io/web/server.go b/io/web/server.go → internal/io/web/server.go
diff --git a/io/web/server_test.go → internal/io/web/server_test.go b/io/web/server_test.go → internal/io/web/server_test.go
diff --git a/io/web/static/images/ajax-loader.gif → ...rnal/io/web/static/images/ajax-loader.gif b/io/web/static/images/ajax-loader.gif → ...rnal/io/web/static/images/ajax-loader.gif
diff --git a/io/web/static/images/body-background.png → .../io/web/static/images/body-background.png b/io/web/static/images/body-background.png → .../io/web/static/images/body-background.png
diff --git a/io/web/static/images/confidence_score.png → ...io/web/static/images/confidence_score.png b/io/web/static/images/confidence_score.png → ...io/web/static/images/confidence_score.png
diff --git a/io/web/static/images/favicon.ico → internal/io/web/static/images/favicon.ico b/io/web/static/images/favicon.ico → internal/io/web/static/images/favicon.ico
diff --git a/io/web/static/images/horizontal-rule.png → .../io/web/static/images/horizontal-rule.png b/io/web/static/images/horizontal-rule.png → .../io/web/static/images/horizontal-rule.png
diff --git a/io/web/static/js/home.js → internal/io/web/static/js/home.js b/io/web/static/js/home.js → internal/io/web/static/js/home.js
diff --git a/io/web/static/js/jquery-3.6.0.min.js → ...rnal/io/web/static/js/jquery-3.6.0.min.js b/io/web/static/js/jquery-3.6.0.min.js → ...rnal/io/web/static/js/jquery-3.6.0.min.js
diff --git a/io/web/static/styles/screen.css → internal/io/web/static/styles/screen.css b/io/web/static/styles/screen.css → internal/io/web/static/styles/screen.css
diff --git a/io/web/templates.go → internal/io/web/templates.go b/io/web/templates.go → internal/io/web/templates.go
diff --git a/io/web/templates/about.html → internal/io/web/templates/about.html b/io/web/templates/about.html → internal/io/web/templates/about.html
diff --git a/io/web/templates/api.html → internal/io/web/templates/api.html b/io/web/templates/api.html → internal/io/web/templates/api.html
diff --git a/io/web/templates/data_source.html → internal/io/web/templates/data_source.html b/io/web/templates/data_source.html → internal/io/web/templates/data_source.html
diff --git a/io/web/templates/data_sources.html → internal/io/web/templates/data_sources.html b/io/web/templates/data_sources.html → internal/io/web/templates/data_sources.html
diff --git a/io/web/templates/home.html → internal/io/web/templates/home.html b/io/web/templates/home.html → internal/io/web/templates/home.html
diff --git a/io/web/templates/layout.html → internal/io/web/templates/layout.html b/io/web/templates/layout.html → internal/io/web/templates/layout.html
diff --git a/io/web/templates/results.html → internal/io/web/templates/results.html b/io/web/templates/results.html → internal/io/web/templates/results.html
diff --git a/testdata/drill/README.md → internal/testdata/drill/README.md b/testdata/drill/README.md → internal/testdata/drill/README.md
diff --git a/testdata/drill/benchmark.yml → internal/testdata/drill/benchmark.yml b/testdata/drill/benchmark.yml → internal/testdata/drill/benchmark.yml
diff --git a/testdata/testdata.txt → internal/testdata/testdata.txt b/testdata/testdata.txt → internal/testdata/testdata.txt
diff --git a/config/config.go → pkg/config/config.go b/config/config.go → pkg/config/config.go
diff --git a/config/config_test.go → pkg/config/config_test.go b/config/config_test.go → pkg/config/config_test.go
diff --git a/gnverifier.go → pkg/gnverifier.go b/gnverifier.go → pkg/gnverifier.go
diff --git a/gnverifier_test.go → pkg/gnverifier_test.go b/gnverifier_test.go → pkg/gnverifier_test.go
diff --git a/interface.go → pkg/interface.go b/interface.go → pkg/interface.go
diff --git a/version.go → pkg/version.go b/version.go → pkg/version.go