connect_n 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c066a9534814a11948195d47f819b9ccf4d725af8cdfe719036d3b4e801ae3
-  data.tar.gz: aab0c4794669f157f77baa64d72d84af77480ae02de7f01551c2ae3b3152129b
+  metadata.gz: c77d16aeb634e3e518eadd0bc085e3a8eb4e545f5f61fcd04427b36e714fc441
+  data.tar.gz: 4e16926c6fd1652d5c4f04749864fe4603356716833fb02a71a36a3740516091
 SHA512:
-  metadata.gz: 4d3f47001ca9bdea6dfee6970c20ba698a77527251713fbe6837dcfd5658c31ed7f8775020dba20779a36320fa572e5efa61e9932019334528c1997d7fc73517
-  data.tar.gz: 83cf8c9207f102b995a68663847c120fd3154e5ded67c957b9a21124428566ad8eb440e53fbf9d7fbc431e905bca40a6d303c6e7b9b5337b4db38423daa074cf
+  metadata.gz: 05fbc6ebf0c232d844186c7c48720412814341416012bc29cb8eefab993e1bd53f0558d874427d5a1d7dca66393e25c6fefb28f3a9e9f1242992d4b9d05188da
+  data.tar.gz: de954704885290af0cab839bc9dd73f82ba320d286cbc77f088ba304e0730d179116500046f3422095b57320fb191c61f0abcb2f1ecfbac0b65c98a217a063a8

data/lib/connect_n/board/board.rb

@@ -35,7 +35,7 @@ module ConnectN
     end
 
     def draw
-      table.each{ |row| draw_border || draw_row(row) }
+      table.each { |row| draw_border || draw_row(row) }
       draw_border
       draw_col_nums
     end
@@ -74,7 +74,7 @@ module ConnectN
     end
 
     def draw_row(row)
-      puts '| ' + row.join(' | ') + ' |'
+      puts "| #{row.join(' | ')} |"
     end
 
     def draw_col_nums
@@ -94,7 +94,7 @@ module ConnectN
     def valid_row?(n)
       n.between?(0, rows_amount - 1)
     end
-      
+
     def valid_col?(n)
       n.between?(0, cols_amount - 1)
     end

data/lib/connect_n/demo/demo.rb

@@ -4,6 +4,7 @@ require_relative '../player/human_player/human_player'
 require_relative '../player/computer_player/computer_player'
 require_relative '../game/game'
 require_relative '../board/board'
+require_relative '../prompt/prompt'
 
 module ConnectN
   class Demo
@@ -13,10 +14,10 @@ module ConnectN
       @parameters = { human_players: [] }
     end
 
-    def launch
-      if !Game.games('connect_n_saved_games.yaml').empty? && Game.resume?
+    def launch(yaml_fn)
+      if !Game.games(yaml_fn).empty? && Game.resume?
         game_name = Game.select_game_name
-        @game = Game.load game_name, 'connect_n_saved_games.yaml'
+        @game = Game.load game_name, yaml_fn
         return Game.resume game
       end
 
@@ -26,67 +27,28 @@ module ConnectN
               else
                 single_player_game
               end
-      game.play('connect_n_saved_games.yaml')
+      game.play(yaml_fn)
     end
 
     private
 
     def setup_parameters
-      parameters[:human_players].push [human_name, disc]
+      parameters[:human_players].push [Prompt.ask_for_human_name, Prompt.ask_for_disc]
 
-      parameters[:cols_amount] = cols_amount
-      parameters[:rows_amount] = rows_amount
-      parameters[:min_to_win] = min_to_win
+      parameters[:cols_amount] = Prompt.ask_for_cols_amount
+      parameters[:rows_amount] = Prompt.ask_for_rows_amount
+      parameters[:min_to_win] = Prompt.ask_for_min_to_win
 
-      parameters[:mode] = mode
+      parameters[:mode] = Prompt.ask_for_mode
 
       if parameters[:mode] == 'multiplayer'
-        parameters[:human_players].push [human_name => disc]
+        parameters[:human_players].push [Prompt.ask_for_human_name, Prompt.ask_for_disc]
       else
-        parameters[:difficulty] = difficulty
-        parameters[:human_starts?] = human_starts?
+        parameters[:difficulty] = Prompt.ask_for_difficulty
+        parameters[:human_starts?] = Prompt.starts?
       end
     end
 
