Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes before publishing new version #271

Merged
merged 1 commit into from
Nov 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions tests/integration.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tests/search.rs
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 0 additions & 5 deletions utilities/Cargo.toml

This file was deleted.

14 changes: 0 additions & 14 deletions utilities/src/lib.rs

This file was deleted.