basketball 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29805ef216312c25dee77d7f7c2a82bf220287404e9e241d24e16dddfb895fcc
-  data.tar.gz: 3d8a0038acf62e4e1aa230299cc1b2d7d777596bc133b159b1e661639c75c76d
+  metadata.gz: 71ab0cd4aa4e2bb10d0a9640e18a756938fbe749842abdbbda9be9f2023be9cf
+  data.tar.gz: 5d216901cadb3c92d41a1e445956aef4a11fc1d3e418430003d050693c43d3be
 SHA512:
-  metadata.gz: ae3baac2215dbfee6b9cf70a44b2bdf9257d7dade811c6a30bf37b22f840bd85621f6441d137e07f38b615210092d0cede011a2e9f4655aa1e05c6281411a856
-  data.tar.gz: 4bcb67de94178f2945376faa2cb57c5f5884d60b24479d73e12d1145c7c20c1b9f3dd547f321c578f39d43868fb2f8d158859020b14d7e436fbface8a89b2809
+  metadata.gz: a3812684e58e97711745e31a8696c12c32c79e542661302db86eb7b0fecc3784ede1650ec2d0079b66a641f5e09da657f22f596583630d932e03e55ba7ed3514
+  data.tar.gz: f1edd69f31a2ff8ca4d5e53bab9bd59c74a091ab276db1a53901aa1e7de17202898ba01a917304f1e7018da1b3ad129fb012a3ac12516e832f4b8fa6cb8cd232

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+#### 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
+* `Drafting::Engine#sim!` should return events
+* Added `Drafting::Engine#undrafted_player_search`
 
 #### 0.0.2 - May 4th, 2023
 

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,6 +96,22 @@ 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  = []
@@ -156,12 +172,16 @@ module Basketball
 
       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
@@ -172,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
@@ -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/roster.rb

@@ -27,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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basketball
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Ruggio
@@ -215,6 +215,7 @@ 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