handle simple draw

.drone.yml

@@ -0,0 +1,32 @@
+kind: pipeline
+name: default
+
+steps:
+ - name: test
+   image: rust:1.38.0
+   commands:
+    - cargo test
+ - name: build_relase
+   image: rust:1.38.0
+   commands:
+    - cargo install --path . --root . -f
+    - strip bin/tictactoe
+    - tar cvzf ttt.tar.gz bin src Cargo.*
+   when:
+    event:    
+    - tag
+ - name: gitea_release
+   image: plugins/gitea-release
+   settings:
+     api_key:
+      from_secret: gitea_tkn
+     base_url:
+      from_secret: gitea_url
+     files:
+       - ttt.tar.gz
+     checksum:
+       - md5
+       - sha512
+   when:
+    event: 
+    - tag

src/main.rs

@@ -1,3 +1,4 @@
+use std::env::args;
 use std::fmt;
 use std::io;
 use std::io::Write;
@@ -72,7 +73,7 @@ impl FromStr for Board {
             match c {
                 'X' | 'x' => board.0.push(State::X),
                 'O' | 'o' => board.0.push(State::O),
-                'N' | 'n' => board.0.push(State::N),
+                'N' | 'n' | '_' => board.0.push(State::N),
                 _ => (),
             }
         }
@@ -96,6 +97,16 @@ impl Board {
         (self.0.len() as f64).sqrt() as usize
     }
 
+    fn to_string_short(&self) -> String {
+        let mut s = String::with_capacity(self.0.len() + self.dimension());
+        for y in 0..self.dimension() {
+            for x in 0..self.dimension() {
+                s.push_str(&self[(x, y)].to_string())
+            }
+        }
+        s
+    }
+
     fn winner(&self) -> Option<State> {
         let mut winners = [State::N; 4];
         let dim = self.dimension();
@@ -152,11 +163,24 @@ impl Board {
         }
         //Diagonal winners require a full X pass
         winner(&winners[2..4])
+            .or(Some(State::N).filter(|_| self.0.iter().filter(|s| *s == &State::N).count() == 0))
     }
 }
 
 fn main() {
-    let mut board = Board::default();
+    let mut board = {
+        if let Some(arg) = args().skip(1).next() {
+            if let Ok(size) = arg.parse::<usize>() {
+                Board::new(size)
+            } else if let Ok(board) = Board::from_str(&arg) {
+                board
+            } else {
+                Board::default()
+            }
+        } else {
+            Board::default()
+        }
+    };
     let stdin = std::io::stdin();
     println!("{}", &board);
     let winner = loop {
@@ -204,7 +228,7 @@ fn main() {
             println!("{}", &board);
         }
     };
-    println!("The winner is {}", winner);
+    println!("{}\nThe winner is {}", board.to_string_short(), winner);
 }
 
 #[cfg(test)]
@@ -217,10 +241,7 @@ mod test {
             Board::from_str("XXX,NNN,NNN").unwrap().winner(),
             Some(State::X)
         );
-        assert_eq!(
+        assert_eq!(Board::from_str("XNX,NNN,NNN").unwrap().winner(), None);
-            Board::from_str("XNX,NNN,NNN").unwrap().winner(),
-            None
-        );
         assert_eq!(
             Board::from_str("NNN,XXX,NNN").unwrap().winner(),
             Some(State::X)
@@ -233,5 +254,18 @@ mod test {
             Board::from_str("OXN,OON,XNO").unwrap().winner(),
             Some(State::O)
         );
+        println!("{}", Board::from_str("XOX,OOX,OXO").unwrap());
+        assert_eq!(
+            Board::from_str("XOX,OOX,OXO").unwrap().winner(),
+            Some(State::N)
+        );
+    }
+
+    #[test]
+    fn to_string() {
+        assert_eq!(
+            &Board::from_str("XXX,NNN,NNN").unwrap().to_string_short()[..],
+            "XXX______"
+        );
     }
 }