console-reversi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bcbac06de802b63e98972131d7ebf469edcc6fa
-  data.tar.gz: f30dd8d7bc3fcc79c25749ae9cef1b3091981788
+  metadata.gz: b8aaa514166ac6d465b762165a48f4bc2f4de07d
+  data.tar.gz: 8c3d5eaeff2bb5bfc69e92ec5845a3e8e2f09116
 SHA512:
-  metadata.gz: 0e4f20249315424dee6a5a71fc3b3277cd83fb5c6ab1b664ac10cef8e0c7da14c6be81a4f846cec7ffbad0db80f4cbd0bf85982ded7e33085b9ddcdb42f63002
-  data.tar.gz: 170595a981e487b5a299d13df920118a126c8f41bbc6f02b77f2a77cd994f831b55084f0f502060a7a9dfee498d7bfc79e2f22069d573b1663199d92b9702927
+  metadata.gz: 6a1280bc05ef0c6cf0528fbe7b149169b02a86999ad953ac01030fb24e45f923f214d19083c0ce8b0c39cd8f0b31752212afd1bc6b85e796bfc843264094a083
+  data.tar.gz: 4efb45d543155874cb5074ceb7094b48f435102cb6584f4426be29938417d476aaac2f1d94556162bfed601f29b96dc3b0c1e1aebcf7e9d33d92444a70aacc20

data/lib/console_reversi.rb

@@ -4,8 +4,11 @@ require 'console_reversi/searcher'
 require 'console_reversi/piece'
 require 'console_reversi/player'
 require 'console_reversi/ascii_art'
+require 'console_reversi/cursor_operatable'
 
 class ConsoleReversi
+  include CursorOperatable
+
   def initialize
     @board = Board.new
     @black_player = Player.new(piece_color: :black)
@@ -13,6 +16,7 @@ class ConsoleReversi
   end
 
   def game_start
+    @board.plot_putable_point!(now_player(0))
     @board.pretty_print
 
     loop.with_index do |_, turn_number|
@@ -36,6 +40,8 @@ class ConsoleReversi
           now_player(turn_number).put_piece_on!(@board, x: board_position[:x], y: board_position[:y])
           now_player(turn_number).turn_pieces!(@board, x: board_position[:x], y: board_position[:y])
 
+          @board.refresh_putable_point!
+          @board.plot_putable_point!(next_player(turn_number))
           @board.pretty_print
 
           # NOTE back a cursor
@@ -48,7 +54,7 @@ class ConsoleReversi
 
     print_result
 
-    print "\e[8;1H"
+    print "\e[9;1H"
   end
 
   private
@@ -61,52 +67,6 @@ class ConsoleReversi
     now_player(turn_number) == @black_player ? @white_player : @black_player
   end
 
-  def move_cursor(&block)
-    while key = STDIN.getch
-      # NOTE 一時的に ctrl c で中断できるようにしてる
-      exit if key == "\C-c"
-
-      if key == "\e" && STDIN.getch == "["
-        key = STDIN.getch
-
-        direction =
-          case key
-          when 'A', 'B'
-            key
-          when 'C', 'D'
-            "2#{key}"
-          else
-            nil
-          end
-
-        print "\e[#{direction}" if direction
-      end
-
-      block.call(key)
-    end
-  end
-
-  def cursor_position
-    stdout = ''
-
-    $stdin.raw do |stdin|
-      $stdout << "\e[6n"
-      $stdout.flush
-
-      while (c = stdin.getc) != 'R'
-        stdout << c
-      end
-    end
-
-    positions = stdout.match /(\d+);(\d+)/
-
-    {x: positions[2].to_i, y: positions[1].to_i}
-  end
-
-  def type_enter?(key)
-    key == "\r"
-  end
-
   def print_pass
     print "\e[2;1H"
     print AsciiArt::PASS

data/lib/console_reversi/board.rb

@@ -9,7 +9,7 @@ class ConsoleReversi
     end
 
     def putable_piece?(direction:, piece_color:, x:, y:)
-      return false unless at(x, y) == 0
+      return false unless at(x, y).is_a?(Numeric)
 
       have_turnable_piece?(direction: direction, piece_color: piece_color, x: x, y: y)
     end
@@ -18,12 +18,12 @@ class ConsoleReversi
       searcher = create_searcher(x, y)
 
       p = searcher.search(direction, 1)
-      return false if p.nil? || p == 0 || p.send("#{piece_color}?")
+      return false if !p.is_a?(Piece) || p.send("#{piece_color}?")
 
       loop.with_index(2) do |_, distance|
         p = searcher.search(direction, distance)
 
-        return false if p.nil? || p == 0
+        return false if !p.is_a?(Piece)
 
         return true if p.send("#{piece_color}?")
       end
@@ -45,6 +45,8 @@ class ConsoleReversi
 
           if p == 0
             print '　'
+          elsif p == 1
+            print "\e[37m〇"
           else
             p.pretty_print
           end
@@ -58,15 +60,31 @@ class ConsoleReversi
       @board.at(y)&.at(x)
     end
 
+    def plot_putable_point!(player)
+      8.times do |i|
+        8.times do |j|
+          @board[j][i] = 1 if Searcher::DIRECTIONS.any? {|d| putable_piece?(direction: d, piece_color: player.piece_color, x: i, y: j) }
+        end
+      end
+    end
+
+    def refresh_putable_point!
+      8.times do |i|
+        8.times do |j|
+          @board[j][i] = 0 if @board[j][i] == 1
+        end
+      end
+    end
+
     private
 
     def initialize_board
       board = 8.times.map { [0].cycle(8).to_a }
 
-      board[3][3] = Piece.new(type: :black)
-      board[3][4] = Piece.new(type: :white)
-      board[4][3] = Piece.new(type: :white)
-      board[4][4] = Piece.new(type: :black)
+      board[3][3] = Piece.new(color: :black)
+      board[3][4] = Piece.new(color: :white)
+      board[4][3] = Piece.new(color: :white)
+      board[4][4] = Piece.new(color: :black)
 
       board
     end

data/lib/console_reversi/cursor_operatable.rb

@@ -0,0 +1,49 @@
+class ConsoleReversi
+  module CursorOperatable
+    def move_cursor(&block)
+      while key = STDIN.getch
+        # NOTE enable to cancel a game by ctrl-c
+        exit if key == "\C-c"
+
+        if key == "\e" && STDIN.getch == "["
+          key = STDIN.getch
+
+          direction =
+            case key
+            when 'A', 'B'
+              key
+            when 'C', 'D'
+              "2#{key}"
+            else
+              nil
+            end
+
+          print "\e[#{direction}" if direction
+        end
+
+        block.call(key)
+      end
+    end
+
+    def cursor_position
+      stdout = ''
+
+      $stdin.raw do |stdin|
+        $stdout << "\e[6n"
+        $stdout.flush
+
+        while (c = stdin.getc) != 'R'
+          stdout << c
+        end
+      end
+
+      positions = stdout.match /(\d+);(\d+)/
+
+      {x: positions[2].to_i, y: positions[1].to_i}
+    end
+
+    def type_enter?(key)
+      key == "\r"
+    end
+  end
+end

data/lib/console_reversi/piece.rb

@@ -2,22 +2,22 @@ class ConsoleReversi
   class Piece
     COLORS = {black: "\e[30m", white: "\e[37m"}
 
-    attr_accessor :type
+    attr_accessor :color
 
-    def initialize(type:)
-      @type = type
+    def initialize(color:)
+      @color = color
     end
 
     def pretty_print
-      print "#{COLORS[@type.to_sym]}⬤️⃝ "
+      print "#{COLORS[@color.to_sym]}⬤️⃝ "
     end
 
     def black?
-      @type == :black
+      @color == :black
     end
 
     def white?
-      @type == :white
+      @color == :white
     end
   end
 end

data/lib/console_reversi/player.rb

@@ -7,7 +7,7 @@ class ConsoleReversi
     end
 
     def put_piece_on!(board, x:, y:)
-      board.put_piece!(piece: Piece.new(type: @piece_color), x: x, y: y)
+      board.put_piece!(piece: Piece.new(color: @piece_color), x: x, y: y)
     end
 
     def putable_piece?(board)

data/lib/console_reversi/square.rb

@@ -0,0 +1,13 @@
+class ConsoleReversi
+  class Square
+    attr_reader :piece
+
+    def put(piece)
+      @piece = piece
+    end
+
+    def empty?
+      @piece.nil?
+    end
+  end
+end

data/lib/console_reversi/version.rb

@@ -1,3 +1,3 @@
 class ConsoleReversi
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-reversi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - pekepek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,9 +70,11 @@ files:
 - lib/console_reversi.rb
 - lib/console_reversi/ascii_art.rb
 - lib/console_reversi/board.rb
+- lib/console_reversi/cursor_operatable.rb
 - lib/console_reversi/piece.rb
 - lib/console_reversi/player.rb
 - lib/console_reversi/searcher.rb
+- lib/console_reversi/square.rb
 - lib/console_reversi/version.rb
 homepage: https://github.com/pekepek/console-reversi
 licenses: []