minesweeper-cl 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85de14a45adbabf9db52ef0e26a84edb2d1ef8f4
-  data.tar.gz: bbdc5313b92f2e82c0fa41110f12b86beb872a9a
+  metadata.gz: c4c480ca41fdede1f0ab25f66f88d2f6b4f023b6
+  data.tar.gz: 17dff4c4323f1f26723b0cb58a48bbb40276f644
 SHA512:
-  metadata.gz: 60a4364bfd95d6f17eef069117938e559eb5bf299857a37a65e591f6048e43a9271cfe860a1a6f2100ca2492f03cbed301651b613736f1e50eb2299ca2c33ccb
-  data.tar.gz: 4d5013d5935cef2cc1e5b250cdbaae474ae5ce6bc4c9a52441946174a287427f3eab5d64014f5a615dc0db37e49f006f52ba3f32a1dae8f9e48f19c7ab442ec0
+  metadata.gz: e81ce953573f91a17a9854e2552a5b9018b906b29c50a5b66b71b5ddf58d24f6dfcc5327fb9d5e08808ae4a33c9bff7d8d4da912753c2aea8005be41aac35ee8
+  data.tar.gz: 70b6a22055d4974f1192a877337716e0aaf464c86b4404c9c30adda72a9de425eb473293c28964c7c7e7f06c75852f07afd116cd794ab49907e2383fd5d9d330

data/bin/minesweeper

@@ -1,48 +1,27 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/")
 require 'game_tile'
 require 'minesweeper_game'
 require 'game_board'
+require 'minesweeper_parser'
 
 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
 
-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
+# Make the parser for parsing the data
+begin
+  options = MinesweeperParser.new.parse!(ARGV)
+rescue OptionParser::MissingArgument, OptionParser::InvalidArgument
+  help_msg = MinesweeperParser.parse!(["-h"])
+  puts help_msg
 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
-
-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
-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) || 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
-
-# Create the board
-board = GameBoard.new(rows, cols, bomb_chance)
+# Create the board. We can now use the arguments that have been handled by the arguments 
+# parser class. The arguments have been stored in a hash in an OpenStruct object.
+board = GameBoard.new(options.rows_cols_chance[:rows], options.rows_cols_chance[:cols], options.rows_cols_chance[:bomb_chance])
 
 
 # Use the MinesweeperGame class to play the game
-game = MinesweeperGame.new(board, rows, cols)
+game = MinesweeperGame.new(board, options.rows_cols_chance[:rows], options.rows_cols_chance[:cols])
 
 game.print_the_board
 while !game.game_over? && !game.win? do

data/lib/game_board.rb

@@ -1,5 +1,6 @@
 # GameBoard class will be used by the minesweeper game to keep track of tiles, 
 # bombs, and the conditions necessary to win the game.
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/")
 require 'game_tile'
 
 class GameBoard

data/lib/minesweeper.rb

@@ -1,48 +1,27 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/")
 require 'game_tile'
 require 'minesweeper_game'
 require 'game_board'
+require 'minesweeper_parser'
 
 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
 
-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
+# Make the parser for parsing the data
+begin
+  options = MinesweeperParser.new.parse!(ARGV)
+rescue OptionParser::MissingArgument, OptionParser::InvalidArgument
+  help_msg = MinesweeperParser.parse!(["-h"])
+  puts help_msg
 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
-
-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
-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) || 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
-
-# Create the board
-board = GameBoard.new(rows, cols, bomb_chance)
+# Create the board. We can now use the arguments that have been handled by the arguments 
+# parser class. The arguments have been stored in a hash in an OpenStruct object.
+board = GameBoard.new(options.rows_cols_chance[:rows], options.rows_cols_chance[:cols], options.rows_cols_chance[:bomb_chance])
 
 
 # Use the MinesweeperGame class to play the game
-game = MinesweeperGame.new(board, rows, cols)
+game = MinesweeperGame.new(board, options.rows_cols_chance[:rows], options.rows_cols_chance[:cols])
 
 game.print_the_board
 while !game.game_over? && !game.win? do

data/lib/minesweeper_parser.rb

@@ -0,0 +1,51 @@
+require 'optparse'
+require 'ostruct'
+require 'pp'
+
+# Include this line in order to show a help message if there are no args
+ARGV << "-h" if ARGV.empty?
+
+class MinesweeperParser
+  def initialize
+  end
+
+  def parse!(args)
+    options = OpenStruct.new
+    options.rows_cols_chance = {}
+    options.inplace = false
+    options.encoding = "utf8"
+    options.transfer_type = :auto
+    options.verbose = false
+
+    # Here is where we make the options parser
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage: minesweeper [options]"
+      
+      opts.on("-r ROWS", "--rows ROWS", Integer, "Specify the number of rows that you'd like your game to have. Truncated at 20.") do |rows|
+        if rows > 20 then rows = 20 elsif rows < 1 then rows = 1 end
+        options.rows_cols_chance[:rows] = rows
+      end
+
+      opts.on("-c COLUMNS", "--columns COLUMNS", Integer, "Specify the number of columns that you'd like your game to have. Truncated at 20.") do |cols|
+        if cols > 20 then cols = 20 elsif cols < 1 then cols = 1 end
+        options.rows_cols_chance[:cols] = cols
+      end
+
+      opts.on("-f BOMB_CHANCE", "--frequency BOMB_CHANCE", Float, "Specify frequency that bombs will appear on your board. Must be [0, 1].") do |chance|
+        if chance > 1.0 then chance = 1.0 elsif chance < 0.0 then chance = 0.0 end
+        options.rows_cols_chance[:bomb_chance] = chance
+      end
+      
+      opts.on_tail("-h", "--help", "Show this message") do 
+        puts opts
+        exit
+      end
+
+       
+    end
+
+    opt_parser.parse!(args)
+    options
+  end
+end
+

metadata

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