made fixes to printer and release 1.2.0

Merge pull request #2 from antsankov/printer-fixes

Author: antsankov

Dockerfile

@@ -1,5 +1,4 @@
-
-FROM golang:1.15 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /go/src/antsankov/go-live
 
@@ -13,13 +12,13 @@ RUN CGO_ENABLED=0 make build
 
 # Choose alpine as a base image to make this useful for CI, as many
 # CI tools expect an interactive shell inside the container
-FROM alpine:3.12 as production
+FROM alpine:3.18 as production
 
 COPY --from=builder /go/src/antsankov/go-live/bin/go-live /usr/bin/go-live
 RUN chmod +x /usr/bin/go-live
 
 ARG VERSION=none
-LABEL version=1.1.0
+LABEL version=1.2.0
 
 WORKDIR /workdir
 

Makefile

@@ -18,12 +18,13 @@ cross-compile:
 	env GOOS=linux GOARCH=amd64 go build -o ./release/go-live-linux-x64 -ldflags "-s -w" -trimpath -mod=readonly
 	env GOOS=windows GOARCH=386 go build -o ./release/go-live-windows-x32.exe -ldflags "-s -w" -trimpath -mod=readonly
 	env GOOS=windows GOARCH=amd64 go build -o ./release/go-live-windows-x64.exe -ldflags "-s -w" -trimpath -mod=readonly
+	env GOOS=darwin GOARCH=arm64 go build -o ./release/go-live-mac-arm64 -ldflags "-s -w" -trimpath -mod=readonly
 
 m1:
 	env GOOS=darwin GOARCH=arm64 go build -o ./release/go-live-mac-arm64 -ldflags "-s -w" -trimpath -mod=readonly
 
 test:
-	go test ./... -coverprofile=coverage.out -version=true
+	go test ./... -coverprofile=coverage.out
 	go tool cover -html=coverage.out	
 
 clean:

README.md

