basketball 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eade2dd71d031c05eaf7e5fa792056d9ee6621f6168c6cbd288e5106f0fe4c3a
-  data.tar.gz: 66b92eb67dd64d84288dc5869b2076753d043311e22d903d4d8e5468ea90f7f6
+  metadata.gz: 71ab0cd4aa4e2bb10d0a9640e18a756938fbe749842abdbbda9be9f2023be9cf
+  data.tar.gz: 5d216901cadb3c92d41a1e445956aef4a11fc1d3e418430003d050693c43d3be
 SHA512:
-  metadata.gz: 72a89afec17d978e79dd979a50188c62c19532a77143312a79f387a182cab5988a7e90399be60f019ce3a5d6639f5eb0ddc3f14ca896e5f3c3496488be3427de
-  data.tar.gz: 4f04e99ddd1e64ad893395264c5753b975f4c46b741324d53bd125c1f2a8daa2079c44e2a85fd52bf6dd24d7b09fcf29c5f9266db4c67da19e8f952884de8a72
+  metadata.gz: a3812684e58e97711745e31a8696c12c32c79e542661302db86eb7b0fecc3784ede1650ec2d0079b66a641f5e09da657f22f596583630d932e03e55ba7ed3514
+  data.tar.gz: f1edd69f31a2ff8ca4d5e53bab9bd59c74a091ab276db1a53901aa1e7de17202898ba01a917304f1e7018da1b3ad129fb012a3ac12516e832f4b8fa6cb8cd232

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-#### 0.0.1 - May 4th, 2023
+#### 0.0.4 - May 5th, 2023
+
+* Add ability to skip draft picks using `Basketball::Drafting::Engine#skip!`
+* Add ability to output event full drafting event log using CLI: `exe/basketball-draft -i tmp/draft-wip.json -l`
+* Add ability to skip draft picks using CLI: `exe/basketball-draft -i tmp/draft-wip.json -x 1`
+
+#### 0.0.3 - May 5th, 2023
+
+* `Drafting::Engine#sim!` should return events
+* Added `Drafting::Engine#undrafted_player_search`
+
+#### 0.0.2 - May 4th, 2023
 
 * Remove autoloading in favor of require statements.
 

data/lib/basketball/drafting/cli.rb

@@ -9,12 +9,16 @@ module Basketball
   module Drafting
     # Example:
     #   exe/basketball-draft -o tmp/draft.json
-    #   exe/basketball-draft -i tmp/draft.json -o tmp/draft-wip.json -s 28 -p ONEALSH01,ONEALJE01 -t 10 -q PG
+    #   exe/basketball-draft -i tmp/draft.json -o tmp/draft-wip.json -s 26 -p P-5,P-10 -t 10 -q PG
+    #   exe/basketball-draft -i tmp/draft-wip.json -x 2
     #   exe/basketball-draft -i tmp/draft-wip.json -r -t 10
     #   exe/basketball-draft -i tmp/draft-wip.json -t 10 -q SG
     #   exe/basketball-draft -i tmp/draft-wip.json -s 30 -t 10
     #   exe/basketball-draft -i tmp/draft-wip.json -a -r
+    #   exe/basketball-draft -i tmp/draft-wip.json -l
     class CLI
+      class PlayerNotFound < StandardError; end
+
       attr_reader :opts, :serializer, :io
 
       def initialize(args:, io: $stdout)
@@ -43,11 +47,13 @@ module Basketball
           io.puts('Draft is complete!')
         else
           io.puts("#{engine.remaining_picks} Remaining pick(s)")
-          io.puts("Round #{engine.current_round} pick #{engine.current_round_pick} for #{engine.current_team}")
+          io.puts("Up Next: Round #{engine.current_round} pick #{engine.current_round_pick} for #{engine.current_team}")
         end
 
         write(engine)
 
+        log(engine)
+
         rosters(engine)
 
         query(engine)
@@ -70,6 +76,8 @@ module Basketball
           o.integer '-t', '--top',          'Output the top rated available players (default is 0).', default: 0
           o.string  '-q', '--query',        "Filter TOP by position: #{Position::ALL_VALUES.join(', ')}."
           o.bool    '-r', '--rosters',      'Output all team rosters.', default: false