-    def cols_amount
-      PROMPT.ask 'How many columns do you want in the board?', convert: :int, default: 7
-    end
-
-    def rows_amount
-      PROMPT.ask 'How many rows do you want in the board?', convert: :int, default: 6
-    end
-
-    def min_to_win
-      PROMPT.ask(
-        'Minimum number of aligned similar discs necessary to win : ',
-        convert: :int,
-        default: 4
-      )
-    end
-
-    def difficulty
-      PROMPT.slider 'Difficulty : ', [*0..10], default: 0
-    end
-
-    def mode
-      PROMPT.select('Choose a game mode : ', ['Single Player', 'Multiplayer']).downcase
-    end
-
-    def human_starts?
-      PROMPT.yes? 'Do you wanna play first?'
-    end
-
-    def disc
-      PROMPT.ask 'Enter a character that will represent your disc : ', default: '🔥' do |q|
-        q.validate(/^.?$/)
-        q.messages[:valid?] = 'Please enter a single character.'
-      end
-    end
-
-    def human_name
-      PROMPT.ask 'Enter your name : ', default: ENV['USER']
-    end
-
     def multiplayer_game
       human_players = multiplayer_players
       board = Board.new(
@@ -95,8 +57,8 @@ module ConnectN
       )
       Game.new(
         board: board,
-        first_player: players.first,
-        second_player: players.last,
+        first_player: human_players.first,
+        second_player: human_players.last,
         min_to_win: parameters[:min_to_win]
       )
     end

data/lib/connect_n/game/game.rb

@@ -14,7 +14,7 @@ module ConnectN
 
     attr_reader :board, :players, :min_to_win
 
-    PERMITTED_CLASSES = [Symbol, Game, Board, HumanPlayer, ComputerPlayer]
+    PERMITTED_CLASSES = [Symbol, Game, Board, HumanPlayer, ComputerPlayer].freeze
 
     def initialize(
       board:,

data/lib/connect_n/player/human_player/human_player.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'tty-prompt'
-
 require_relative '../player'
+require_relative '../../prompt/prompt'
 
 module ConnectN
   class HumanPlayer < Player
@@ -14,7 +13,7 @@ module ConnectN
     end
 
     def pick
-      input = PROMPT.ask('Please enter a column number : ')
+      input = Prompt.ask_for_pick
       input == save_key ? input : input.to_i - 1
     end
   end

data/lib/connect_n/prompt/prompt.rb

@@ -3,5 +3,59 @@
 require 'tty-prompt'
 
 module ConnectN
-  PROMPT = TTY::Prompt.new
+  module Prompt
+    PROMPT = TTY::Prompt.new
+
+    def self.ask_for_cols_amount(
+      prompt: 'How many columns do you want in the board?',
+      default: 7
+    )
+      PROMPT.ask prompt, convert: :int, default: default
+    end
+
+    def self.ask_for_rows_amount(
+      prompt: 'How many rows do you want in the board?',
+      default: 6
+    )
+      PROMPT.ask prompt, convert: :int, default: default
+    end
+
+    def self.ask_for_min_to_win(
+      prompt: 'Minimum number of aligned similar discs necessary to win : ',
+      default: 4
+    )
+      PROMPT.ask(prompt, convert: :int, default: default)
+    end
+
+    def self.ask_for_difficulty(prompt: 'Difficulty : ', levels: [*0..10], default: 5)
+      PROMPT.slider prompt, levels, default: default
+    end
+
+    def self.ask_for_mode(prompt: 'Choose a game mode : ')
+      PROMPT.select(prompt, ['Single Player', 'Multiplayer']).downcase
+    end
+
+    def self.starts?(prompt: 'Do you wanna play first?')
+      PROMPT.yes? prompt
+    end
+
+    def self.ask_for_disc(
+      prompt: 'Enter a character that will represent your disc : ',
+      default: '🔥',
+      error_msg: 'Please enter a single character.'
+    )
+      PROMPT.ask prompt, default: default do |q|
+        q.validate(/^.?$/)
+        q.messages[:valid?] = error_msg
+      end
+    end
+
+    def self.ask_for_name(prompt: 'Enter your name : ', default: ENV['USER'])
+      PROMPT.ask prompt, default: default
+    end
+
+    def self.ask_for_pick(prompt: 'Please enter a column number : ')
+      PROMPT.ask prompt
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connect_n
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Lhoussaine (Jee-El) Ghallou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box