Replace rerun with watchdog

Author: deliahu

Makefile

@@ -30,27 +30,27 @@ kubectl:
 cluster-up:
 	@$(MAKE) registry-all
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster up
 	@$(MAKE) kubectl
 
 cluster-up-y:
 	@$(MAKE) registry-all
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster up --yes
 	@$(MAKE) kubectl
 
 cluster-down:
 	@$(MAKE) manager-local
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster down
 
 cluster-down-y:
 	@$(MAKE) manager-local
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster down --yes
 
 cluster-info:
@@ -61,13 +61,13 @@ cluster-info:
 cluster-configure:
 	@$(MAKE) registry-all
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster configure
 
 cluster-configure-y:
 	@$(MAKE) registry-all
 	@$(MAKE) cli
-	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster configure --yes
 
 operator-stop:
@@ -123,18 +123,21 @@ manager-local:
 .PHONY: cli
 cli:
 	@mkdir -p ./bin
-	@GOARCH=amd64 CGO_ENABLED=0 go build -o ./bin/cortex ./cli
+	@go build -o ./bin/cortex ./cli
 
 cli-watch:
-	@rerun -watch ./pkg ./cli -ignore ./vendor ./bin -run sh -c "go build -installsuffix cgo -o ./bin/cortex ./cli && echo 'CLI built.'"
+	@clear && echo "building cli..."
+	@$(MAKE) cli
+	@clear && echo -e "\033[1;32mCLI built\033[0m"
+	@watchmedo shell-command --command='clear && echo "rebuilding cli..." && go build -o ./bin/cortex ./cli && clear && echo "\033[1;32mCLI built\033[0m"' --patterns '*.go;*.yaml' --recursive --drop ./pkg ./cli
 
 aws-clear-bucket:
 	@./dev/aws.sh clear-bucket
 
 tools:
 	@go get -u -v golang.org/x/lint/golint
-	@go get -u -v github.com/VojtechVitek/rerun/cmd/rerun
-	@pip3 install black
+	@python3 -m pip install black watchdog argh pyyaml
+	@echo -e "\nyou may also wish to install libyaml (via \`brew install libyaml\` or \`sudo apt install libyaml-dev\`)"
 
 format:
 	@./dev/format.sh

dev/operator_local.sh

@@ -19,7 +19,7 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 
-kill $(pgrep -f rerun) >/dev/null 2>&1 || true
+kill $(pgrep -f make) >/dev/null 2>&1 || true
 
 eval $(python3 $ROOT/manager/cluster_config_env.py "$ROOT/dev/config/cluster.yaml")
 
@@ -34,7 +34,20 @@ fi
 export CORTEX_OPERATOR_IN_CLUSTER=false
 export CORTEX_CLUSTER_CONFIG_PATH=~/.cortex/cluster-dev.yaml
 
-rerun -watch $ROOT/pkg $ROOT/cli $ROOT/dev/config -ignore $ROOT/vendor $ROOT/bin -run sh -c \
-"go build -o $ROOT/bin/operator $ROOT/pkg/operator && go build -installsuffix cgo -o $ROOT/bin/cortex $ROOT/cli && $ROOT/bin/operator"
+clear && echo "starting local operator..."
+
+mkdir -p ./bin && go build -o $ROOT/bin/cortex $ROOT/cli && go build -o $ROOT/bin/operator $ROOT/pkg/operator && ($ROOT/bin/operator &)
+
+trap ctrl_c INT
+function ctrl_c() {
+  kill $(pgrep -f /bin/operator) >/dev/null 2>&1
+}
+
+watchmedo shell-command \
+  --command='kill $(pgrep -f /bin/operator);'" clear && echo 'restarting local operator...' && go build -o $ROOT/bin/cortex $ROOT/cli && go build -o $ROOT/bin/operator $ROOT/pkg/operator && $ROOT/bin/operator &" \
+  --patterns '*.go;*.yaml' \
+  --recursive \
+  --drop \
+  $ROOT/pkg $ROOT/cli $ROOT/dev/config
 
 # go run -race $ROOT/pkg/operator/main.go  # Check for race conditions. Doesn't seem to catch them all?