+          o.integer '-x', '--skip',         'Number of picks to skip (default is 0).', default: 0
+          o.bool    '-l', '--log',          'Output event log.', default: false
 
           o.on '-h', '--help', 'Print out help, like this is doing right now.' do
             io.puts(o)
@@ -121,6 +129,15 @@ module Basketball
         end
       end
 
+      def log(engine)
+        return unless opts[:log]
+
+        io.puts
+        io.puts('Event Log')
+
+        puts engine.events
+      end
+
       # rubocop:disable Metrics/AbcSize
       def query(engine)
         top = opts[:top]
@@ -161,6 +178,8 @@ module Basketball
 
           player = engine.players.find { |p| p.id == id.to_s.upcase }
 
+          raise PlayerNotFound, "player not found by id: #{id}" unless player
+
           event = engine.pick!(player)
 
           io.puts(event)
@@ -168,6 +187,14 @@ module Basketball
           event_count += 1
         end
 
+        opts[:skip].times do
+          event = engine.skip!
+
+          io.puts(event)
+
+          event_count += 1
+        end
+
         engine.sim!(opts[:simulate]) do |event|
           io.puts(event)
 

data/lib/basketball/drafting/engine.rb

@@ -96,14 +96,31 @@ module Basketball
         !done?
       end
 
+      def skip!
+        return if done?
+
+        event = SkipEvent.new(
+          id: SecureRandom.uuid,
+          team: current_team,
+          pick: current_pick,
+          round: current_round,
+          round_pick: current_round_pick
+        )
+
+        play!(event)
+
+        event
+      end
+
       def sim!(times = nil)
         counter = 0
+        events  = []
 
         until done? || (times && counter >= times)
           team = current_team
 
           player = team.pick(
-            undrafted_players:,
+            undrafted_player_search:,
             drafted_players: drafted_players(team),
             round: current_round
           )
@@ -122,9 +139,10 @@ module Basketball
           yield(event) if block_given?
 
           counter += 1
+          events << event
         end
 
-        self
+        events
       end
 
       def pick!(player)
@@ -146,16 +164,24 @@ module Basketball
         players - drafted_players
       end
 
+      def undrafted_player_search
+        PlayerSearch.new(undrafted_players)
+      end
+
       private
 
       attr_reader :players_by_id, :teams_by_id
 
+      def player_events
+        events.select { |e| e.respond_to?(:player) }
+      end
+
       def internal_current_pick
         events.length + 1
       end
 
       def drafted_players(team = nil)
-        events.each_with_object([]) do |e, memo|
+        player_events.each_with_object([]) do |e, memo|
           next unless team.nil? || e.team == team
 
           memo << e.player
@@ -166,15 +192,21 @@ module Basketball
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def play!(event)
-        raise AlreadyPickedError, "#{player} was already picked" if drafted_players.include?(event.player)
-        raise DupeEventError,     "#{event} is a dupe"                if events.include?(event)
-        raise EventOutOfOrder,    "#{event} team cant pick right now" if event.team != current_team
-        raise EventOutOfOrder,    "#{event} has wrong pick"           if event.pick != current_pick
-        raise EventOutOfOrder,    "#{event} has wrong round"          if event.round != current_round
-        raise EventOutOfOrder,    "#{event} has wrong round_pick" if event.round_pick != current_round_pick
-        raise UnknownTeamError,   "#{team} doesnt exist"                   unless teams.include?(event.team)
-        raise UnknownPlayerError, "#{player} doesnt exist"                 unless players.include?(event.player)
-        raise EndOfDraftError,    "#{total_picks} pick limit reached"      if events.length > total_picks + 1
+        if event.respond_to?(:player) && drafted_players.include?(event.player)
+          raise AlreadyPickedError, "#{player} was already picked"
+        end
+
+        if event.respond_to?(:player) && !players.include?(event.player)
+          raise UnknownPlayerError, "#{event.player} doesnt exist"
+        end
+
+        raise DupeEventError,   "#{event} is a dupe"                if events.include?(event)
+        raise EventOutOfOrder,  "#{event} team cant pick right now" if event.team != current_team
+        raise EventOutOfOrder,  "#{event} has wrong pick"           if event.pick != current_pick
+        raise EventOutOfOrder,  "#{event} has wrong round"          if event.round != current_round
+        raise EventOutOfOrder,  "#{event} has wrong round_pick"     if event.round_pick != current_round_pick
+        raise UnknownTeamError, "#{team} doesnt exist"              unless teams.include?(event.team)
+        raise EndOfDraftError,  "#{total_picks} pick limit reached" if events.length > total_picks + 1
 
         events << event
 

