battle_boats 0.0.10 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 574f4f3e02b7c5cef9b75a07705a746a0c054b2a
-  data.tar.gz: 930c4d8fe11f4251f423217a29cfe138b74535a1
+  metadata.gz: c234594bcdb65723e19dd4386b5fc3fff1a12e11
+  data.tar.gz: 831459a8cbe3467c52984597f7242bb9048ea008
 SHA512:
-  metadata.gz: ff190ee5734297fa9e2de51622790f60faf30340efd252e300353797917b92839bf58f5b8ec88dacd5db19988590bd73dad66c2404a94e3cca2b94ef60fca47c
-  data.tar.gz: 38015890c606111c547c2e8d68add8eb856c72169184e72f9a7d361f721546a061988ead35707aa3fa96d72aad16c28e5443b337f07a59936cf032f302cb35e4
+  metadata.gz: 0a809442d9468226c1bbe15ce3463a2c4c59336a2105c2c00dc70851c952cfda7fe36acd897fcf859b76d6d65349b21a0dc08f5cfca917f06728a7b1fb114493
+  data.tar.gz: ef473db7cb3250ea218cc03c4f33cd25655816d8c47d4595d96dd3a36c9f0575e44ef241506ba91ac3a976cf6c5df6a4a24e5360f9c35fad046b166f5ea3b92d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.20
+### Breaking Change
+- `battle_boats "dev"` is not longer available
+
 # 0.0.10
 ### New Features
 - `battle_boats "dev"` will play in developer mode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    battle_boats (0.0.10)
+    battle_boats (0.0.20)
 
 GEM
   remote: https://rubygems.org/

data/bin/battle_boats

@@ -2,17 +2,10 @@
 
 require 'battle_boats/engine'
 require 'battle_boats/board'
-require 'battle_boats/dev_console_ui'
 
 board = BattleBoats::Board.new
 board.place_ships_randomly
 
-if ARGV[0] == "dev"
-  interface = BattleBoats::DevConsoleUI.new
-else
-  interface = BattleBoats::ConsoleUI.new
-end
-
-engine = BattleBoats::Engine.new(board: board, interface: interface)
+engine = BattleBoats::Engine.new(board: board)
 engine.start
 

data/lib/battle_boats.rb

@@ -1,8 +1,11 @@
-require "battle_boats/version"
-require "battle_boats/engine"
-require "battle_boats/console_ui"
 require "battle_boats/board"
-
-module BattleBoats
-  # Your code goes here...
-end
+require "battle_boats/board_formatter"
+require "battle_boats/cell"
+require "battle_boats/colorize"
+require "battle_boats/console_ui"
+require "battle_boats/coordinate"
+require "battle_boats/engine"
+require "battle_boats/fleet"
+require "battle_boats/null_ship"
+require "battle_boats/ship"
+require "battle_boats/version"

data/lib/battle_boats/board.rb

@@ -13,13 +13,33 @@ module BattleBoats
 
     def place_ships_randomly
       @fleet.ships.each do |ship|
-        coin_flip = ["heads", "tails"].sample
-        if coin_flip == "heads"
-          until place_ship_horizontally(coordinate: get_random_coordinate, ship: ship)
-          end
+        until ship_deployed?(ship: ship)
+          coordinate = get_random_coordinate
+          orientation = %i[horizontal vertical].sample
+          attempt_to_deploy_ship(ship: ship, coordinate: coordinate, orientation: orientation)
+        end
+      end
+    end
+
+    def ship_deployed?(ship:)
+      play_area.flatten.map(&:occupant).include?(ship)
+    end
+
+    def attempt_to_deploy_ship(ship:, coordinate:, orientation:)
+      cells = Array.new(ship.length) do |offset|
+        if orientation == :horizontal
+          next_coordinate = coordinate.right(offset: offset)
+        elsif orientation == :vertical
+          next_coordinate = coordinate.up(offset: offset)
         else
-          until place_ship_vertically(coordinate: get_random_coordinate, ship: ship)
-          end
+          return nil
+        end
+        cell_at(coordinate: next_coordinate)
+      end
+
+      if cells_occupiable?(cells: cells)
+        cells.each do |cell|
+          cell.occupant = ship
         end
       end
     end
@@ -46,22 +66,6 @@ module BattleBoats
       end
     end
 
-    def place_ship_horizontally(coordinate:, ship:)
-      cells_to_occupy = Array.new(ship.length) do |offset|
-        cell_at(coordinate: coordinate.right(offset: offset))
-      end
-
-      occupy_cells(cells: cells_to_occupy, ship: ship)
-    end
-
-    def place_ship_vertically(coordinate:, ship:)
-      cells_to_occupy = Array.new(ship.length) do |offset|
-        cell_at(coordinate: coordinate.up(offset: offset))
-      end
-
-      occupy_cells(cells: cells_to_occupy, ship: ship)
-    end
-
     private
 
     def create_play_area
@@ -74,22 +78,12 @@ module BattleBoats
       end
     end
 
-    def within_range?(coordinate:)
-      coordinate.row.between?(0, 9) && coordinate.column.between?(0, 9)
-    end
-
-    def occupy_cells(cells:, ship:)
-      if cells_are_occupiable(cells: cells)
-        cells.each do |cell|
-          cell.occupant = ship
-        end
-      else
-        false
-      end
+    def cells_occupiable?(cells:)
+      cells.none?(&:nil?) && cells.none?(&:occupied?)
     end
 
-    def cells_are_occupiable(cells:)
-      cells.none?(&:nil?) && cells.none?(&:occupied?)
+    def within_range?(coordinate:)
+      coordinate.row.between?(0, 9) && coordinate.column.between?(0, 9)
     end
 
     def get_random_coordinate

data/lib/battle_boats/board_formatter.rb

@@ -0,0 +1,77 @@
+require_relative "colorize"
+
+module BattleBoats
+  class BoardFormatter
+    using Colorize
+    def format_board(board, hide_ships: true)
+      board_string = horizontal_line
+      board_string << newline
+      board_string << column_header
+      board_string << horizontal_line
+      board_string << newline
+      board.play_area.each_with_index do |row, row_number|
+        board_string << pipe
+        board_string << "  #{row_labels[row_number]}  "
+        board_string << pipe
+        row.each do |cell|
+          board_string << if cell.occupied? && cell.hit?
+                            "  #{cell.occupant.symbol.red}  "
+                          elsif cell.occupied? && !hide_ships
+                            "  #{cell.occupant.symbol.yellow}  "
+                          elsif cell.hit?
+                            "  #{'X'.yellow}  "
+                          else
+                            "  #{'~'.blue}  "
+                          end
+          board_string << pipe
+        end
+        board_string << newline
+        board_string << horizontal_line
+        board_string << newline
+      end
+      board_string
+    end
+
+    def valid_coordinate_input?(input)
+      input =~ /^[A-J][0-9]$/i
+    end
+
+    def input_to_coordinate(input)
+      input_row = input[0]
+      input_column = input[1]
+      row = row_label_to_row_number(input_row)
+      column = column_label_to_column_number(input_column)
+      BattleBoats::Coordinate.new(row: row, column: column)
+    end
+
+    def row_label_to_row_number(row_label)
+      row_labels.index(row_label.upcase)
+    end
+
+    def column_label_to_column_number(column_label)
+      column_label.to_i
+    end
+
+    private
+
+    def column_header
+      "|     |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |\n"
+    end
+
+    def row_labels
+      ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]
+    end
+
+    def newline
+      "\n"
+    end
+
+    def horizontal_line
+      "-" * 67
+    end
+
+    def pipe
+      "|"
+    end
+  end
+end

data/lib/battle_boats/cell.rb

@@ -1,8 +1,6 @@
 require_relative "null_ship"
-require_relative "colorize"
 
 module BattleBoats
-  using Colorize
   class Cell
     attr_accessor :occupant
 
@@ -22,14 +20,6 @@ module BattleBoats
       end
     end
 
-    def to_s
-      if hit?
-        occupant.to_ansi
-      else
-        to_ansi
-      end
-    end
-
     def status_report
       occupant_name = occupant.name
       if occupant.sunk?
@@ -42,11 +32,5 @@ module BattleBoats
     def occupied?
       !occupant.empty?
     end
-
-    private
-
-    def to_ansi
-      "~".blue
-    end
   end
 end

data/lib/battle_boats/console_ui.rb

@@ -1,10 +1,14 @@
 require_relative "coordinate"
+require_relative "board_formatter"
 
 module BattleBoats
   class ConsoleUI
-    def initialize(output: $stdout, input: $stdin)
+    def initialize(output: $stdout,
+                   input: $stdin,
+                   board_formatter: BattleBoats::BoardFormatter.new)
       @output = output
       @input = input
+      @board_formatter = board_formatter
     end
 
     def greet
@@ -12,17 +16,36 @@ module BattleBoats
     end
 
     def display_board(board)
-      output.puts format_board(board)
+      output.puts board_formatter.format_board(board, hide_ships: true)
+    end
+
+    def display_ally_board(board)
+      output.puts board_formatter.format_board(board, hide_ships: false)
+    end
+
+    def display_ship_data(ship:)
+      output.puts "SHIP: #{ship.name} ALIAS: #{ship.symbol}"
+      output.puts "LENGTH: #{ship.length}"
     end
 
     def get_coordinate
       output.puts "Target coordinate: "
       user_input = input.gets.chomp
-      until valid_input?(user_input)
+      until board_formatter.valid_coordinate_input?(user_input)
         output.puts "Coordinate invalid."
         user_input = input.gets.chomp
       end
-      input_to_coordinate(user_input)
+      board_formatter.input_to_coordinate(user_input)
+    end
+
+    def get_orientation
+      output.puts "Orientation [hV]:"
+      user_input = input.gets.chomp
+      until valid_orientation_input?(user_input)
+        output.puts "Orientation invalid."
+        user_input = input.gets.chomp
+      end
+      input_to_orientation(user_input)
     end
 
     def display_status_report(status_report)
@@ -35,59 +58,18 @@ module BattleBoats
 
     private
 
-    attr_reader :output, :input
-
-    def valid_input?(coordinate)
-      coordinate =~ /^[A-J][0-9]$/i
-    end
+    attr_reader :output, :input, :board_formatter
 
-    def input_to_coordinate(input)
-      input_row = input[0]
-      input_column = input[1]
-      row = row_labels.index(input_row.upcase)
-      column = input_column.to_i
-      BattleBoats::Coordinate.new(row: row, column: column)
+    def valid_orientation_input?(orientation)
+      orientation =~ /^[h{1}|v{1}]$/i
     end
 
-    def format_board(board)
-      board_string = horizontal_line
-      board_string << newline
-      board_string << column_label
-      board_string << horizontal_line
-      board_string << newline
-      board.play_area.each_with_index do |row, row_number|
-        board_string << pipe
-        board_string << "  #{row_labels[row_number]}  "
-        board_string << pipe
-        row.each do |cell|
-          board_string << "  #{cell}  "
-          board_string << pipe
-        end
-        board_string << newline
-        board_string << horizontal_line
-        board_string << newline
+    def input_to_orientation(input)
+      if input =~ /^[h{1}]$/i
+        :horizontal
+      elsif input =~ /^[v{1}]$/i
+        :vertical
       end
-      board_string
-    end
-
-    def column_label
-      "|     |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |\n"
-    end
-
-    def row_labels
-      ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]
-    end
-
-    def newline
-      "\n"
-    end
-
-    def horizontal_line
-      "-" * 67
-    end
-
-    def pipe
-      "|"
     end
   end
 end

data/lib/battle_boats/null_ship.rb

@@ -1,7 +1,4 @@
-require_relative "colorize"
-
 module BattleBoats
-  using Colorize
   class NullShip
     attr_reader :name, :length, :symbol
 
@@ -15,10 +12,6 @@ module BattleBoats
       true
     end
 
-    def to_ansi
-      @symbol.yellow
-    end
-
     def hit; end
 
     def sunk?; end

data/lib/battle_boats/ship.rb

@@ -1,7 +1,4 @@
-require_relative "colorize"
-
 module BattleBoats
-  using Colorize
   class Ship
     attr_reader :name, :length, :symbol
 
@@ -16,10 +13,6 @@ module BattleBoats
       false
     end
 
-    def to_ansi
-      @symbol.red
-    end
-
     def hit
       @hits += 1
     end

data/lib/battle_boats/version.rb

@@ -1,3 +1,3 @@
 module BattleBoats
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.20".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.20
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,11 +107,11 @@ files:
 - bin/setup
 - lib/battle_boats.rb
 - lib/battle_boats/board.rb
+- lib/battle_boats/board_formatter.rb
 - lib/battle_boats/cell.rb
 - lib/battle_boats/colorize.rb
 - lib/battle_boats/console_ui.rb
 - lib/battle_boats/coordinate.rb
-- lib/battle_boats/dev_console_ui.rb
 - lib/battle_boats/engine.rb
 - lib/battle_boats/fleet.rb
 - lib/battle_boats/null_ship.rb

data/lib/battle_boats/dev_console_ui.rb

@@ -1,35 +0,0 @@
-require_relative "console_ui"
-require_relative "coordinate"
-require_relative "colorize"
-
-module BattleBoats
-  class DevConsoleUI < ConsoleUI
-    using Colorize
-    def format_board(board)
-      board_string = horizontal_line
-      board_string << newline
-      board_string << column_label
-      board_string << horizontal_line
-      board_string << newline
-      board.play_area.each_with_index do |row, row_number|
-        board_string << pipe
-        board_string << "  #{row_labels[row_number]}  "
-        board_string << pipe
-        row.each do |cell|
-          board_string << if cell.hit?
-                            "  #{cell.occupant.symbol.red}  "
-                          elsif cell.occupied?
-                            "  #{cell.occupant.symbol.yellow}  "
-                          else
-                            "  #{cell.occupant.symbol.blue}  "
-                          end
-          board_string << pipe
-        end
-        board_string << newline
-        board_string << horizontal_line
-        board_string << newline
-      end
-      board_string
-    end
-  end
-end