minesweeper-cl 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0bc9d27bc14214520ecaa422531778f6ca0ac8
-  data.tar.gz: d6a78e8abc9bb03129fee1f095279d8d6539ea37
+  metadata.gz: 85de14a45adbabf9db52ef0e26a84edb2d1ef8f4
+  data.tar.gz: bbdc5313b92f2e82c0fa41110f12b86beb872a9a
 SHA512:
-  metadata.gz: 386ea4560612f983a4d413be3210607eb39adf0163808e133db4ade059ef73a2991ca784ced346af748ecfc801c1544bd777ffda648397d1bd09e9bd109b2ff7
-  data.tar.gz: 51d28d14471273821e73dba73f62f3c84082efd987f967d94f4801938a4c6a8de5a8510470905f4db20cbe8b268b85be2bfecc6bcd0e1a22c82f1c9d5ce2ba52
+  metadata.gz: 60a4364bfd95d6f17eef069117938e559eb5bf299857a37a65e591f6048e43a9271cfe860a1a6f2100ca2492f03cbed301651b613736f1e50eb2299ca2c33ccb
+  data.tar.gz: 4d5013d5935cef2cc1e5b250cdbaae474ae5ce6bc4c9a52441946174a287427f3eab5d64014f5a615dc0db37e49f006f52ba3f32a1dae8f9e48f19c7ab442ec0

data/bin/minesweeper

@@ -6,26 +6,34 @@ require 'game_board'
 puts "Welcome to the game of minesweeper!"
 puts "-----------------------------------"
 puts "Please enter the amount of rows that you would like to play with, anything more than 20 will be truncated."
-rows = gets.chomp.to_i
+rows = gets.chomp
 
-while !rows.is_a?(Integer) do
+while /^(\d){1,2}\z/.match(rows) == nil do
   puts "Please enter the amount of rows that you would like to play with, anything more than 20 will be truncated."
-  rows = gets.chomp.to_i
+  rows = gets.chomp
 end
 
+# Ternary statement to truncate the rows if value entered is greater than 20
+if rows.to_i > 20 then rows = 20 else rows = rows.to_i end
+
 puts "Please enter the amount of cols that you would like to play with, anything more than 20 will be truncated."
-cols = gets.chomp.to_i
+cols = gets.chomp
 
-while !cols.is_a?(Integer) do
+while /^(\d){1,2}\z/.match(cols) == nil do
   puts "Please enter the amount of cols that you would like to play with, anything more than 20 will be truncated."
-  cols = gets.chomp.to_i
+  cols = gets.chomp
 end
 
+# Ternary statement to truncate the cols if value entered is greater than 20
+if cols.to_i > 20 then cols = 20 else cols = cols.to_i end
+
 puts "Please enter the % chance you want for a bomb to occur"
+puts "This number needs to be between 0 and 1"
 bomb_chance = gets.chomp.to_f
 
-while !bomb_chance.is_a?(Float) do
+while !bomb_chance.is_a?(Float) || bomb_chance > 1.0 || bomb_chance < 0.0 do
   puts "Please enter the % chance you want for a bomb to occur"
+  puts "This number needs to be between 0 and 1"
   bomb_chance = gets.chomp.to_f
 end
 

data/lib/minesweeper.rb

@@ -6,26 +6,34 @@ require 'game_board'
 puts "Welcome to the game of minesweeper!"
 puts "-----------------------------------"
 puts "Please enter the amount of rows that you would like to play with, anything more than 20 will be truncated."
-rows = gets.chomp.to_i
+rows = gets.chomp
 
-while !rows.is_a?(Integer) do
+while /^(\d){1,2}\z/.match(rows) == nil do
   puts "Please enter the amount of rows that you would like to play with, anything more than 20 will be truncated."
-  rows = gets.chomp.to_i
+  rows = gets.chomp
 end
 
+# Ternary statement to truncate the rows if value entered is greater than 20
+if rows.to_i > 20 then rows = 20 else rows = rows.to_i end
+
 puts "Please enter the amount of cols that you would like to play with, anything more than 20 will be truncated."
-cols = gets.chomp.to_i
+cols = gets.chomp
 
-while !cols.is_a?(Integer) do
+while /^(\d){1,2}\z/.match(cols) == nil do
   puts "Please enter the amount of cols that you would like to play with, anything more than 20 will be truncated."
-  cols = gets.chomp.to_i
+  cols = gets.chomp
 end
 
+# Ternary statement to truncate the cols if value entered is greater than 20
+if cols.to_i > 20 then cols = 20 else cols = cols.to_i end
+
 puts "Please enter the % chance you want for a bomb to occur"
+puts "This number needs to be between 0 and 1"
 bomb_chance = gets.chomp.to_f
 
-while !bomb_chance.is_a?(Float) do
+while !bomb_chance.is_a?(Float) || bomb_chance > 1.0 || bomb_chance < 0.0 do
   puts "Please enter the % chance you want for a bomb to occur"
+  puts "This number needs to be between 0 and 1"
   bomb_chance = gets.chomp.to_f
 end
 

data/lib/minesweeper_game.rb

@@ -33,25 +33,36 @@ class MinesweeperGame
   def play_the_game
     puts "Please put two numbers corresponding to the row and column that you'd like to play in the form"
     puts "<pf> <row>, <column>"
+    puts "Numbers greater than the number of rows or cols will be truncated to the max row/col"
     puts
     player_choice = gets.chomp
 
+    if /^(help|h)\z/.match(player_choice) then print_help_message end
+
     # Now match the player response with a regular expression
-    while /([pf]) (\d), (\d)$/.match(player_choice) == nil
+    while /^([pfPF]) (\d){1,2}, (\d){1,2}\z/.match(player_choice) == nil
       puts "Please put two numbers corresponding to the row and column that you'd like to play in the form"
       puts "<pf> <row>, <column>"
+      puts "Numbers greater than the number of rows or cols will be truncated to the max row/col"
       puts
       player_choice = gets.chomp
+      if /^(help|h)\z/.match(player_choice) then print_help_message end
     end
-    match = /([pf]) (\d), (\d)$/.match(player_choice)    
+    match = /^([pfPF]) (\d){1,2}, (\d){1,2}\z/.match(player_choice)
+    row = match[2].to_i
+    col = match[3].to_i
+
+    if row > @rows then row = @rows end
+    if col > @columns then col = @columns end
+
     # A 'p' character indicates that the player wants to "play" the tile.
     # An 'f' character indicates that the player would like to flag the
     # tile because they believe there to be a bomb there. Flagged tiles
     # may still be played after they have been flagged.
-    if match[1] == 'p'
-      play_tile(match[2].to_i - 1, match[3].to_i - 1)
-    elsif match[1] == 'f'
-      flag_tile(match[2].to_i - 1, match[3].to_i - 1)
+    if match[1] == 'p' || match[1] == 'P'
+      play_tile(row - 1, col - 1)
+    elsif match[1] == 'f' || match[1] == 'F'
+      flag_tile(row - 1, col - 1)
     end
     puts
     print_the_board
@@ -93,5 +104,30 @@ class MinesweeperGame
     @win
   end
   
+  private
+    def print_help_message
+      puts """ 
+      This is a command line port of the game of minesweeper. It's supposed to be like
+      the minesweeper game that comes standard with most operating systems, but the 
+      functionality is a little different because it's just command line based. In 
+      order to make a move you can just put in something like:
+
+      p 1, 2
+
+      where the coordinates are number starting at 1, 1 in the upper left corner to 
+      rows, cols for the number of rows and columns that you put in at the start of the
+      game. If you play something like:
+
+      f 1, 2
+
+      then that location will be flagged (|>) and marked as played. You can win the 
+      game while still having marked tiles. 
+
+      Good luck!
+      """
+      print_the_board
+    end
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-cl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - gr1zzly_be4r
@@ -10,7 +10,8 @@ bindir: bin
 cert_chain: []
 date: 2015-02-23 00:00:00.000000000 Z
 dependencies: []
-description: Minesweeper, ported to the command line
+description: Minesweeper, ported to the command line. Please report any issues to
+  the repo on github and star if you like it!
 email: 
 executables:
 - minesweeper
@@ -22,7 +23,7 @@ files:
 - "./lib/minesweeper.rb"
 - "./lib/minesweeper_game.rb"
 - bin/minesweeper
-homepage: 
+homepage: https://github.com/gr1zzly-be4r/ruby-minesweeper-cli
 licenses:
 - MIT
 metadata: {}