battle_boats 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d417f15deb5ea35be4829d14c0af66e5fd347e8
-  data.tar.gz: 75522bcf8e4e69dad64495f76962cc1b0178dccd
+  metadata.gz: 0fc91ef81269dd27748b5d9d56ce2ca769e97eac
+  data.tar.gz: 191033ffb7cda58c5f6e9ae5a630434f1f3ae511
 SHA512:
-  metadata.gz: a217b9891b88d5ea077dce6ef3787852bbcb6d68add6410709ddde5f8ac6d9ba44eadfbec3425616e9e0a1ee5809e1a41f4c306fe34c1414b3208c4a978ec10b
-  data.tar.gz: 53109099edc9b6228995faba7a6a7e85a6fcc7d47a704164babb9616fb319c77c4ec078c880f114792e90101f16a3b151a7c0c98d61216c7ed7e760ba6422713
+  metadata.gz: 496aacce57286fbc9a644c889eb58a7ca49d67d3880194a10ec88014b81dd9126ecf09ee1c22e69b3d046b647b6050de9504f2ae59dc9e1698977413b7b6bd13
+  data.tar.gz: a2eab93f0dd9c5b4e4212767d71e7b568fd97ced611c16446bbc655817c7fdb7cdd2731b35a019457eea73f21bf09651de8becfae3efc2dbc3bfa6177b68a327

data/.codeclimate.yml

@@ -1,7 +1,7 @@
 version: "2"
 plugins:
   rubocop:
-    enable: true
+    enabled: true
 exclude_patterns:
   - 'spec/*'
   - 'Gemfile'

data/.rubocop.yml

@@ -1,6 +1,5 @@
 AllCops:
   Exclude:
-    - 'spec/**/**'
     - 'Gemfile'
     - 'Rakefile'
     - '*.gemspec'
@@ -214,6 +213,8 @@ Metrics/LineLength:
   Description: 'Limit lines to 80 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
   Max: 80
+  Exclude:
+    - "spec/**/*"
 
 Metrics/MethodLength:
   Description: 'Avoid methods longer than 10 lines of code.'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.5
