rochambeau 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5534247c467138912df8e075d8636234bbb9431b7461f63eaa3d3da50a490316
-  data.tar.gz: 7388423500ebab9ee5c8fd76c46267cefe4a3b0ba6a5c48908670418bb730385
+  metadata.gz: 582a52ab9c2bad5230d33ef100fd22b575bb5839a22e4250c4d3ccde24f2efce
+  data.tar.gz: 25e0a11255c8c291c3bf7543bab38d6cd425649450650280c69d4cd773fad1e6
 SHA512:
-  metadata.gz: 5ad8f45b117ca0e4161b6e35eea331099db0ab2c0427711f246112a294f650e9cf6f1474d8a555d04881679f52e9b689607747145d6fba515d2d7c8ad28c5443
-  data.tar.gz: cf06036ffbf2f1b02d06aa9fd744b651b35a59608cea5cc5517b81b02552a5a0c968be21d0941f697fdc47ce157be383882e22e5af188c267528b7136558e727
+  metadata.gz: bf332299ddc71492dcc18a08e56bab957882284ae2ce4dd7c81574ff6973174a9c34260ae66bff8d1dc5e458cde2477dded906c87adb6381d458687d2c8c183f
+  data.tar.gz: 1d8cee2d6cbdbc50c323562b30167cda230fa2c1874ec1cfe5124e05fbaf1b302406adae8245ed89b299f91fce11d1d7f1a1e304f25b8846f93be6f6057a9130

data/bin/rochambeau

@@ -6,10 +6,5 @@
 # Rochambeau: Entrypoint.
 
 require 'rochambeau'
-require 'rochambeau/cli'
 
-begin
-  Rochambeau::Cli.start(ARGV)
-rescue Interrupt
-  # No op.
-end
+Rochambeau.execute

data/lib/rochambeau.rb

@@ -3,15 +3,28 @@
 
 require 'sorbet-runtime'
 require 'thor'
-require 'rochambeau/option'
-require 'rochambeau/game_mode'
-require 'rochambeau/cli'
 
-class Rochambeau
-  extend T::Sig
+require_relative 'rochambeau/version'
+require_relative 'rochambeau/option'
+require_relative 'rochambeau/game_mode'
+require_relative 'rochambeau/player'
+require_relative 'rochambeau/cli'
 
-  VERSION = '1.9.2'
+module Rochambeau
+  extend T::Sig
 
   class InvalidOptionError < StandardError
   end
+
+  sig { void }
+  def self.execute
+    Rochambeau::Cli.start(ARGV)
+  rescue ArgumentError => e
+    warn(e.to_s)
+  rescue Interrupt
+    # No op.
+  end
 end
+
+# Makes this file executable during development.
+Rochambeau.execute if __FILE__ == $PROGRAM_NAME

data/lib/rochambeau/cli.rb

@@ -1,7 +1,7 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
-class Rochambeau
+module Rochambeau
   class Cli < Thor
     extend T::Sig
 
@@ -19,48 +19,56 @@ class Rochambeau
            aliases: ['a'],
            type: :boolean,
            default: false,
-           desc: 'Advanced mode contains the options "Lizard" and "Spock".'
+           desc: 'Enable the options "Lizard" and "Spock".'
+    option 'players',
+           aliases: ['p'],
+           type: :numeric,
+           enum: [1, 2],
+           default: 1,
+           desc: 'Choose between 1 player and 2 player modes.'
     sig { void }
     def play
       system 'clear'
 
       game_mode =
         options.advanced ? GameMode::ADVANCED : GameMode::BASIC
+      p1, p2 = Cli.get_players(options.players)
 
-      choice = input_choice(game_mode)
-      random = T.cast(game_mode.options.sample, Option)
+      puts game_mode.options.map(&:label).join(' · ')
+      p1_choice = p1.choose_option(game_mode.options)
+      p2_choice = p2.choose_option(game_mode.options)
 
-      puts '------'
-      puts "Bot: #{random}"
-      puts "You: #{choice}"
-      puts '------'
+      puts <<~CHOICES
+        ------
+        #{p1.name}: #{p1_choice}
+        #{p2.name}: #{p2_choice}
+        ------
+      CHOICES
 
-      puts Option.explain(choice, random) unless random == choice
+      puts Option.explain(p1_choice, p2_choice) unless p1_choice == p2_choice
 
-      case choice <=> random
-      when 1
-        puts 'You won (:'
-      when -1
-        puts 'Bot won :('
-        puts 'Better luck next time.'
-      else
-        puts 'Match draw.'
+      case p1_choice <=> p2_choice
+      when 1 then puts p1.victory_message
+      when -1 then puts p2.victory_message
+      else puts 'Match draw.'
       end
     end
 
     default_task :play
 
-    private
-
-    no_commands do
-      def input_choice(game_mode)
-        T.cast(game_mode, GameMode)
-        puts game_mode.options.map(&:label).join(' · ')
-        chosen_initial = ask('Make a choice', {
-          limited_to: game_mode.options.map(&:initial)
-        })
-        Rochambeau::Option.from_initial chosen_initial
+    sig { params(count: Integer).returns([Player, Player]) }
+    def self.get_players(count)
+      case count
+      when 1
+        return [Player::UnnamedHuman.new, Player::Robot.new]
+      when 2
+        return [
+          Player::NamedHuman.new('Player 1'),
+          Player::NamedHuman.new('Player 2'),
+        ]
       end
+
+      raise ArgumentError, "Unexpected player count: #{count}"
     end
   end
 end

data/lib/rochambeau/game_mode.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-class Rochambeau
+module Rochambeau
   class GameMode < T::Struct
     extend T::Sig
 

data/lib/rochambeau/option.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-class Rochambeau
+module Rochambeau
   class Option
     extend T::Sig
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rochambeau
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Jigar Mehta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime