Addition of path substitution

README.md

@@ -27,8 +27,8 @@ The following is given by running `reflex -h`:
 Usage: reflex [OPTIONS] [COMMAND]
 
 COMMAND is any command you'd like to run. Any instance of {} will be replaced
-with the filename of the changed file. (The symbol may be changed with the
---substitute flag.)
+with the filename of the changed file and || will be replaced with the path to the changed file. (The symbol may be changed with the
+--substitute or --pathsubstitute flag.)
 
 OPTIONS are given below:
       --all=false:
@@ -50,6 +50,9 @@ OPTIONS are given below:
             Only match directories (not files).
       --only-files=false:
             Only match files (not directories).
+      --pathsubstitute="||": 
+            The substitution symbol that is replace with the path to the file
+            in a command.
   -r, --regex=[]:
             A regular expression to match filenames. (May be repeated.)
   -e, --sequential=false:
@@ -117,8 +120,8 @@ changed.
 ### Substitution
 
 Reflex provides a way for you to determine, inside your command, what file
-changed. This is via a substitution symbol. The default is `{}`. Every instance
-of the substitution symbol inside your command is replaced by the filename.
+changed and the path to the file. This is via a substitution symbol. The default is `{}` for files and `||` for paths. Every instance
+of the substitution symbol inside your command is replaced by the filename or path.
 
 As a simple example, suppose you're writing Coffeescript and you wish to compile
 the CS files to Javascript when they change. You can do this with:
