ari_chess 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e585e588e19ed3831464788d43fa361379491a05
-  data.tar.gz: d338793003e5d77b78c10334ac8cda065f2dd50c
+  metadata.gz: 0e68a6f8b5a6e22e6c5db0dbf2078bea34e702fa
+  data.tar.gz: a316bdf89347ba6ee4403660c46a260ca68ca0d2
 SHA512:
-  metadata.gz: 2d98651dd5cfa93d7fafa750e6bc6a52ceb8287c2ac522afc12c0d9e605017b74c4757e12845e5b0d20cfe8548f599522a8f40ecf717effbc2cfb005346c3c0f
-  data.tar.gz: fe9fb67bffaaafe01f7b2d069c39aeec1a14646017a6dcfa5d5fb5e2a1dd2ebe1c90f87be2244dbfdb1482215a507f18cfb559ac42e6f6f08a6c10a5d770f7c3
+  metadata.gz: ecf272f68effb6ad157d595d99a420e62b593cb9ef3e0e1cd456a0e4f9cd21281280adef0519c8bd3467dc883f0d3bf039432663663a686be17cbaaf18ddd949
+  data.tar.gz: b7e2358fa830ed775d6f373b8f010c6849cfe51bb5e88564427b3c0584560cf0e98ab22f1a183c7abb1fea1b8566b982db4295543aec32b0e36b40b2f652859c

data/lib/ari_chess/error.rb

@@ -1,7 +1,5 @@
 class InvalidMoveError < StandardError
-  attr_reader :message
-
-  def initialize(message = nil)
-    @message ||= "Invalid move!"
+  def initialize(message = "Invalid move!")
+    super(message)
   end
 end

data/lib/ari_chess/game.rb

@@ -32,8 +32,9 @@ class Game
   def play_turn
     board.move(*get_move)
   rescue InvalidMoveError => e
-      puts e.message
-      retry
+    print "\n"
+    puts e.message
+    retry
   end
 
   def get_move
@@ -41,7 +42,6 @@ class Game
     parse_positions(input)
   end
 
-
   def parse_positions(input)
     matched_input = /\s*(\w\d),*\s*(\w\d)\s*/.match(input)
     raise InvalidMoveError if matched_input.nil?
@@ -62,7 +62,7 @@ class Game
       error_message = "Invalid move! Chosen piece is not yours."
     end
 
-    raise InvalidMoveError.new(error_message) unless error_message.nil?
+    raise InvalidMoveError.new, error_message unless error_message.nil?
 
     nil
   end
@@ -76,10 +76,11 @@ class Game
 
   def parse(move)
     raise InvalidMoveError if move.length != 2
+
     col, row = move.split("")
     row = to_i(row)
     unless move_in_range?(row, col)
-      raise InvalidMoveError
+      raise InvalidMoveError.new, "Invalid move! Not a valid board position."
     end
 
     [(-1 * row) + 8, col.ord - 97]

data/lib/ari_chess/named_pieces.rb

