Misc fixes before publishing new versionv0.3.4

7 files changed, 21 insertions, 33 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb33b23e..3543a7d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.4] - 2017-10-06
+### Added
 - Do not evaluate backticks in assignments during dry runs (#253)
 
+### Changed
+- Change license to CC0 going forward (#270)
+
 ## [0.3.1] - 2017-10-06
 ### Added
 - Started keeping a changelog in CHANGELOG.md (#220)
diff --git a/Cargo.lock b/Cargo.lock
index 71d1eea7..b8ad9017 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,6 +71,11 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "executable-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
 name = "fuchsia-zircon"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -109,13 +114,13 @@ dependencies = [
  "brev 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "executable-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "utilities 0.0.0",
 ]
 
 [[package]]
@@ -248,10 +253,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "utilities"
-version = "0.0.0"
-
-[[package]]
 name = "vec_map"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -282,6 +283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc34bf7d5d66268b466b9852bca925ec1d2650654dab4da081e63fd230145c2e"
 "checksum edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6a34f5204fbc13582de418611cf3a7dcdd07c6d312a5b631597ba72c06b9d9c9"
 "checksum either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740178ddf48b1a9e878e6d6509a1442a2d42fd2928aae8e7a6f8a36fb01981b3"
+"checksum executable-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ebc5a6d89e3c90b84e8f33c8737933dda8f1c106b5415900b38b9d433841478"
 "checksum fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c0581a4e363262e52b87f59ee2afe3415361c6ec35e665924eb08afe8ff159"
 "checksum fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43f3795b4bae048dc6123a6b972cadde2e676f9ded08aef6bb77f5f157684a82"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
diff --git a/Cargo.toml b/Cargo.toml
index da967a11..18879af6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,5 +21,5 @@ regex          = "0.2.2"
 tempdir        = "0.3.5"
 unicode-width  = "0.1.3"
 
-[dev-dependencies.utilities]
-path = "utilities"
+[dev-dependencies]
+executable-path = "1.0.0"
diff --git a/tests/integration.rs b/tests/integration.rs
index ce6ce3a4..a70d15cb 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -1,14 +1,14 @@
-extern crate tempdir;
 extern crate brev;
+extern crate executable_path;
 extern crate libc;
-extern crate utilities;
+extern crate tempdir;
 
+use executable_path::executable_path;
 use libc::{EXIT_FAILURE, EXIT_SUCCESS};
 use std::env;
 use std::process;
 use std::str;
 use tempdir::TempDir;
-use utilities::just_binary_path;
 
 /// Instantiate integration tests for a given test case using
 /// sh, dash, and bash.
@@ -54,7 +54,7 @@ fn integration_test(
   path.push("justfile");
   brev::dump(path, justfile);
 
-  let output = process::Command::new(&just_binary_path())
+  let output = process::Command::new(&executable_path("just"))
     .current_dir(tmp.path())
     .args(&["--shell", shell])
     .args(args)
diff --git a/tests/search.rs b/tests/search.rs
index 90e2deb0..07021323 100644
--- a/tests/search.rs
+++ b/tests/search.rs
@@ -1,13 +1,13 @@
-extern crate utilities;
 extern crate brev;
+extern crate executable_path;
 extern crate tempdir;
 
-use utilities::just_binary_path;
 use tempdir::TempDir;
 use std::{path, str, fs, process};
+use executable_path::executable_path;
 
 fn search_test<P: AsRef<path::Path>>(path: P, args: &[&str]) {
-  let binary = just_binary_path();
+  let binary = executable_path("just");
 
   let output = process::Command::new(binary)
     .current_dir(path)
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
deleted file mode 100644
index 080c4fdf..00000000
--- a/utilities/Cargo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[package]
-name    = "utilities"
-version = "0.0.0"
-authors = ["Casey Rodarmor <casey@rodarmor.com>"]
-publish = false
diff --git a/utilities/src/lib.rs b/utilities/src/lib.rs
deleted file mode 100644
index 0c22444d..00000000
--- a/utilities/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::env;
-use std::path::PathBuf;
-
-pub fn just_binary_path() -> PathBuf {
-  let mut path = env::current_exe().unwrap();
-  path.pop();
-  if path.ends_with("deps") {
-    path.pop();
-  }
-  let exe = String::from("just") + env::consts::EXE_SUFFIX;
-  path.push(exe);
-  path
-}
-