Tweak

src/error.rs

@@ -10,14 +10,14 @@ pub(crate) enum Error {
  },
  #[snafu(display("extraneous file not in filepack at `{path}`"))]
  ExtraneousFile { path: Utf8PathBuf },
- #[snafu(display("filepack `{path}` already exists"))]
- FilepackExists { path: Utf8PathBuf },
  #[snafu(display("hash mismatch for `{path}`, expected {expected} but got {actual}"))]
  HashMismatch {
  path: Utf8PathBuf,
  expected: Hash,
  actual: Hash,
  },
+ #[snafu(display("manifest `{path}` already exists"))]
+ ManifestAlreadyExists { path: Utf8PathBuf },
  #[snafu(display(
  "internal error, this may indicate a bug in filepack: `{message}` \
  consider filing an issue: https://github.com/casey/filepack/issues/new"

src/subcommand/create.rs

@@ -59,7 +59,7 @@ pub(crate) fn run(root: &Utf8Path) -> Result {
  .try_exists()
  .context(error::Io { path: &destination })?
  {
- return Err(Error::FilepackExists { path: destination });
+ return Err(Error::ManifestAlreadyExists { path: destination });
  }
 
  let filepack = Filepack { files };

tests/create.rs

@@ -156,3 +156,20 @@ fn backslash_error() {
  .stderr("error: path `/` has component containing forward slash\n")
  .failure();
 }
+
+#[test]
+fn manifest_already_exists_error() {
+ let dir = TempDir::new().unwrap();
+
+ dir.child("filepack.json").touch().unwrap();
+
+ Command::cargo_bin("filepack")
+ .unwrap()
+ .args(["create", "."])
+ .current_dir(&dir)
+ .assert()
+ .stderr(format!(
+ "error: manifest `.{SEPARATOR}filepack.json` already exists\n"
+ ))
+ .failure();
+}