@@ -1,164 +1,6 @@
-require_relative 'piece'
-
-class Pawn < Piece
-  CAPTURE_DELTAS = [
-    [1, -1], #capture
-    [1,  1], #capture
-  ]
-
-  STEP_DELTA = [
-    [1,  0] #anytime
-  ]
-
-  DOUBLE_STEP_DELTA = [
-    [2,  0], #first move
-  ]
-
-  attr_accessor :first_move
-
-  def initialize(pos, board, color)
-    super
-    @first_move = true
-  end
-
-  def first_move?
-    @first_move
-  end
-
-  def dup(new_board)
-    copy = super
-    copy.first_move = first_move
-
-    copy
-  end
-
-  def moves
-    possible_moves = []
-
-    possible_moves.concat(capturable_positions)
-
-    step_pos = new_pos(deltas(STEP_DELTA).first)
-
-    if board[step_pos].nil?
-      possible_moves << step_pos
-    else
-      return possible_moves
-    end
-
-    if first_move?
-      possible_moves << double_step_pos unless double_step_pos.empty?
-    end
-
-    possible_moves
-  end
-
-  def double_step_pos
-    position = new_pos(deltas(DOUBLE_STEP_DELTA).first)
-    return position if board[position].nil?
-
-    []
-  end
-
-  def capturable_positions
-    deltas(CAPTURE_DELTAS).map { |delta| new_pos(delta) }.select do |position|
-      !board[position].nil? && board[position].color != color
-    end
-  end
-
-  def new_pos(delta)
-    x, y = pos
-    dx, dy = delta
-
-    [x + dx, y + dy]
-  end
-
-  def deltas(specific_deltas)
-    color == :B ? specific_deltas : specific_deltas.map { |dx, dy| [dx * -1, dy] }
-  end
-
-  def update_piece(pos)
-    super
-    self.first_move = false
-  end
-
-  def to_s
-    color == :W ? "\u2659" : "\u265F"
-  end
-end
-
-class Knight < SteppingPiece
-  DELTAS = [
-    [-2, -1],
-    [-2,  1],
-    [-1, -2],
-    [-1,  2],
-    [ 1, -2],
-    [ 1,  2],
-    [ 2, -1],
-    [ 2,  1]
-  ]
-
-  def to_s
-    color == :W ? "\u2658" : "\u265E"
-  end
-end
-
-class King < SteppingPiece
-  DELTAS = [
-    [ 1,  1],
-    [ 1,  0],
-    [ 1, -1],
-    [ 0, -1],
-    [-1, -1],
-    [-1,  0],
-    [-1,  1],
-    [ 0,  1],
-  ]
-
-  def to_s
-    color == :W ? "\u2654" : "\u265A"
-  end
-end
-
-class Bishop < SlidingPiece
-  DELTAS = [
-    [ 1,  1],
-    [ 1, -1],
-    [-1, -1],
-    [-1,  1],
-  ]
-
-  def to_s
-    color == :W ? "\u2657" : "\u265D"
-  end
-end
-
-class Rook < SlidingPiece
-  DELTAS = [
-    [ 1,  0],
-    [ 0, -1],
-    [-1,  0],
-    [ 0,  1],
-  ]
-
-  def to_s
-    color == :W ? "\u2656" : "\u265C"
-  end
-end
-
-class Queen < SlidingPiece
-  DELTAS = [
-    [ 1,  1],
-    [ 1,  0],
-    [ 1, -1],
-    [ 0, -1],
-    [-1, -1],
-    [-1,  0],
-    [-1,  1],
-    [ 0,  1],
-  ]
-
-  def to_s
-    color == :W ? "\u2655" : "\u265B"
-  end
-end
+require_relative 'pieces/pawn'
+require_relative 'pieces/bishop'
+require_relative 'pieces/king'
+require_relative 'pieces/knight'
+require_relative 'pieces/queen'
+require_relative 'pieces/rook'

data/lib/ari_chess/pieces/bishop.rb

@@ -0,0 +1,15 @@
+require_relative 'super/piece'
+require_relative 'super/sliding_piece'
+
+class Bishop < SlidingPiece
+  DELTAS = [
+    [ 1,  1],
+    [ 1, -1],
+    [-1, -1],
+    [-1,  1],
+  ]
+
+  def to_s
+    color == :W ? "\u2657" : "\u265D"
+  end
+end

data/lib/ari_chess/pieces/king.rb

@@ -0,0 +1,19 @@
+require_relative 'super/piece'
+require_relative 'super/stepping_piece'
+
+class King < SteppingPiece
+  DELTAS = [
+    [ 1,  1],
+    [ 1,  0],
+    [ 1, -1],
+    [ 0, -1],
+    [-1, -1],
+    [-1,  0],
+    [-1,  1],
+    [ 0,  1],
+  ]
+
+  def to_s
+    color == :W ? "\u2654" : "\u265A"
+  end
+end

data/lib/ari_chess/pieces/knight.rb

@@ -0,0 +1,19 @@
+require_relative 'super/piece'
+require_relative 'super/stepping_piece'
+
+class Knight < SteppingPiece
+  DELTAS = [
+    [-2, -1],
+    [-2,  1],
+    [-1, -2],
+    [-1,  2],
+    [ 1, -2],
+    [ 1,  2],
+    [ 2, -1],
+    [ 2,  1]
+  ]
+
+  def to_s
+    color == :W ? "\u2658" : "\u265E"
+  end
+end

data/lib/ari_chess/pieces/pawn.rb

