Support absolute paths

Author: mozey

README.md

@@ -5,47 +5,53 @@ CLI wrapper for [fsnotify](https://github.com/fsnotify/fsnotify)
 ## Quick start
 
 Install
-```sh
-go get github.com/mozey/watcher
-```
-
-Update
-```sh
-go get -u github.com/mozey/watcher
-go install github.com/mozey/watcher
+```bash
+# Since Go 1.20.3 
+# "'go get' is no longer supported outside a module"
+go install github.com/mozey/watcher@latest
 ```
 
 Print version
-```sh    
+```bash  
 $GOPATH/bin/watcher -version
 ```
 
 Watch files, only output changes
-```sh
+```bash
 $GOPATH/bin/watcher -dir testdata
 ```
 
-Watch files recursively, pass in `APP_DIR`
-```sh
-APP_DIR=$(pwd) $GOPATH/bin/watcher -r -dir testdata
+Watch files recursively, and print debug logs
+```bash
+APP_DEBUG=true $GOPATH/bin/watcher -r -dir testdata
 ```
 
-Watch files recursively, and print debug logs
-```sh
-APP_DEBUG=true APP_DIR=$(pwd) $GOPATH/bin/watcher -r -dir testdata
+
+## Testing
+
+Recursively watch for change in both `./testdata` and `./testdata2`
+```bash
+# APP_DIR env sets base dir
+APP_DEBUG=true APP_DIR=$(pwd) go run ./main.go -r -dir testdata -dir testdata2
+# Base dir set from flag
+APP_DEBUG=true go run ./main.go -r -b $APP_DIR -dir testdata -dir testdata2
 ```
 
-Use `go run` inside module
-```sh
-APP_DEBUG=true APP_DIR=$(pwd) go run ./main.go -r -b $APP_DIR -dir testdata -dir testdata2
+Using absolute path
+```bash
+cd ${PRO_PATH}/watcher # Base dir defaults to working dir
+APP_DEBUG=true go run ./main.go -r \
+    -dir testdata \
+    -dir ${PRO_PATH}/watcher/testdata2
 ```
 
-...another example with filters
-```sh
+Example with filters
+```bash
 APP_DEBUG=true APP_DIR=$(pwd) go run ./main.go -r -dir testdata \
 -include ".*.txt$" \
 -include ".*.json$" \
 -excludeDir ".*exclude.*" \
 -exclude ".*\/d.txt$"
 ```
 
+**TODO** See comments in main_test.go

main.go

@@ -2,16 +2,22 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
 	"github.com/mozey/logutil"
 	"github.com/mozey/watcher/pkg/watcher"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
-const AppDebug = "APP_DEBUG"
+// version has a hard-coded default value
+// https://github.com/mozey/config/issues/20
+// For custom builds, the version can be overwritten with ldflags, see
+// "Golang compile environment variable into binary"
+// https://stackoverflow.com/a/47665780/639133
+var version string = "v0.2.0"
 
 func main() {
 	// Exit on signal (ctrl + c)
@@ -21,8 +27,7 @@ func main() {
 	logutil.SetupLogger(true)
 
 	// Override SetupLogger log level
-	s := os.Getenv(AppDebug)
-	debug := s == "true"
+	debug := os.Getenv("APP_DEBUG") == "true"
 	level := zerolog.InfoLevel
 	if debug {
 		level = zerolog.DebugLevel
@@ -37,8 +42,7 @@ func main() {
 
 	exitCode := 0
 	if out.Cmd == watcher.CmdVersion {
-		// TODO Add version
-		fmt.Println("n/a")
+		fmt.Println(version)
 		sig <- os.Signal(syscall.SIGINT)
 
 	} else if out.Cmd == watcher.CmdWatch {

main_test.go

@@ -1,5 +1,4 @@
 package main
 
 // TODO Add ability to pass in a buf for output,
-// then run watcher on mock fs for tests?
-
+// then run watcher on virtual fs for tests?

pkg/watcher/watcher.go

@@ -3,18 +3,17 @@ package watcher
 import (
 	"flag"
 	"fmt"
-	"github.com/fsnotify/fsnotify"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"os"
 	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"time"
-)
 
-const AppDir = "APP_DIR"
+	"github.com/fsnotify/fsnotify"
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+)
 
 type MultiFlag []string
 
@@ -47,8 +46,8 @@ type CmdIn struct {
 	Debug bool
 	// BaseDir for relative paths
 	BaseDir string
-	// Version
-	Version bool
+	// PrintVersion
+	PrintVersion bool
 	// WatchDirs is the dirs to watch
 	WatchDirs MultiFlag
 	// Recursive can be set to watch sub dirs
@@ -79,7 +78,7 @@ type CmdOut struct {
 func ParseFlags() *CmdIn {
 	in := CmdIn{}
 
-	flag.BoolVar(&in.Version, "version", false, "Print version")
+	flag.BoolVar(&in.PrintVersion, "version", false, "Print version")
 	flag.BoolVar(&in.Recursive, "r", false, "Recursively watch sub dirs")
 	flag.IntVar(&in.Limit, "l", 100, "Limit dirs to include recursively")
 	flag.IntVar(&in.Delay, "d", 1500,
@@ -183,7 +182,7 @@ func (in *CmdIn) Watch(watcher *fsnotify.Watcher) {
 func Cmd(in *CmdIn) (out *CmdOut, err error) {
 	out = &CmdOut{}
 
-	if in.Version {
+	if in.PrintVersion {
 		out.Cmd = CmdVersion
 		return out, nil
 	}
@@ -199,7 +198,13 @@ func Cmd(in *CmdIn) (out *CmdOut, err error) {
 	for _, relativePath := range in.WatchDirs {
 
 		// Use absolute paths
-		absolutePath := path.Join(in.BaseDir, relativePath)
+		var absolutePath string
+		if filepath.IsAbs(relativePath) {
+			absolutePath = relativePath
+		} else {
+			// Prefix basedir
+			absolutePath = path.Join(in.BaseDir, relativePath)
+		}
 
 		// Check dir exclusion filter
 		excluded, err := in.DirExcluded(absolutePath)
@@ -266,9 +271,11 @@ func Main(debug bool) (out *CmdOut, err error) {
 
 	in.Debug = debug
 
-	// Base dir is required, resolve in this order (flag, env, working dir)
+	// Resolve base dir in this order (flag, env, working dir).
+	// Specifying absolute paths for dirs/files to watch is also supported,
+	// in that case the dir/file path is not prefixed with the base dir
 	if in.BaseDir == "" {
-		in.BaseDir = os.Getenv(AppDir)
+		in.BaseDir = os.Getenv("APP_DIR")
 		if in.BaseDir == "" {
 			in.BaseDir, err = os.Getwd()
 			if err != nil {