console-reversi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8aaa514166ac6d465b762165a48f4bc2f4de07d
-  data.tar.gz: 8c3d5eaeff2bb5bfc69e92ec5845a3e8e2f09116
+  metadata.gz: ad490db6ee92e754a57d3ce9cddc7fdd8b595e96
+  data.tar.gz: cfab7ab8f235b14d98a5497942929ae96d0e931a
 SHA512:
-  metadata.gz: 6a1280bc05ef0c6cf0528fbe7b149169b02a86999ad953ac01030fb24e45f923f214d19083c0ce8b0c39cd8f0b31752212afd1bc6b85e796bfc843264094a083
-  data.tar.gz: 4efb45d543155874cb5074ceb7094b48f435102cb6584f4426be29938417d476aaac2f1d94556162bfed601f29b96dc3b0c1e1aebcf7e9d33d92444a70aacc20
+  metadata.gz: 9870ef7398fecbc8deadff6cbb2e663d31f0e5eb450b130bee6fe1e41c3c55ec4c6f7d6a2ebbf89ad269d7b8cd275a68e5970616e4f8d854cd9b32b76e0609f1
+  data.tar.gz: 5d3cf1e7db40adf99603640e05602b57b4bbf9d875a633f2e93afb6f8760e05fe812340d197667bcf8ac2f05abb20f2ca5b797d2b966970eae3c19f5b92445aa

data/README.md

@@ -24,6 +24,16 @@ Or install it yourself as:
 $ console-reversi
 ```
 
+You can select a human player or computer player
+
+```
+Choose black player's type (Use arrow keys, press Enter to select)
+‣ human
+  computer
+```
+
+please select by using arrow keys
+
 ## Commands
 
 * move a cursor : `direction keys`

data/bin/console-reversi

@@ -2,6 +2,11 @@
 
 require 'bundler/setup'
 require 'console_reversi'
+require 'tty'
 require 'pry'
 
-ConsoleReversi.new.game_start
+prompt = TTY::Prompt.new
+black = prompt.select("Choose black player's type", ConsoleReversi::Player::TYPES)
+white = prompt.select("Choose white player's type", ConsoleReversi::Player::TYPES)
+
+ConsoleReversi.new(black, white).game_start

data/console-reversi.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
+  spec.add_dependency "tty"
 end

data/lib/console_reversi.rb

@@ -9,10 +9,10 @@ require 'console_reversi/cursor_operatable'
 class ConsoleReversi
   include CursorOperatable
 
-  def initialize
+  def initialize(black_player_type, white_player_type)
     @board = Board.new
-    @black_player = Player.new(piece_color: :black)
-    @white_player = Player.new(piece_color: :white)
+    @player1 = Player.new(piece_color: :black, type: black_player_type)
+    @player2 = Player.new(piece_color: :white, type: white_player_type)
   end
 
   def game_start
@@ -30,24 +30,34 @@ class ConsoleReversi
         end
       end
 
-      move_cursor do |key|
-        if type_enter?(key)
-          position = cursor_position
-          board_position = {x: position[:x] / 2, y: position[:y] - 1}
+      if now_player(turn_number).type == :computer
+        @board.plot_putable_point!(now_player(turn_number))
+        sleep 0.5
+        now_player(turn_number).put_piece_randomly!(@board)
 
-          next if Searcher::DIRECTIONS.none? {|d| @board.putable_piece?(direction: d, piece_color: now_player(turn_number).piece_color, x: board_position[:x], y: board_position[:y]) }
+        @board.refresh_putable_point!
+        @board.plot_putable_point!(next_player(turn_number))
+        @board.pretty_print
+      else
+        move_cursor do |key|
+          if type_enter?(key)
+            position = cursor_position
+            board_position = {x: position[:x] / 2, y: position[:y] - 1}
 
-          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])
+            next if Searcher::DIRECTIONS.none? {|d| @board.putable_piece?(direction: d, piece_color: now_player(turn_number).piece_color, x: board_position[:x], y: board_position[:y]) }
 
-          @board.refresh_putable_point!
-          @board.plot_putable_point!(next_player(turn_number))
-          @board.pretty_print
+            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])
 
-          # NOTE back a cursor
-          print "\e[#{position[:y]};#{position[:x]}H"
+            @board.refresh_putable_point!
+            @board.plot_putable_point!(next_player(turn_number))
+            @board.pretty_print
 
-          break
+            # NOTE back a cursor
+            print "\e[#{position[:y]};#{position[:x]}H"
+
+            break
+          end
         end
       end
     end
@@ -60,11 +70,11 @@ class ConsoleReversi
   private
 
   def now_player(turn_number)
-    turn_number.even? ? @black_player : @white_player
+    turn_number.even? ? @player1 : @player2
   end
 
   def next_player(turn_number)
-    now_player(turn_number) == @black_player ? @white_player : @black_player
+    now_player(turn_number) == @player1 ? @player2 : @player1
   end
 
   def print_pass

data/lib/console_reversi/board.rb

@@ -76,6 +76,14 @@ class ConsoleReversi
       end
     end
 
+    def putable_positions
+      @board.each_with_object([]).with_index {|(col, positions), i|
+        col.each_with_index {|s, j|
+          positions << [i, j] if s == 1
+        }
+      }
+    end
+
     private
 
     def initialize_board

data/lib/console_reversi/player.rb

@@ -1,9 +1,12 @@
 class ConsoleReversi
   class Player
-    attr_accessor :piece_color
+    attr_accessor :piece_color, :type
 
-    def initialize(piece_color:)
+    TYPES = %i(human computer)
+
+    def initialize(piece_color:, type:)
       @piece_color = piece_color.to_sym
+      @type = type
     end
 
     def put_piece_on!(board, x:, y:)
@@ -34,5 +37,13 @@ class ConsoleReversi
         end
       end
     end
+
+    def put_piece_randomly!(board)
+      random_position = board.putable_positions.sample
+
+      put_piece_on!(board, x: random_position[1], y: random_position[0])
+
+      turn_pieces!(board, x: random_position[1], y: random_position[0])
+    end
   end
 end

data/lib/console_reversi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console-reversi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - pekepek
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: You can play the reversi in terminal
 email:
 - ishihata@33i.co.jp
@@ -74,7 +88,6 @@ files:
 - 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: []

data/lib/console_reversi/square.rb

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