@@ -0,0 +1,87 @@
+require_relative 'super/piece'
+
+class Pawn < Piece
+  CAPTURE_DELTAS = [
+    [1, -1], #capture
+    [1,  1], #capture
+  ]
+
+  STEP_DELTA = [
+    [1,  0] #anytime
+  ]
+
+  DOUBLE_STEP_DELTA = [
+    [2,  0], #first move
+  ]
+
+  attr_accessor :first_move
+
+  def initialize(pos, board, color)
+    super
+    @first_move = true
+  end
+
+  def first_move?
+    @first_move
+  end
+
+  def dup(new_board)
+    copy = super
+    copy.first_move = first_move
+
+    copy
+  end
+
+  def moves
+    possible_moves = []
+
+    possible_moves.concat(capturable_positions)
+
+    step_pos = new_pos(deltas(STEP_DELTA).first)
+
+    if board[step_pos].nil?
+      possible_moves << step_pos
+    else
+      return possible_moves
+    end
+
+    if first_move?
+      possible_moves << double_step_pos unless double_step_pos.empty?
+    end
+
+    possible_moves
+  end
+
+  def double_step_pos
+    position = new_pos(deltas(DOUBLE_STEP_DELTA).first)
+    return position if board[position].nil?
+
+    []
+  end
+
+  def capturable_positions
+    deltas(CAPTURE_DELTAS).map { |delta| new_pos(delta) }.select do |position|
+      !board[position].nil? && board[position].color != color
+    end
+  end
+
+  def new_pos(delta)
+    x, y = pos
+    dx, dy = delta
+
+    [x + dx, y + dy]
+  end
+
+  def deltas(specific_deltas)
+    color == :B ? specific_deltas : specific_deltas.map { |dx, dy| [dx * -1, dy] }
+  end
+
+  def update_piece(pos)
+    super
+    self.first_move = false
+  end
+
+  def to_s
+    color == :W ? "\u2659" : "\u265F"
+  end
+end

data/lib/ari_chess/pieces/queen.rb

@@ -0,0 +1,19 @@
+require_relative 'super/piece'
+require_relative 'super/sliding_piece'
+
+class Queen < SlidingPiece
+  DELTAS = [
+    [ 1,  1],
+    [ 1,  0],
+    [ 1, -1],
+    [ 0, -1],
+    [-1, -1],
+    [-1,  0],
+    [-1,  1],
+    [ 0,  1],
+  ]
+
+  def to_s
+    color == :W ? "\u2655" : "\u265B"
+  end
+end

data/lib/ari_chess/pieces/rook.rb

@@ -0,0 +1,15 @@
+require_relative 'super/piece'
+require_relative 'super/sliding_piece'
+
+class Rook < SlidingPiece
+  DELTAS = [
+    [ 1,  0],
+    [ 0, -1],
+    [-1,  0],
+    [ 0,  1],
+  ]
+
+  def to_s
+    color == :W ? "\u2656" : "\u265C"
+  end
+end

data/lib/ari_chess/{piece.rb → pieces/super/piece.rb}

@@ -51,28 +51,3 @@ class Piece
     self.class.new(pos, new_board, color)
   end
 end
-
-class SlidingPiece < Piece
-  def potential_moves(delta)
-    moves = []
-    captured_piece = false
-    current_pos = pos
-
-    until captured_piece || !valid_pos?(move = next_pos(current_pos, delta))
-      moves << move
-      captured_piece = true if !board[move].nil? && board[move].color != color
-      current_pos = move
-    end
-
-    moves
-  end
-end
-
-class SteppingPiece < Piece
-  def potential_moves(delta)
-    move = next_pos(pos, delta)
-    return [move] if valid_pos?(move)
-
-    []
-  end
-end

data/lib/ari_chess/pieces/super/sliding_piece.rb

@@ -0,0 +1,15 @@
+class SlidingPiece < Piece
+  def potential_moves(delta)
+    moves = []
+    captured_piece = false
+    current_pos = pos
+
+    until captured_piece || !valid_pos?(move = next_pos(current_pos, delta))
+      moves << move
+      captured_piece = true if !board[move].nil? && board[move].color != color
+      current_pos = move
+    end
+
+    moves
+  end
+end

data/lib/ari_chess/pieces/super/stepping_piece.rb

@@ -0,0 +1,8 @@
+class SteppingPiece < Piece
+  def potential_moves(delta)
+    move = next_pos(pos, delta)
+    return [move] if valid_pos?(move)
+
+    []
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ari_chess
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Ari Borensztein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -35,7 +35,15 @@ files:
 - lib/ari_chess/error.rb
 - lib/ari_chess/game.rb
 - lib/ari_chess/named_pieces.rb
-- lib/ari_chess/piece.rb
+- lib/ari_chess/pieces/bishop.rb
+- lib/ari_chess/pieces/king.rb
+- lib/ari_chess/pieces/knight.rb
+- lib/ari_chess/pieces/pawn.rb
+- lib/ari_chess/pieces/queen.rb
+- lib/ari_chess/pieces/rook.rb
+- lib/ari_chess/pieces/super/piece.rb
+- lib/ari_chess/pieces/super/sliding_piece.rb
+- lib/ari_chess/pieces/super/stepping_piece.rb
 homepage: http://rubygems.org/gems/ari_chess
 licenses:
 - MIT