data/lib/basketball/drafting/engine_serializer.rb

@@ -5,13 +5,15 @@ require_relative 'player'
 require_relative 'team'
 require_relative 'pick_event'
 require_relative 'sim_event'
+require_relative 'skip_event'
 
 module Basketball
   module Drafting
     class EngineSerializer
       EVENT_CLASSES = {
         'PickEvent' => PickEvent,
-        'SimEvent' => SimEvent
+        'SimEvent' => SimEvent,
+        'SkipEvent' => SkipEvent
       }.freeze
 
       private_constant :EVENT_CLASSES
@@ -71,7 +73,7 @@ module Basketball
             roster.id,
             {
               events: roster.events.map(&:id),
-              players: roster.events.map { |event| event.player.id }
+              players: roster.players.map(&:id)
             }
           ]
         end
@@ -101,7 +103,7 @@ module Basketball
               first_name: player.first_name,
               last_name: player.last_name,
               overall: player.overall,
-              position: player.position.value
+              position: player.position.code
             }
           ]
         end
@@ -112,12 +114,13 @@ module Basketball
           {
             type: event.class.name.split('::').last,
             id: event.id,
-            player: event.player.id,
             team: event.team.id,
             pick: event.pick,
             round: event.round,
             round_pick: event.round_pick
-          }
+          }.tap do |hash|
+            hash[:player] = event.player.id if event.respond_to?(:player)
+          end
         end
       end
 
@@ -162,12 +165,15 @@ module Basketball
       def deserialize_events(json, players, teams)
         (json.dig(:engine, :events) || []).map do |event_hash|
           event_opts = event_hash.slice(:id, :pick, :round, :round_pick).merge(
-            player: players.find { |p| p.id == event_hash[:player] },
             team: teams.find { |t| t.id == event_hash[:team] }
           )
 
           class_constant = EVENT_CLASSES.fetch(event_hash[:type])
 
+          if [PickEvent, SimEvent].include?(class_constant)
+            event_opts[:player] = players.find { |p| p.id == event_hash[:player] }
+          end
+
           class_constant.new(**event_opts)
         end
       end

data/lib/basketball/drafting/event.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Event < Entity

data/lib/basketball/drafting/front_office.rb

@@ -2,16 +2,18 @@
 
 module Basketball
   module Drafting
-    class FrontOffice
+    class FrontOffice < ValueObject
       MAX_DEPTH     = 3
       MAX_FUZZ      = 2
       MAX_POSITIONS = 12
 
       private_constant :MAX_DEPTH, :MAX_FUZZ, :MAX_POSITIONS
 
-      attr_reader :prioritized_positions, :fuzz, :depth
+      attr_reader_value :prioritized_positions, :fuzz, :depth
 
       def initialize(prioritized_positions: [], fuzz: rand(0..MAX_FUZZ), depth: rand(0..MAX_DEPTH))
+        super()
+
         @fuzz                  = fuzz.to_i
         @depth                 = depth.to_i
         @prioritized_positions = prioritized_positions
@@ -24,44 +26,36 @@ module Basketball
         freeze
       end
 
-      def to_s
-        "#{prioritized_positions.map(&:to_s).join(',')} (F:#{fuzz} D:#{depth})"
-      end
-
-      def pick(undrafted_players:, drafted_players:, round:)
+      def pick(undrafted_player_search:, drafted_players:, round:)
         players = []
 
-        players = adaptive_search(undrafted_players:, drafted_players:) if depth >= round
-        players = balanced_search(undrafted_players:, drafted_players:) if players.empty?
-        players = top_players(undrafted_players:)                       if players.empty?
+        players = adaptive_search(undrafted_player_search:, drafted_players:) if depth >= round
+        players = balanced_search(undrafted_player_search:, drafted_players:) if players.empty?
+        players = top_players(undrafted_player_search:)                       if players.empty?
 
         players[0..fuzz].sample
       end
 
       private
 
-      def adaptive_search(undrafted_players:, drafted_players:)
-        search = PlayerSearch.new(undrafted_players)
-
+      def adaptive_search(undrafted_player_search:, drafted_players:)
         drafted_positions = drafted_players.map(&:position)
 
-        search.query(exclude_positions: drafted_positions)
+        undrafted_player_search.query(exclude_positions: drafted_positions)
       end
 
-      def balanced_search(undrafted_players:, drafted_players:)
-        search = PlayerSearch.new(undrafted_players)
-
+      def balanced_search(undrafted_player_search:, drafted_players:)
         players = []
 
         # Try to find best pick for exact desired position.
         # If you cant find one, then move to the next desired position until the end of the queue
         available_prioritized_positions(drafted_players:).each do |position|
-          players = search.query(position:)
+          players = undrafted_player_search.query(position:)
 
           break if players.any?
         end
 
-        players = players.any? ? players : search.query
+        players = players.any? ? players : undrafted_player_search.query
       end
 
       def all_random_positions

data/lib/basketball/drafting/player.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Player < Entity

data/lib/basketball/drafting/position.rb

@@ -2,7 +2,7 @@
 
 module Basketball
   module Drafting
-    class Position
+    class Position < ValueObject
       extend Forwardable
 
       class << self
@@ -17,25 +17,18 @@ module Basketball
       FRONT_COURT_VALUES = %w[PF C].to_set.freeze
       ALL_VALUES         = (BACK_COURT_VALUES.to_a + FRONT_COURT_VALUES.to_a).to_set.freeze
 
-      attr_reader :value
+      attr_reader_value :code
 
-      def_delegators :value, :to_s
+      def_delegators :code, :to_s
 
-      def initialize(value)
-        @value = value.to_s.upcase
+      def initialize(code)
+        super()
 
-        raise InvalidPositionError, "Unknown position value: #{@value}" unless ALL_VALUES.include?(@value)
+        @code = code.to_s.upcase
 
-        freeze
-      end
+        raise InvalidPositionError, "Unknown position code: #{@code}" unless ALL_VALUES.include?(@code)
 
-      def ==(other)
-        value == other.value
-      end
-      alias eql? ==
-
-      def hash
-        value.hash
+        freeze
       end
     end
   end

data/lib/basketball/drafting/roster.rb

@@ -2,16 +2,18 @@
 
 module Basketball
   module Drafting
-    class Roster
+    class Roster < ValueObject
       extend Forwardable
 
       class WrongTeamEventError < StandardError; end
 
-      attr_reader :team, :events
+      attr_reader_value :team, :events
 
       def_delegators :team, :id
 
       def initialize(team:, events: [])
+        super()
+
         raise ArgumentError, 'team is required' unless team
 
         other_teams_pick_event_ids = events.reject { |e| e.team == team }.map(&:id)
@@ -25,8 +27,12 @@ module Basketball
         @events = events
       end
 
+      def player_events
+        events.select { |e| e.respond_to?(:player) }
+      end
+
       def players
-        events.map(&:player)
+        player_events.map(&:player)
       end
 
       def to_s

data/lib/basketball/drafting/sim_event.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'event'
-
 module Basketball
   module Drafting
     class SimEvent < Event

data/lib/basketball/drafting/skip_event.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative 'event'
+
+module Basketball
+  module Drafting
+    class SkipEvent < Event
+      def to_s
+        "skipped #{super}"
+      end
+    end
+  end
+end

data/lib/basketball/drafting/team.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Team < Entity
+      extend Forwardable
+
       attr_reader :name, :front_office
 
+      def_delegators :front_office, :pick
+
       def initialize(id:, name: '', front_office: FrontOffice.new)
         super(id)
 
@@ -21,10 +23,6 @@ module Basketball
       def to_s
         "[#{super}] #{name}"
       end
-
-      def pick(undrafted_players:, drafted_players:, round:)
-        front_office.pick(undrafted_players:, drafted_players:, round:)
-      end
     end
   end
 end

data/lib/basketball/entity.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Basketball
+  class Entity
+    extend Forwardable
+    include Comparable
+
+    attr_reader :id
+
+    def_delegators :id, :to_s
+
+    def initialize(id)
+      raise ArgumentError, 'id is required' if id.to_s.empty?
+
+      @id = id.to_s.upcase
+    end
+
+    def <=>(other)
+      id <=> other.id
+    end
+
+    def ==(other)
+      id == other.id
+    end
+    alias eql? ==
+
+    def hash
+      id.hash
+    end
+  end
+end

data/lib/basketball/value_object.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Basketball
+  class ValueObject
+    include Comparable
+
+    # NOTE: This current implementation most likely does not work for deep inheritance trees.
+    class << self
+      def value_keys
+        @value_keys ||= []
+      end
+
+      def sorted_value_keys
+        value_keys.sort
+      end
+
+      def attr_reader_value(*keys)
+        keys.each { |k| value_keys << k.to_sym }
+
+        attr_reader(*keys)
+      end
+    end
+
+    def to_s
+      to_h.map { |k, v| "#{k}: #{v}" }.join(', ')
+    end
+
+    def to_h
+      self.class.sorted_value_keys.to_h { |k| [k, send(k)] }
+    end
+
+    def [](key)
+      to_h[key]
+    end
+
+    def <=>(other)
+      all_sorted_values <=> other.all_sorted_values
+    end
+
+    def ==(other)
+      to_h == other.to_h
+    end
+    alias eql? ==
+
+    def hash
+      all_sorted_values.map(&:hash).hash
+    end
+
+    def all_sorted_values
+      self.class.sorted_value_keys.map { |k| self[k] }
+    end
+  end
+end

data/lib/basketball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Basketball
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/lib/basketball.rb

@@ -7,4 +7,9 @@ require 'json'
 require 'securerandom'
 require 'slop'
 
+# Top-level
+require_relative 'basketball/entity'
+require_relative 'basketball/value_object'
+
+# Submodules
 require_relative 'basketball/drafting'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basketball
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -207,7 +207,6 @@ files:
 - lib/basketball/drafting/cli.rb
 - lib/basketball/drafting/engine.rb
 - lib/basketball/drafting/engine_serializer.rb
-- lib/basketball/drafting/entity.rb
 - lib/basketball/drafting/event.rb
 - lib/basketball/drafting/front_office.rb
 - lib/basketball/drafting/pick_event.rb
@@ -216,7 +215,10 @@ files:
 - lib/basketball/drafting/position.rb
 - lib/basketball/drafting/roster.rb
 - lib/basketball/drafting/sim_event.rb
+- lib/basketball/drafting/skip_event.rb
 - lib/basketball/drafting/team.rb
+- lib/basketball/entity.rb
+- lib/basketball/value_object.rb
 - lib/basketball/version.rb
 homepage: https://github.com/mattruggio/basketball
 licenses:

data/lib/basketball/drafting/entity.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Basketball
-  module Drafting
-    class Entity
-      extend Forwardable
-      include Comparable
-
-      attr_reader :id
-
-      def_delegators :id, :to_s
-
-      def initialize(id)
-        raise ArgumentError, 'id is required' if id.to_s.empty?
-
-        @id = id.to_s.upcase
-      end
-
-      def <=>(other)
-        id <=> other.id
-      end
-
-      def ==(other)
-        id == other.id
-      end
-      alias eql? ==
-
-      def hash
-        id.hash
-      end
-    end
-  end
-end