@@ -2,7 +2,7 @@
 
 # go-live
 [![Go Report](https://goreportcard.com/badge/github.com/antsankov/go-live)](https://goreportcard.com/report/github.com/antsankov/go-live)
-[![GoDoc](https://godoc.org/github.com/antsankov/go-live?status.svg)](https://pkg.go.dev/github.com/antsankov/go-live@v1.1.0?tab=overview)
+[![GoDoc](https://godoc.org/github.com/antsankov/go-live?status.svg)](https://pkg.go.dev/github.com/antsankov/go-live@v1.2.0?tab=overview)
 [![Snap Package](https://snapcraft.io/go-live/badge.svg)](https://snapcraft.io/go-live)
 
 
@@ -35,26 +35,26 @@ Based on JavaScript's famous `live-server` utility. Supports Linux, Windows, and
 
 ### MacOS x64 (without Brew)
 
-`curl -LJO https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-mac-x64.zip && unzip go-live-mac-x64.zip && mv go-live /usr/local/bin/go-live && chmod +x /usr/local/bin/go-live && go-live`
+`curl -LJO https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-mac-x64.zip && unzip go-live-mac-x64.zip && mv go-live /usr/local/bin/go-live && chmod +x /usr/local/bin/go-live && go-live`
 
 ### MacOS Apple Silicon (without Brew)
 
-`curl -LJO https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-mac-arm64.zip && unzip go-live-mac-arm64.zip && mv go-live /usr/local/bin/go-live && chmod +x /usr/local/bin/go-live && go-live`
+`curl -LJO https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-mac-arm64.zip && unzip go-live-mac-arm64.zip && mv go-live /usr/local/bin/go-live && chmod +x /usr/local/bin/go-live && go-live`
 
 ### Linux (using Snapcraft)
 `snap install go-live`
 
 ### Linux x32 (Ubuntu/RHEL/etc.):
-`wget https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-linux-x32 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
+`wget https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-linux-x32 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
 
 ### Linux x64 (Ubuntu/RHEL/etc.):
-`wget https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-linux-x64 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
+`wget https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-linux-x64 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
 
 ### Linux ARM32 (Ubuntu/RHEL/etc.):
-`wget https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-linux-arm32 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
+`wget https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-linux-arm32 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
 
 ### Linux ARM64 (Ubuntu/RHEL/etc.):
-`wget https://github.com/antsankov/go-live/releases/download/v1.1.0/go-live-linux-arm64 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
+`wget https://github.com/antsankov/go-live/releases/download/v1.2.0/go-live-linux-arm64 -O /usr/bin/go-live && chmod +x /usr/bin/go-live`
 
 ### Docker
 `docker pull antsankov/go-live`
@@ -65,7 +65,7 @@ To run (will serve current directory on port 9000):
 
 ### Windows
 
-[Download Here and Execute](https://github.com/antsankov/go-live/releases/tag/v1.1.0)
+[Download Here and Execute](https://github.com/antsankov/go-live/releases/tag/v1.2.0)
 
 - Chocolatey coming soon! (Help wanted)
 - Make sure when running that all necessary ports are open and user has permissions (Help wanted)
@@ -92,7 +92,7 @@ make cross-compile && ls release/
   - You need to have a valid developer certficate - check `security find-identity -p codesigning`. If it is not valid, see https://developer.apple.com/forums/thread/86161 -- you need to check the info of the developer cert to see if the "Organizational Unit" certificate is installed.
   - For gon to work, you need to use the hacked version https://github.com/mitchellh/gon/issues/64#issuecomment-1336311570 to release on Apple Silicon
   - The "ac-password" in gon is an App specfic password for your Apple ID.
-- For docker (remember for version and for latest): `sudo docker build -t antsankov/go-live:v1.1.0 .` and `sudo docker push antsankov/go-live:v1.1.0`
+- For docker (remember for version and for latest): `sudo docker build -t antsankov/go-live:v1.2.0 .` and `sudo docker push antsankov/go-live:v1.2.0`
 ## Flags
 ```
   -h  Print help message for go-live 

go.mod

@@ -1,5 +1,5 @@
 module github.com/antsankov/go-live
 
-go 1.15
+go 1.21
 
 require github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4

lib/lib_test.go

@@ -33,25 +33,6 @@ func TestServerWithoutCache(t *testing.T) {
 	}
 }
 
-// func TestServerWithCache(t *testing.T) {
-// 	go StartServer(".", ":91", false)
-// 	resp, err := http.Get("http://127.0.0.1:80/")
-// 	if err != nil {
-// 		t.Errorf("Couldn't get for the test %s", err)
-// 	}
-
-// 	body, _ := ioutil.ReadAll(resp.Body)
-// 	if resp.Header.Get("Cache-Control") == "" {
-// 		t.Error("Server not setting cache control")
-// 	}
-// 	if resp.StatusCode != 200 {
-// 		t.Error("Server not returning 200")
-// 	}
-// 	if body == nil {
-// 		t.Error("Body is nil, server not working")
-// 	}
-// }
-
 func TestInitialPrint(t *testing.T) {
 	rescueStdout := os.Stdout
 	r, w, _ := os.Pipe()
@@ -81,7 +62,7 @@ func TestPrintServerInfo(t *testing.T) {
 	r, w, _ := os.Pipe()
 	os.Stdout = w
 
-	printServerInformation("/", ":80", "127.0.0.1")
+	printServerInformation("/", ":80")
 
 	w.Close()
 	out, _ := ioutil.ReadAll(r)

lib/printer.go

@@ -6,33 +6,29 @@ import (
 	"time"
 )
 
+// VERSION of Package
+const VERSION = "1.2.0"
+
 func printStartMessage(path string, port string) {
+	// Clear the screen.
 	fmt.Print("\033[2J")
+	// Move the cursor to the upper-left corner of the screen.
 	fmt.Print("\033[H")
-	fmt.Println("go-live\n--")
+	fmt.Printf("go-live\n--\n")
 	fmt.Printf("Serving: %s\n", path)
 	fmt.Printf("Local: http://localhost%s/\n", port)
 }
 
-func printServerInformation(path string, port string, lastIP string) {
-	// Move to the fifth row, change if more print statements are added.
+func printServerInformation(path string, port string) {
+	// Move to the fifth row, 1st column change if more print statements are added.
 	fmt.Print("\033[5;1H")
 	localIP, err := GetLocalIP()
-	if err == nil {
+	if err == nil && localIP != "" {
 		fmt.Printf("Net: http://%s%s/\n", localIP, port)
-		if lastIP == "" {
-			lastIP = localIP
-		}
 	} else {
-		// This is case when connection disconnects
-		if lastIP != localIP {
-			printStartMessage(path, port)
-			fmt.Print("\033[6;1H")
-			lastIP = localIP
-		} else {
-			lastIP = ""
-			fmt.Println()
-		}
+		// If there is no network connection, erase the line.
+		fmt.Print("\033[K")
+		fmt.Println()
 	}
 	fmt.Println("\nRequests:", requests)
 }
@@ -50,10 +46,12 @@ func Printer(dir string, port string) {
 	}
 
 	printStartMessage(path, port)
-	var lastIP string
 	for {
-		printServerInformation(path, port, lastIP)
-		fmt.Println(time.Since(start).Round(time.Second))
-		time.Sleep(250 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
+		printServerInformation(path, port)
+		// Move to the timeSince row, and clear it.
+		fmt.Print("\033[8;1H")
+		fmt.Print("\033[K")
+		fmt.Printf("%s\n", time.Since(start).Round(time.Second))
 	}
 }

main.go

@@ -4,13 +4,14 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
 
 	"github.com/antsankov/go-live/lib"
 	"github.com/pkg/browser"
 )
 
 // VERSION of Package
-const VERSION = "1.1.0"
+const VERSION = "1.2.0"
 
 func main() {
 	var _quiet bool
@@ -34,8 +35,8 @@ func main() {
 
 	flag.Parse()
 
-	if _version {
-		fmt.Println(VERSION)
+	if _version || (len(os.Args) >= 2 && os.Args[1] == "version") {
+		fmt.Printf("v%s (%s/%s)\n", VERSION, runtime.GOOS, runtime.GOARCH)
 		return
 	}
 
@@ -56,7 +57,7 @@ func main() {
 		err = lib.StartServer(_dir, ":80", true)
 	} else {
 		// If user is sudo we don't launch the browser.
-		if _quiet == false && isSudo() == false {
+		if !_quiet && !isSudo() {
 			browser.OpenURL(fmt.Sprintf("http://localhost%s", _port))
 		}
 		err = lib.StartServer(_dir, _port, _cache)

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: go-live
-version: '1.1.0'
+version: '1.2.0'
 summary: A very lightweight CLI utility to start serving a file directory
 description: |
   go-live can be used for local web development, production static-site serving, or as a network file server. By default go-live serves the directory it is executed in.
@@ -27,6 +27,6 @@ apps:
 parts:
   go-live:
     plugin: go
-    go-channel: 1.21/candidate
+    go-channel: 1.21/stable
     source: .
     source-type: git