From d7bf864efb19c7c3709f00ba1c59b23675b1087e Mon Sep 17 00:00:00 2001
From: "anthony.cicchetti" <anthony.cicchetti@ert.com>
Date: Thu, 27 Apr 2017 11:35:47 -0400
Subject: [PATCH] Rust - Solved Beer Song

---
 .gitignore                        |  2 ++
 rust/beer-song/src/lib.rs         | 19 ++++++++++++++++---
 rust/beer-song/tests/beer-song.rs |  5 -----
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f4fa250
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+\.vscode/
diff --git a/rust/beer-song/src/lib.rs b/rust/beer-song/src/lib.rs
index 7a8d3cc..5591abe 100644
--- a/rust/beer-song/src/lib.rs
+++ b/rust/beer-song/src/lib.rs
@@ -1,7 +1,20 @@
 pub fn verse(verse_num: i32) -> String{
-    return String::from("Hello World!")
+    match verse_num {
+        0 => return String::from("No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"),
+        1 => return String::from("1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n"),
+        2 => return String::from("2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n"),
+        _ => return String::from("{:?} bottles of beer on the wall, {:?} bottles of beer.\nTake one down and pass it around, {:z} bottles of beer on the wall.\n").replace("{:?}", verse_num.to_string().as_str()).replace("{:z}", (verse_num - 1).to_string().as_str())
+    }
 }
 
-pub fn sing(first_verse: i32, last_verse: i32) -> String{
-    return String::from("Hello World!")
+pub fn sing(last_verse: i32, first_verse: i32) -> String{
+    let mut song: String = "".to_string();
+    let mut count: i32 = last_verse;
+    while count != (first_verse - 1){
+        song += &verse(count);
+        song += "\n";
+        count -= 1;
+    }
+    song.pop();
+    return song;
 }
diff --git a/rust/beer-song/tests/beer-song.rs b/rust/beer-song/tests/beer-song.rs
index 1fddd37..6a39fd6 100644
--- a/rust/beer-song/tests/beer-song.rs
+++ b/rust/beer-song/tests/beer-song.rs
@@ -6,31 +6,26 @@ fn test_verse_0() {
 }
 
 #[test]
-#[ignore]
 fn test_verse_1() {
     assert_eq!(beer::verse(1), "1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n");
 }
 
 #[test]
-#[ignore]
 fn test_verse_2() {
     assert_eq!(beer::verse(2), "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n");
 }
 
 #[test]
-#[ignore]
 fn test_verse_8() {
     assert_eq!(beer::verse(8), "8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n");
 }
 
 #[test]
-#[ignore]
 fn test_song_8_6() {
     assert_eq!(beer::sing(8, 6), "8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n\n7 bottles of beer on the wall, 7 bottles of beer.\nTake one down and pass it around, 6 bottles of beer on the wall.\n\n6 bottles of beer on the wall, 6 bottles of beer.\nTake one down and pass it around, 5 bottles of beer on the wall.\n");
 }
 
 #[test]
-#[ignore]
 fn test_song_3_0() {
     assert_eq!(beer::sing(3, 0), "3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n\n2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n");
 }