battle_boats 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a74f9d785a67a640d0cab5e9c4a81db0ae9ef77
-  data.tar.gz: d70c00997e2a04baa7f9634ebea6a7b057363019
+  metadata.gz: 3d417f15deb5ea35be4829d14c0af66e5fd347e8
+  data.tar.gz: 75522bcf8e4e69dad64495f76962cc1b0178dccd
 SHA512:
-  metadata.gz: 5d8f2a57c1dc3e062ce9651870ca2de7b9553ba9e20fe0d2007c28abf0315c1515ac0ec13ad2a1b85f1a0c1b181f3b453609433c4359c054b28d9fa943131dd5
-  data.tar.gz: 31bc1db1950c708442630d2415cbbda32e4bcd49667d7eb4380c8ef89e2486f21f360477f82eb8c26945002d8cb3ab5fa1824172c30579cbb337a564fbb8c98a
+  metadata.gz: a217b9891b88d5ea077dce6ef3787852bbcb6d68add6410709ddde5f8ac6d9ba44eadfbec3425616e9e0a1ee5809e1a41f4c306fe34c1414b3208c4a978ec10b
+  data.tar.gz: 53109099edc9b6228995faba7a6a7e85a6fcc7d47a704164babb9616fb319c77c4ec078c880f114792e90101f16a3b151a7c0c98d61216c7ed7e760ba6422713

data/CHANGELOG.md

@@ -1,15 +1,21 @@
+# 0.0.4
+### New Features
+- Error messages for bad input
+- Prompt will ask again for input if input is invalid
+- Game loops for more than one strike
+
 # 0.0.3
-## New Features
-- Can fire and miss a target on the board
+### New Features
+- Can fire at an empty board and "miss" a target
 
 # 0.0.2
-## Bug Fixes
+### Bug Fixes
 - YANKED due to vulnerability with rubocop development dependency
 
 # 0.0.1
-## New Features
+### New Features
 - Welcome message
 
 # 0.0.0
-## New Features
+### New Features
 - claim name

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    battle_boats (0.0.2)
+    battle_boats (0.0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -52,7 +52,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   rake (~> 10.0)
   rspec (~> 3.0)
-  rubocop (~> 0.42)
+  rubocop (~> 0.55)
   simplecov (~> 0.16)
 
 BUNDLED WITH

data/lib/battle_boats/board.rb

@@ -1,9 +1,10 @@
 module BattleBoats
   class Board
-    attr_reader :play_area, :status_report
+    attr_reader :play_area, :status_report, :error_messages
 
     def initialize
       @status_report = ""
+      @error_messages = []
       @play_area = []
       10.times do
         row = []
@@ -15,8 +16,47 @@ module BattleBoats
     end
 
     def strike_position(row:, column:)
-      @play_area[row.to_i][column.to_i] = "X"
-      @status_report = "Miss!"
+      validate_position(row: row, column: column)
+      if @error_messages.empty?
+        @play_area[row.to_i][column.to_i] = "X"
+        @status_report = "Miss!"
+        true
+      else
+        false
+      end
+    end
+
+    def game_over?
+      false
+    end
+
+    private
+
+    def validate_position(row:, column:)
+      @error_messages.clear
+      if !between_zero_and_nine?(row)
+        @error_messages << "The selected row is invalid"
+      end
+      if !between_zero_and_nine?(column)
+        @error_messages << "The selected column is invalid"
+      end
+      if @error_messages.empty?
+        if !position_available?(row: row, column: column)
+          @error_messages << "That position has already been hit"
+        end
+      end
+    end
+
+    def between_zero_and_nine?(input)
+      if input.to_s =~ /^[0-9]$/
+        true
+      else
+        false
+      end
+    end
+
+    def position_available?(row:, column:)
+      @play_area[row.to_i][column.to_i] != "X"
     end
   end
 end

data/lib/battle_boats/console_ui.rb

@@ -27,6 +27,10 @@ module BattleBoats
       output.puts status_report
     end
 
+    def display_errors(errors)
+      output.puts errors
+    end
+
     private
 
     attr_reader :output, :input

data/lib/battle_boats/engine.rb

@@ -11,13 +11,17 @@ module BattleBoats
 
     def start
       interface.greet
-      interface.display_board(board)
-      row = interface.get_row
-      column = interface.get_column
-      board.strike_position(row: row, column: column)
-      status_report = board.status_report
-      interface.display_status_report(status_report)
-      interface.display_board(board)
+      until board.game_over?
+        interface.display_board(board)
+        row = interface.get_row
+        column = interface.get_column
+        until board.strike_position(row: row, column: column)
+          interface.display_errors(board.error_messages)
+          row = interface.get_row
+          column = interface.get_column
+        end
+        interface.display_status_report(board.status_report)
+      end
     end
 
     private

data/lib/battle_boats/version.rb

@@ -1,3 +1,3 @@
 module BattleBoats
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler