battle_boats 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dadd59a7577daa0ee72910ae66b905d4064eb074
-  data.tar.gz: 190263c08aec175df8720e7711d4bf9f842ee9c0
+  metadata.gz: 574f4f3e02b7c5cef9b75a07705a746a0c054b2a
+  data.tar.gz: 930c4d8fe11f4251f423217a29cfe138b74535a1
 SHA512:
-  metadata.gz: 45d24201004142d06df0644891af60f4e38706fdd45b4d991265a9bdc05632beb1302549e7e023c5e4bea87e844dbb8bd937cff0cd96d3c65e6d9a97bbe6d6d4
-  data.tar.gz: 7b04df2c019d2b82162faa68d4d51270226ebb9e823aad9bbaf94e98574cb7d8ffe2e8313dd4c0068c99978deb882dc6de055f126a2e9ec50ed3e7a6f839a646
+  metadata.gz: ff190ee5734297fa9e2de51622790f60faf30340efd252e300353797917b92839bf58f5b8ec88dacd5db19988590bd73dad66c2404a94e3cca2b94ef60fca47c
+  data.tar.gz: 38015890c606111c547c2e8d68add8eb856c72169184e72f9a7d361f721546a061988ead35707aa3fa96d72aad16c28e5443b337f07a59936cf032f302cb35e4

data/.rubocop.yml

@@ -210,9 +210,9 @@ Style/LineEndConcatenation:
   Enabled: false
 
 Metrics/LineLength:
-  Description: 'Limit lines to 80 characters.'
+  Description: 'Limit lines to 100 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
-  Max: 80
+  Max: 100
   Exclude:
     - "spec/**/*"
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.10
+### New Features
+- `battle_boats "dev"` will play in developer mode
+- Randomly placed ships will be visible 
+
 # 0.0.9
 ### New Features
 - Displays "won" message once all the ship are sunk

data/Gemfile.lock

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

data/bin/battle_boats

@@ -2,26 +2,17 @@
 
 require 'battle_boats/engine'
 require 'battle_boats/board'
-require 'battle_boats/fleet'
-require 'battle_boats/coordinate'
+require 'battle_boats/dev_console_ui'
 
 board = BattleBoats::Board.new
+board.place_ships_randomly
 
-BattleBoats::FLEET.each do |ship|
-  coin_toss = [1, 2].sample
-  random_coordinate = BattleBoats::Coordinate.new(row: rand(0..9), column: rand(0..9))
-  if coin_toss == 1
-    until board.place_ship_horizontally(coordinate: random_coordinate, ship: ship)
-      random_coordinate = BattleBoats::Coordinate.new(row: rand(0..9), column: rand(0..9))
-    end
-  else
-    until board.place_ship_vertically(coordinate: random_coordinate, ship: ship)
-      random_coordinate = BattleBoats::Coordinate.new(row: rand(0..9), column: rand(0..9))
-    end
-  end
+if ARGV[0] == "dev"
+  interface = BattleBoats::DevConsoleUI.new
+else
+  interface = BattleBoats::ConsoleUI.new
 end
 
-
-engine = BattleBoats::Engine.new(board: board)
+engine = BattleBoats::Engine.new(board: board, interface: interface)
 engine.start
 

data/lib/battle_boats/board.rb

@@ -3,39 +3,41 @@ require "battle_boats/fleet"
 
 module BattleBoats
   class Board
-    attr_reader :play_area, :status_report, :error_messages
+    attr_reader :fleet, :play_area, :status_report
 
-    def initialize
+    def initialize(fleet: BattleBoats::Fleet.new)
+      @fleet = fleet
       @status_report = ""
-      @error_messages = []
-      @play_area = []
-      10.times do
-        row = []
-        10.times do
-          row << BattleBoats::Cell.new
+      @play_area = create_play_area
+    end
+
+    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
+        else
+          until place_ship_vertically(coordinate: get_random_coordinate, ship: ship)
+          end
         end
-        @play_area << row
       end
     end
 
     def strike_position(coordinate:)
-      validate_position(coordinate: coordinate)
-      if @error_messages.empty?
-        cell = cell_at(coordinate: coordinate)
+      cell = cell_at(coordinate: coordinate)
+      if cell.hit?
+        @status_report = "That position has already been hit"
+        false
+      else
         cell.strike
         @status_report = cell.status_report
         true
-      else
-        false
       end
     end
 
     def game_over?
-      if BattleBoats::FLEET.all?(&:sunk?)
-        true
-      else
-        false
-      end
+      fleet.ships.all?(&:sunk?)
     end
 
     def cell_at(coordinate:)
@@ -62,23 +64,18 @@ module BattleBoats
 
     private
 
-    def validate_position(coordinate:)
-      @error_messages.clear
-      if !position_available?(coordinate: coordinate)
-        @error_messages << "That position has already been hit"
+    def create_play_area
+      Array.new(10) do
+        row = []
+        10.times do
+          row << BattleBoats::Cell.new
+        end
+        row
       end
     end
 
     def within_range?(coordinate:)
-      if coordinate.row.to_s =~ /^[0-9]$/ && coordinate.column.to_s =~ /^[0-9]$/
-        true
-      else
-        false
-      end
-    end
-
-    def position_available?(coordinate:)
-      !cell_at(coordinate: coordinate).hit?
+      coordinate.row.between?(0, 9) && coordinate.column.between?(0, 9)
     end
 
     def occupy_cells(cells:, ship:)
@@ -94,5 +91,9 @@ module BattleBoats
     def cells_are_occupiable(cells:)
       cells.none?(&:nil?) && cells.none?(&:occupied?)
     end
+
+    def get_random_coordinate
+      BattleBoats::Coordinate.random(row: 0..9, column: 0..9)
+    end
   end
 end

data/lib/battle_boats/cell.rb

@@ -24,9 +24,9 @@ module BattleBoats
 
     def to_s
       if hit?
-        occupant.symbol
+        occupant.to_ansi
       else
-        ".".blue
+        to_ansi
       end
     end
 
@@ -42,5 +42,11 @@ module BattleBoats
     def occupied?
       !occupant.empty?
     end
+
+    private
+
+    def to_ansi
+      "~".blue
+    end
   end
 end

data/lib/battle_boats/console_ui.rb

@@ -29,10 +29,6 @@ module BattleBoats
       output.puts status_report
     end
 
-    def display_errors(errors)
-      output.puts errors
-    end
-
     def win
       output.puts "You've won the game!"
     end

data/lib/battle_boats/coordinate.rb

@@ -1,5 +1,13 @@
 module BattleBoats
   class Coordinate
+    class << self
+      def random(row:, column:)
+        row = rand(row)
+        column = rand(column)
+        new(row: row, column: column)
+      end
+    end
+
     attr_reader :row, :column
 
     def initialize(row: nil, column: nil)

data/lib/battle_boats/dev_console_ui.rb

@@ -0,0 +1,35 @@
+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

data/lib/battle_boats/engine.rb

@@ -15,7 +15,7 @@ module BattleBoats
         interface.display_board(board)
         coordinate = interface.get_coordinate
         until board.strike_position(coordinate: coordinate)
-          interface.display_errors(board.error_messages)
+          interface.display_status_report(board.status_report)
           coordinate = interface.get_coordinate
         end
         interface.display_status_report(board.status_report)

data/lib/battle_boats/fleet.rb

@@ -1,11 +1,17 @@
 require_relative "ship"
 
 module BattleBoats
-  FLEET = [
-    BattleBoats::Ship.new(name: "Carrier", length: 5, symbol: "C"),
-    BattleBoats::Ship.new(name: "Battleship", length: 4, symbol: "B"),
-    BattleBoats::Ship.new(name: "Cruiser",    length: 3, symbol: "R"),
-    BattleBoats::Ship.new(name: "Submarine",  length: 3, symbol: "S"),
-    BattleBoats::Ship.new(name: "Destroyer",  length: 2, symbol: "D"),
-  ].freeze
+  class Fleet
+    attr_reader :ships
+
+    def initialize
+      @ships = [
+        BattleBoats::Ship.new(name: "Carrier", length: 5, symbol: "C"),
+        BattleBoats::Ship.new(name: "Battleship", length: 4, symbol: "B"),
+        BattleBoats::Ship.new(name: "Cruiser",    length: 3, symbol: "R"),
+        BattleBoats::Ship.new(name: "Submarine",  length: 3, symbol: "S"),
+        BattleBoats::Ship.new(name: "Destroyer",  length: 2, symbol: "D"),
+      ]
+    end
+  end
 end

data/lib/battle_boats/null_ship.rb

@@ -8,13 +8,17 @@ module BattleBoats
     def initialize
       @name = "nothing"
       @length = 1
-      @symbol = "X".yellow
+      @symbol = "X"
     end
 
     def empty?
       true
     end
 
+    def to_ansi
+      @symbol.yellow
+    end
+
     def hit; end
 
     def sunk?; end

data/lib/battle_boats/ship.rb

@@ -8,7 +8,7 @@ module BattleBoats
     def initialize(name:, length:, symbol: "O")
       @name = name
       @length = length
-      @symbol = symbol.red
+      @symbol = symbol
       @hits = 0
     end
 
@@ -16,8 +16,8 @@ module BattleBoats
       false
     end
 
-    def hit_count
-      @hits
+    def to_ansi
+      @symbol.red
     end
 
     def hit
@@ -25,7 +25,7 @@ module BattleBoats
     end
 
     def sunk?
-      hit_count == length
+      @hits == length
     end
   end
 end

data/lib/battle_boats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - 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