Release 0.4.0 (#38)

* Update dependencies * Replace rstest_parametrize with rstest * Update integration test for new version of assert_cmd * Update changelog
noeddl · Dec 23, 2019 · fd93513 · fd93513
1 parent 07d0a79
commit fd93513
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 126 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
+## [0.4.0] - 2019-12-23
+
+* Add a bunch of new chord types ([#31](https://github.com/noeddl/ukebox/issues/31)).
+* Remove incorrect chord shapes for `D7` and `Dm7` ([#34](https://github.com/noeddl/ukebox/issues/34)).
+
 ## [0.3.0] - 2019-11-24
 
 * Set up CI for the repo.
-* Add command line option `--tuning` to specify a tuning (`C`, `D` or `G`).
+* Add command line option `--tuning` to specify a tuning (`C`, `D` or `G`) ([#1](https://github.com/noeddl/ukebox/issues/1)).
 
 ## [0.2.0] - 2019-10-13
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ukebox"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Anett Seeker"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -18,7 +18,7 @@ regex = "1"
 structopt = "0.3"
 
 [dev-dependencies]
-assert_cmd = "0.10"
+assert_cmd = "0.12"
 indoc = "0.3"
 predicates = "1"
-rstest = "0.3"
+rstest = "0.5"
diff --git a/src/chord/chord.rs b/src/chord/chord.rs
@@ -202,9 +202,9 @@ impl FromStr for Chord {
 mod tests {
     #![allow(clippy::many_single_char_names)]
     use super::*;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         case("Z"),
         case("c"),
@@ -219,7 +219,7 @@ mod tests {
         assert!(Chord::from_str(chord).is_err())
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -251,7 +251,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::Major);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -283,7 +283,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::Minor);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -315,7 +315,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::SuspendedSecond);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -347,7 +347,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::SuspendedFourth);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -379,7 +379,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::Augmented);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -411,7 +411,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::Diminished);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -451,7 +451,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::DominantSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -491,7 +491,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::MinorSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -531,7 +531,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::MajorSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -571,7 +571,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::MinorMajorSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -611,7 +611,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::AugmentedSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -651,7 +651,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::AugmentedMajorSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -691,7 +691,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::DiminishedSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         root,
         third,
@@ -731,7 +731,7 @@ mod tests {
         assert_eq!(c.chord_type, ChordType::HalfDiminishedSeventh);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         chord,
         note,
         contains,

diff --git a/src/diagram/chord_diagram.rs b/src/diagram/chord_diagram.rs
@@ -89,10 +89,10 @@ impl fmt::Display for ChordDiagram {
 mod tests {
     use super::*;
     use indoc::indoc;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
     use std::str::FromStr;
 
-    #[rstest_parametrize(chord_name, min_fret, tuning, diagram,
+    #[rstest(chord_name, min_fret, tuning, diagram,
         case(
             "C",
             0,

diff --git a/src/diagram/string_diagram.rs b/src/diagram/string_diagram.rs
@@ -60,10 +60,10 @@ impl fmt::Display for StringDiagram {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
     use std::str::FromStr;
 
-    #[rstest_parametrize(
+    #[rstest(
         root_name,
         base_fret,
         fret,

diff --git a/src/note/note.rs b/src/note/note.rs
@@ -142,10 +142,10 @@ impl Add<Interval> for Note {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
     use Interval::*;
 
-    #[rstest_parametrize(
+    #[rstest(
         s,
         case("C"),
         case("C#"),
@@ -170,7 +170,7 @@ mod tests {
         assert_eq!(format!("{}", note), s);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         note_name,
         interval,
         result_name,

diff --git a/src/note/pitch_class.rs b/src/note/pitch_class.rs
@@ -115,10 +115,10 @@ impl Sub<Semitones> for PitchClass {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
     use PitchClass::*;
 
-    #[rstest_parametrize(
+    #[rstest(
         n,
         pitch_class,
         case(0, C),
@@ -143,7 +143,7 @@ mod tests {
         assert_eq!(PitchClass::from(n), pitch_class);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         pitch_class,
         n,
         result,
@@ -158,7 +158,7 @@ mod tests {
         assert_eq!(pitch_class + n, result);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         pc1,
         pc2,
         n,
@@ -171,7 +171,7 @@ mod tests {
         assert_eq!(pc1 - pc2, n);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         pc1,
         n,
         pc2,

diff --git a/src/note/staff_position.rs b/src/note/staff_position.rs
@@ -58,10 +58,10 @@ impl Add<StaffSteps> for StaffPosition {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rstest::rstest_parametrize;
+    use rstest::rstest;
     use StaffPosition::*;
 
-    #[rstest_parametrize(
+    #[rstest(
         n,
         staff_position,
         case(0, CPos),
@@ -76,7 +76,7 @@ mod tests {
         assert_eq!(StaffPosition::from(n), staff_position);
     }
 
-    #[rstest_parametrize(
+    #[rstest(
         staff_position,
         n,
         result,