+### New Features
+- Starting the game will display a board of randomly placed enemy ships
+- Hitting a ship will display a "You hit my `<<ship>>`" message
+- Hitting a ship will display the initial of the ship you've hit on the board
+
 # 0.0.4
 ### New Features
 - Error messages for bad input

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,4 @@
-# Battle Boats  [![Build Status](https://travis-ci.org/Thomascountz/battle_boats.svg?branch=master)](https://travis-ci.org/Thomascountz/battle_boats) [![Maintainability](https://api.codeclimate.com/v1/badges/f9fb2b053e6bad40b13e/maintainability)](https://codeclimate.com/github/Thomascountz/battle_boats/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/f9fb2b053e6bad40b13e/test_coverage)](https://codeclimate.com/github/Thomascountz/battle_boats/test_coverage)
+# Battle Boats  [![Gem Version](https://badge.fury.io/rb/battle_boats.svg)](https://badge.fury.io/rb/battle_boats) [![Build Status](https://travis-ci.org/Thomascountz/battle_boats.svg?branch=master)](https://travis-ci.org/Thomascountz/battle_boats) [![Maintainability](https://api.codeclimate.com/v1/badges/f9fb2b053e6bad40b13e/maintainability)](https://codeclimate.com/github/Thomascountz/battle_boats/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/f9fb2b053e6bad40b13e/test_coverage)](https://codeclimate.com/github/Thomascountz/battle_boats/test_coverage)
 
 
 Battle Boats is a ruby library implementation of [Battleship](https://en.wikipedia.org/wiki/Battleship_%28game%29)!

data/bin/battle_boats

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
 
 require 'battle_boats/engine'
-BattleBoats::Engine.new.start
+require 'battle_boats/board'
+require 'battle_boats/fleet'
+require 'battle_boats/coordinate'
+
+board = BattleBoats::Board.new
+
+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
+end
+
+
+engine = BattleBoats::Engine.new(board: board)
+engine.start
+

data/lib/battle_boats/board.rb

@@ -1,3 +1,5 @@
+require "battle_boats/cell"
+
 module BattleBoats
   class Board
     attr_reader :play_area, :status_report, :error_messages
@@ -9,17 +11,18 @@ module BattleBoats
       10.times do
         row = []
         10.times do
-          row << nil
+          row << BattleBoats::Cell.new
         end
         @play_area << row
       end
     end
 
-    def strike_position(row:, column:)
-      validate_position(row: row, column: column)
+    def strike_position(coordinate:)
+      validate_position(coordinate: coordinate)
       if @error_messages.empty?
-        @play_area[row.to_i][column.to_i] = "X"
-        @status_report = "Miss!"
+        cell = cell_at(coordinate: coordinate)
+        cell.strike
+        @status_report = cell.status_report
         true
       else
         false
@@ -30,24 +33,46 @@ module BattleBoats
       false
     end
 
+    def cell_at(coordinate:)
+      if within_range?(coordinate.row) && within_range?(coordinate.column)
+        @play_area[coordinate.row.to_i][coordinate.column.to_i]
+      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 validate_position(row:, column:)
+    def validate_position(coordinate:)
       @error_messages.clear
-      if !between_zero_and_nine?(row)
+      if !within_range?(coordinate.row)
         @error_messages << "The selected row is invalid"
       end
-      if !between_zero_and_nine?(column)
+      if !within_range?(coordinate.column)
         @error_messages << "The selected column is invalid"
       end
       if @error_messages.empty?
-        if !position_available?(row: row, column: column)
+        if !position_available?(coordinate: coordinate)
           @error_messages << "That position has already been hit"
         end
       end
     end
 
-    def between_zero_and_nine?(input)
+    def within_range?(input)
       if input.to_s =~ /^[0-9]$/
         true
       else
@@ -55,8 +80,22 @@ module BattleBoats
       end
     end
 
-    def position_available?(row:, column:)
-      @play_area[row.to_i][column.to_i] != "X"
+    def position_available?(coordinate:)
+      !cell_at(coordinate: coordinate).hit?
+    end
+
+    def occupy_cells(cells:, ship:)
+      if cells_are_occupiable(cells)
+        cells.each do |cell|
+          cell.occupant = ship
+        end
+      else
+        false
+      end
+    end
+
+    def cells_are_occupiable(cells)
+      cells.none?(&:nil?) && cells.none?(&:occupied?)
     end
   end
 end

data/lib/battle_boats/cell.rb

@@ -0,0 +1,42 @@
+require_relative "null_ship"
+
+module BattleBoats
+  class Cell
+    attr_accessor :occupant
+
+    def initialize
+      @hit = false
+      @occupant = BattleBoats::NullShip.new
+    end
+
+    def hit?
+      @hit
+    end
+
+    def strike
+      if !hit?
+        @hit = true
+      end
+    end
+
+    def to_s
+      if hit?
+        occupant.symbol
+      else
+        "."
+      end
+    end
+
+    def status_report
+      if hit?
+        "You hit my #{occupant.name}!"
+      else
+        "All Clear!"
+      end
+    end
+
+    def occupied?
+      !occupant.empty?
+    end
+  end
+end

data/lib/battle_boats/console_ui.rb

@@ -1,3 +1,5 @@
+require_relative "coordinate"
+
 module BattleBoats
   class ConsoleUI
     def initialize(output: $stdout, input: $stdin)
@@ -13,14 +15,10 @@ module BattleBoats
       output.puts format_board(board)
     end
 
-    def get_row
-      output.puts "Target row:"
-      input.gets.chomp
-    end
-
-    def get_column
-      output.puts "Target column:"
-      input.gets.chomp
+    def get_coordinate
+      row = get_row
+      column = get_column
+      BattleBoats::Coordinate.new(row: row, column: column)
     end
 
     def display_status_report(status_report)
@@ -46,11 +44,7 @@ module BattleBoats
         board_string << "  #{row_number}  "
         board_string << pipe
         row.each do |cell|
-          board_string << if cell
-                            "  #{cell}  "
-                          else
-                            "  .  "
-                          end
+          board_string << "  #{cell}  "
           board_string << pipe
         end
         board_string << newline
@@ -75,5 +69,15 @@ module BattleBoats
     def pipe
       "|"
     end
+
+    def get_row
+      output.puts "Target row:"
+      input.gets.chomp
+    end
+
+    def get_column
+      output.puts "Target column:"
+      input.gets.chomp
+    end
   end
 end

data/lib/battle_boats/coordinate.rb

@@ -0,0 +1,18 @@
+module BattleBoats
+  class Coordinate
+    attr_reader :row, :column
+
+    def initialize(row: nil, column: nil)
+      @row = row
+      @column = column
+    end
+
+    def up(offset: 1)
+      self.class.new(row: row - offset, column: column)
+    end
+
+    def right(offset: 1)
+      self.class.new(row: row, column: column + offset)
+    end
+  end
+end

data/lib/battle_boats/engine.rb

@@ -13,12 +13,10 @@ module BattleBoats
       interface.greet
       until board.game_over?
         interface.display_board(board)
-        row = interface.get_row
-        column = interface.get_column
-        until board.strike_position(row: row, column: column)
+        coordinate = interface.get_coordinate
+        until board.strike_position(coordinate: coordinate)
           interface.display_errors(board.error_messages)
-          row = interface.get_row
-          column = interface.get_column
+          coordinate = interface.get_coordinate
         end
         interface.display_status_report(board.status_report)
       end

data/lib/battle_boats/fleet.rb

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

data/lib/battle_boats/null_ship.rb

@@ -0,0 +1,15 @@
+module BattleBoats
+  class NullShip
+    attr_reader :name, :length, :symbol
+
+    def initialize
+      @name = "nothing"
+      @length = 1
+      @symbol = "X"
+    end
+
+    def empty?
+      true
+    end
+  end
+end

data/lib/battle_boats/ship.rb

@@ -0,0 +1,15 @@
+module BattleBoats
+  class Ship
+    attr_reader :name, :length, :symbol
+
+    def initialize(name:, length:, symbol: "O")
+      @name = name
+      @length = length
+      @symbol = symbol
+    end
+
+    def empty?
+      false
+    end
+  end
+end

data/lib/battle_boats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,8 +107,13 @@ files:
 - bin/setup
 - lib/battle_boats.rb
 - lib/battle_boats/board.rb
+- lib/battle_boats/cell.rb
 - lib/battle_boats/console_ui.rb
+- lib/battle_boats/coordinate.rb
 - lib/battle_boats/engine.rb
+- lib/battle_boats/fleet.rb
+- lib/battle_boats/null_ship.rb
+- lib/battle_boats/ship.rb
 - lib/battle_boats/version.rb
 homepage: https://www.github.com/thomascountz/battle_boats
 licenses: