Use relative path from cwd for hashes

Author: devongovett

Cargo.toml

@@ -34,6 +34,7 @@ lazy_static = "1.4.0"
 clap = { version = "3.0.6", features = ["derive"] }
 retain_mut = "0.1.5"
 serde_json = "*"
+pathdiff = "0.2.1"
 
 [dev-dependencies]
 indoc = "1.0.3"

src/main.rs

@@ -42,8 +42,8 @@ pub fn main() -> Result<(), std::io::Error> {
   let cli_args = CliArgs::parse();
   let source = fs::read_to_string(&cli_args.input_file)?;
 
-  let filename = path::Path::new(&cli_args.input_file)
-    .file_name()
+  let absolute_path = fs::canonicalize(cli_args.input_file)?;
+  let filename = pathdiff::diff_paths(absolute_path, std::env::current_dir()?)
     .unwrap()
     .to_str()
     .unwrap()

tests/cli_integration_tests.rs

@@ -242,6 +242,7 @@ fn css_modules_stdout() -> Result<(), Box<dyn std::error::Error>> {
   let infile = assert_fs::NamedTempFile::new("test.css")?;
   infile.write_str(&input)?;
   let mut cmd = Command::cargo_bin("parcel_css")?;
+  cmd.current_dir(infile.path().parent().unwrap());
   cmd.arg(infile.path());
   cmd.arg("--css-modules");
   cmd.assert().success().stdout(predicate::str::contains(output));
@@ -263,6 +264,7 @@ fn css_modules_infer_output_file() -> Result<(), Box<dyn std::error::Error>> {
   let outfile = assert_fs::NamedTempFile::new("out.css")?;
   infile.write_str(&input)?;
   let mut cmd = Command::cargo_bin("parcel_css")?;
+  cmd.current_dir(infile.path().parent().unwrap());
   cmd.arg(infile.path());
   cmd.arg("--css-modules");
   cmd.arg("-o").arg(outfile.path());
@@ -284,6 +286,7 @@ fn css_modules_output_target_option() -> Result<(), Box<dyn std::error::Error>>
   let modules_file = assert_fs::NamedTempFile::new("module.json")?;
   infile.write_str(&input)?;
   let mut cmd = Command::cargo_bin("parcel_css")?;
+  cmd.current_dir(infile.path().parent().unwrap());
   cmd.arg(infile.path());
   cmd.arg("-o").arg(outfile.path());
   cmd.arg("--css-modules");
@@ -305,6 +308,7 @@ fn sourcemap() -> Result<(), Box<dyn std::error::Error>> {
   let outfile = outdir.child("out.css");
   infile.write_str(&input)?;
   let mut cmd = Command::cargo_bin("parcel_css")?;
+  cmd.current_dir(infile.path().parent().unwrap());
   cmd.arg(infile.path());
   cmd.arg("-o").arg(outfile.path());
   cmd.arg("--sourcemap");