@@ -332,3 +335,4 @@ background on this issue.
 * Rich Liebling ([rliebling](https://github.com/rliebling))
 * Seth W. Klein ([sethwklein](https://github.com/sethwklein))
 * Vincent Vanackere ([vanackere](https://github.com/vanackere))
+* Richard Cox ([Khabi](https://github.com/Khabi))

config.go

@@ -21,6 +21,7 @@ type Config struct {
 	inverseRegexes  []string
 	inverseGlobs    []string
 	subSymbol       string
+	subPathSymbol   string
 	startService    bool
 	shutdownTimeout time.Duration
 	onlyFiles       bool
@@ -42,6 +43,9 @@ func (c *Config) registerFlags(f *flag.FlagSet) {
 	f.StringVar(&c.subSymbol, "substitute", defaultSubSymbol, `
             The substitution symbol that is replaced with the filename
             in a command.`)
+	f.StringVar(&c.subPathSymbol, "pathsubstitute", defaultSubPathSymbol, `
+    		The substitution symbol that is replace with the path to the file
+    		in a command.`)
 	f.BoolVarP(&c.startService, "start-service", "s", false, `
             Indicates that the command is a long-running process to be
             restarted on matching changes.`)

config_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestReadConfigs(t *testing.T) {
-	const in = `-g '*.go' echo {}
+	const in = `-g '*.go' echo {} ||
 
 # Some comment here
 -r '^a[0-9]+\.txt$' --only-dirs --substitute='[]' echo []
@@ -28,17 +28,19 @@ world"
 	}
 	want := []*Config{
 		{
-			command:         []string{"echo", "{}"},
+			command:         []string{"echo", "{}", "||"},
 			source:          "test input, line 1",
 			globs:           []string{"*.go"},
 			subSymbol:       "{}",
+			subPathSymbol:   "||",
 			shutdownTimeout: 500 * time.Millisecond,
 		},
 		{
 			command:         []string{"echo", "[]"},
 			source:          "test input, line 4",
 			regexes:         []string{`^a[0-9]+\.txt$`},
 			subSymbol:       "[]",
+			subPathSymbol:   "||",
 			shutdownTimeout: 500 * time.Millisecond,
 			onlyDirs:        true,
 		},
@@ -47,6 +49,7 @@ world"
 			source:          "test input, line 6",
 			globs:           []string{"*.go"},
 			subSymbol:       "{}",
+			subPathSymbol:   "||",
 			startService:    true,
 			shutdownTimeout: 500 * time.Millisecond,
 			onlyFiles:       true,
@@ -59,6 +62,7 @@ world"
 			inverseRegexes:  []string{"baz"},
 			inverseGlobs:    []string{"b", "c"},
 			subSymbol:       "{}",
+			subPathSymbol:   "||",
 			shutdownTimeout: 500 * time.Millisecond,
 		},
 	}
@@ -76,6 +80,7 @@ func TestReadConfigsBad(t *testing.T) {
 		"--substitute='' echo hi",
 		"-s echo {}",
 		"--only-files --only-dirs echo hi",
+		"--pathsubstitute='' echo hi",
 	} {
 		r := strings.NewReader(in)
 		if configs, err := readConfigsFromReader(r, "test input"); err == nil {

main.go

@@ -15,6 +15,7 @@ import (
 )
 
 const defaultSubSymbol = "{}"
+const defaultSubPathSymbol = "||"
 
 var (
 	reflexes []*Reflex

reflex.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
@@ -18,16 +19,17 @@ import (
 
 // A Reflex is a single watch + command to execute.
 type Reflex struct {
-	id           int
-	source       string // Describes what config/line defines this Reflex
-	startService bool
-	backlog      Backlog
-	matcher      Matcher
-	onlyFiles    bool
-	onlyDirs     bool
-	command      []string
-	subSymbol    string
-	done         chan struct{}
+	id            int
+	source        string // Describes what config/line defines this Reflex
+	startService  bool
+	backlog       Backlog
+	matcher       Matcher
+	onlyFiles     bool
+	onlyDirs      bool
+	command       []string
+	subSymbol     string
+	subPathSymbol string
+	done          chan struct{}
 
 	mu      *sync.Mutex // protects killed and running
 	killed  bool
@@ -56,9 +58,13 @@ func NewReflex(c *Config) (*Reflex, error) {
 		return nil, errors.New("substitution symbol must be non-empty")
 	}
 
+	if c.subPathSymbol == "" {
+		return nil, errors.New("path substitution symbol must be non-empty")
+	}
+
 	substitution := false
 	for _, part := range c.command {
-		if strings.Contains(part, c.subSymbol) {
+		if strings.Contains(part, c.subSymbol) || strings.Contains(part, c.subPathSymbol) {
 			substitution = true
 			break
 		}
@@ -83,18 +89,19 @@ func NewReflex(c *Config) (*Reflex, error) {
 	}
 
 	reflex := &Reflex{
-		id:           reflexID,
-		source:       c.source,
-		startService: c.startService,
-		backlog:      backlog,
-		matcher:      matcher,
-		onlyFiles:    c.onlyFiles,
-		onlyDirs:     c.onlyDirs,
-		command:      c.command,
-		subSymbol:    c.subSymbol,
-		done:         make(chan struct{}),
-		timeout:      c.shutdownTimeout,
-		mu:           &sync.Mutex{},
+		id:            reflexID,
+		source:        c.source,
+		startService:  c.startService,
+		backlog:       backlog,
+		matcher:       matcher,
+		onlyFiles:     c.onlyFiles,
+		onlyDirs:      c.onlyDirs,
+		command:       c.command,
+		subSymbol:     c.subSymbol,
+		subPathSymbol: c.subPathSymbol,
+		done:          make(chan struct{}),
+		timeout:       c.shutdownTimeout,
+		mu:            &sync.Mutex{},
 	}
 	reflexID++
 
@@ -115,8 +122,9 @@ func (r *Reflex) String() string {
 	}
 	if !r.startService {
 		fmt.Fprintln(&buf, "| Substitution symbol", r.subSymbol)
+		fmt.Fprintln(&buf, "| Path Substitution Symbol", r.subPathSymbol)
 	}
-	replacer := strings.NewReplacer(r.subSymbol, "<filename>")
+	replacer := strings.NewReplacer(r.subSymbol, "<filename>", r.subPathSymbol, "<path>")
 	command := make([]string, len(r.command))
 	for i, part := range r.command {
 		command[i] = replacer.Replace(part)
@@ -245,8 +253,9 @@ func (r *Reflex) terminate() {
 	}
 }
 
-func replaceSubSymbol(command []string, subSymbol string, name string) []string {
-	replacer := strings.NewReplacer(subSymbol, name)
+func replaceSubSymbol(command []string, subSymbol string, subPathSymbol string, name string) []string {
+	p := fmt.Sprintf("%s/", filepath.Dir(name))
+	replacer := strings.NewReplacer(subSymbol, name, subPathSymbol, p)
 	newCommand := make([]string, len(command))
 	for i, c := range command {
 		newCommand[i] = replacer.Replace(c)
@@ -259,7 +268,7 @@ var seqCommands = &sync.Mutex{}
 // runCommand runs the given Command. All output is passed line-by-line to the
 // stdout channel.
 func (r *Reflex) runCommand(name string, stdout chan<- OutMsg) {
-	command := replaceSubSymbol(r.command, r.subSymbol, name)
+	command := replaceSubSymbol(r.command, r.subSymbol, r.subPathSymbol, name)
 	cmd := exec.Command(command[0], command[1:]...)
 	r.cmd = cmd