Truly watch the correct file and port to 2018. Version bump.

Author: SirVer

.travis.yml

@@ -13,12 +13,16 @@ matrix:
   include:
     # Linux
     - env: TARGET=armv7-unknown-linux-gnueabihf
+      rust: nightly
     - env: TARGET=i686-unknown-linux-musl
+      rust: nightly
     - env: TARGET=x86_64-unknown-linux-musl
+      rust: nightly
 
     # OSX
     - env: TARGET=x86_64-apple-darwin
       os: osx
+      rust: nightly
 
 before_install:
   - set -e
@@ -42,7 +46,7 @@ deploy:
   file_glob: true
   file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
   on:
-    condition: $TRAVIS_RUST_VERSION = stable
+    condition: $TRAVIS_RUST_VERSION = nightly
     tags: true
   provider: releases
   skip_cleanup: true

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 authors = ["Holger Rapp <HolgerRapp@gmx.net>"]
 name = "shell_grunt2"
-version = "0.1.5"
+version = "0.2.0"
 edition = "2018"
 
 [dependencies]
@@ -15,6 +15,7 @@ self_update = "0.4.2"
 sha1 = "0.6.0"
 term = "0.5.1"
 time = "^0.1"
+pathdiff = "0.1.0"
 
 [dependencies.ctrlc]
 features = ["termination"]

Cargo.toml

@@ -3,13 +3,11 @@ use ctrlc;
 use notify;
 use shell_grunt2;
 use time;
-#[macro_use]
-extern crate self_update;
 
 use notify::Watcher;
 use shell_grunt2::lockfile;
 use shell_grunt2::task::{Runnable, RunningTask, Task};
-use std::path;
+use std::path::{Path, PathBuf};
 use std::process;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc;
@@ -27,14 +25,14 @@ fn update() -> Result<(), Box<dyn (::std::error::Error)>> {
         .show_download_progress(true)
         .show_output(false)
         .no_confirm(true)
-        .current_version(cargo_crate_version!())
+        .current_version(self_update::cargo_crate_version!())
         .build()?
         .update()?;
     Ok(())
 }
 
 struct ReloadWatcherFile {
-    file_name: String,
+    file_name: PathBuf,
     should_reload: Arc<AtomicBool>,
 }
 
@@ -56,44 +54,51 @@ impl Runnable for ReloadWatcherFile {
 }
 
 impl Task for ReloadWatcherFile {
-    fn should_run(&self, path: &path::Path) -> bool {
-        if let Some(file_name) = path.file_name() {
-            return file_name.to_string_lossy() == self.file_name;
-        }
-        false
+    fn should_run(&self, path: &Path) -> bool {
+        path == self.file_name
     }
 
     fn start_delay(&self) -> time::Duration {
         time::Duration::milliseconds(0)
     }
 }
 
-fn watch_file_events(watcher_file: &str) {
+fn watch_file_events(watcher_file: impl AsRef<Path>) {
     let saw_interrupt_signal = Arc::new(AtomicBool::new(false));
     let r = saw_interrupt_signal.clone();
     ctrlc::set_handler(move || {
         r.store(true, Ordering::SeqCst);
     })
     .expect("Error setting Ctrl-C handler");
 
+    let current_dir = std::fs::canonicalize(".").unwrap();
+    let watcher_file = std::fs::canonicalize(watcher_file.as_ref()).unwrap();
     loop {
-        println!("Watching file system with tasks from {}", watcher_file);
+        let diff = pathdiff::diff_paths(&watcher_file, &current_dir);
+        let disp = match &diff {
+            Some(diff) => diff,
+            None => &watcher_file,
+        };
+        println!("Watching file system with tasks from {}", disp.display());
 
         // Ideally, the RecommendedWatcher would be owned by ShellGrunt2, but whenever I try that,
         // the tool crashes whenever it should receive an event on the channel. So it needs to stay
         // outside. :(
         let (events_tx, events_rx) = mpsc::channel();
         let mut watcher = notify::watcher(events_tx, Duration::from_millis(50)).unwrap();
         watcher
-            .watch(&path::Path::new("."), notify::RecursiveMode::Recursive)
+            .watch(&current_dir, notify::RecursiveMode::Recursive)
+            .unwrap();
+        watcher
+            .watch(&watcher_file, notify::RecursiveMode::Recursive)
             .unwrap();
 
         let should_reload = Arc::new(AtomicBool::new(false));
         let mut tasks: Vec<Box<dyn Task>> = vec![Box::new(ReloadWatcherFile {
-            file_name: watcher_file.to_string(),
+            file_name: watcher_file.clone(),
             should_reload: should_reload.clone(),
         })];
-        for task in shell_grunt2::lua_task::run_file(path::Path::new(watcher_file)) {
+        for task in shell_grunt2::lua_task::run_file(&watcher_file) {
             tasks.push(task);
         }
         let mut shell_grunt2 = shell_grunt2::ShellGrunt2::new(&tasks, events_rx);
@@ -113,7 +118,7 @@ fn watch_file_events(watcher_file: &str) {
 
 fn main() {
     let matches = clap::App::new("shell_grunt2")
-        .version(cargo_crate_version!())
+        .version(self_update::cargo_crate_version!())
         .about("Watches the file system and executes commands from a Lua file.")
         .arg(
             clap::Arg::with_name("file")

src/main.rs

@@ -11,7 +11,7 @@ return {
       },
       commands = {
          {
-            name = "Cargo build (release)",
+            name = "Cargo jump (release)",
             command = "cargo +nightly build --release --color always",
          },
       },