hlockey-cli 3 → 4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e525ff3f2707721f9bef74532f8ca4a3ea9fb9aa18708a13fc56d56f3ebc615
-  data.tar.gz: ae05fa875ecd8b7ecd57d6a2d9256d69f6400286f5e9df66c52a656eeea68e66
+  metadata.gz: 20dbbe21705cef26f25805ff8ff5e00093b6cae75b631b5285a03524401b80a9
+  data.tar.gz: e7858da88ee692700c1a47dd2496ba9b533e3e9c69d86cbfa144ef9eb825455b
 SHA512:
-  metadata.gz: 37b4cf715312b89b4a1e226f67ff240195847aa6d12483888d73248c9f148631ca057a7a87de2159a1f30fae4daac5d9977326d00a73c2b7c021b494ce4ea109
-  data.tar.gz: 1588dcb597e6c17881107a38f0ab5cf26b37afe48a23c28fae90c63c30a2ba52bbd99ae9ee97208fd9151698ed805b272a1034b79f0aca1b2fe1cf7be949e792
+  metadata.gz: '09539eff948b07b8c1674f6ad55eac92eb388738bdc3db8fa936b08e122668e5fc22242c1d228f6b621013aca534547f94a991936dbd5443fa2f3af7f31cfc40'
+  data.tar.gz: c374e0f96b827d21ec6777fc168474b876aae83ea2e03ade519d7f105be3d0ca26e5cb81668ea49f469aa465dd2e6c9970cdb60a841e3152e8bd4064e9330ec9

data/lib/hlockey-cli/actions.rb

@@ -19,13 +19,13 @@ module HlockeyCLI
 
         puts("#{chosen_game.home.emoji} #{chosen_game} #{chosen_game.away.emoji}")
 
+        stream_idx = 0
         loop do
           league.update_state
-          chosen_game.stream.each { |message| puts("#{message}\n\n") }
-
+          chosen_game.stream[stream_idx..].each { |message| puts("#{message}\n\n") }
+          stream_idx = chosen_game.stream.length
           break unless chosen_game.in_progress
 
-          chosen_game.stream.clear
           sleep(5)
         end
       end
@@ -34,34 +34,55 @@ module HlockeyCLI
         if league.champion_team
           puts(Hlockey::Message.SeasonChampion(league.champion_team))
         elsif league.playoff_teams
-          put_standings("Playoffs", league.playoff_teams)
+          (league.playoff_teams.length / 2).times do |i|
+            put_standings("Playoff Matchup #{i + 1}",
+                          [league.playoff_teams[i], league.playoff_teams[-i - 1]])
+          end
+          puts("_" * 31) # Separator from regular standings
         end
         league.divisions.each { |name, teams| put_standings(name, teams) }
       end
 
       def team_info(league)
-        chosen_team = HlockeyCLI.user_selection(league.teams)
-        return if chosen_team.nil?
-
-        puts("#{chosen_team.emoji} #{chosen_team}")
-        chosen_team.roster.each do |pos, player|
-          puts("  #{Hlockey::Team.pos_name(pos)}:\n    #{player}")
-          player.stats.each do |stat, value|
-            puts("      #{stat}: #{value.round(1)}")
+        chosen_team = HlockeyCLI.user_selection(league.teams, default: "All teams")
+
+        (chosen_team.nil? ? league.teams : [chosen_team]).each do |team|
+          puts("#{team.emoji} #{team}")
+          puts("\"#{team.motto}\"")
+          team.roster.each do |pos, player|
+            puts("  #{Hlockey::Team.pos_name(pos)}:\n    #{player}")
+            put_stats(player)
+          end
+          puts("  Shadows:")
+          team.shadows.each do |player|
+            puts("    #{player}")
+            put_stats(player)
           end
+          puts("  Wins: #{team.wins}")
+          puts("  Losses: #{team.losses}")
         end
-        puts("  wins: #{chosen_team.wins}")
-        puts("  losses: #{chosen_team.losses}")
       end
 
-      def election(_)
-        Hlockey::Data.election.each do |category, options|
-          puts(category)
-          options.each { |name, description| puts("  #{name}\n    #{description}") }
+      def election(league)
+        if league.start_time < Time.now
+          puts("Current election options\nGo to the website to vote.")
+          Hlockey::Data.election.each do |category, options|
+            puts("  #{category}")
+            options.each { |name, description| puts("    #{name}\n      #{description}") }
+          end
+        end
+
+        election_results = Hlockey::Data.previous_election_results
+        puts("Previous election results\nvotes cast: #{election_results[:vote_amt]}")
+        election_results[:categories].each do |category, options|
+          puts("  #{category}")
+          options.each do |name, result|
+            puts("    #{name}\n      #{result[:winner]}")
+            next if result[:most_votes].nil?
+
+            puts("      team with most votes: #{result[:most_votes]}")
+          end
         end
-        # TODO: add an actual link to the website,
-        # probably should be from Hlockey lib data
-        puts("Go to the website to vote.")
       end
 
       def information(_)
@@ -77,7 +98,24 @@ module HlockeyCLI
 
       def put_standings(division_name, teams)
         puts(division_name)
-        teams.each { |team| puts("#{team.emoji} #{team} ".ljust(27) + team.w_l) }
+        teams.each do |team|
+          status_emoji = case team.status
+                         when :partying
+                           " 🎉"
+                         when :qualified
+                           " ✅"
+                         else
+                           ""
+                         end
+          puts("#{team.emoji} #{team}".ljust(27) + team.w_l + status_emoji)
+        end
+      end
+
+      # @param player [Hlockey::Player]
+      def put_stats(player)
+        player.stat_strings.each do |key, value|
+          puts("      #{key}: #{value}")
+        end
       end
     end
   end

data/lib/hlockey-cli/user_selection.rb

@@ -1,5 +1,5 @@
 module HlockeyCLI
-  def self.user_selection(choices, default: nil, str_process: proc { |s| s })
+  def self.user_selection(choices, default: "Back", str_process: ->(s) { s })
     puts("Please enter a number...")
 
     # 1 is added to i when printing choices
@@ -7,15 +7,11 @@ module HlockeyCLI
     choices.each_with_index do |choice, i|
       puts("#{(i + 1).to_s.rjust(2)} - #{str_process.call(choice)}")
     end
-    puts("anything else - #{default || "Back"}")
+    puts("anything else - #{default}")
 
     # 1 is subracted to undo adding 1 earlier
     choice_idx = $stdin.gets.to_i - 1
 
-    if !choice_idx.negative? && choice_idx < choices.length
-      choices[choice_idx]
-    else
-      default
-    end
+    !choice_idx.negative? && choice_idx < choices.length ? choices[choice_idx] : nil
   end
 end

data/lib/hlockey-cli/version.rb

@@ -1,3 +1,3 @@
 module HlockeyCLI
-  VERSION = "3".freeze
+  VERSION = "4.1".freeze
 end

data/lib/hlockey-cli.rb

@@ -1,4 +1,5 @@
 require("hlockey")
+require("paint")
 require("hlockey-cli/actions")
 require("hlockey-cli/user_selection")
 require("hlockey-cli/version")
@@ -7,20 +8,30 @@ module HlockeyCLI
   def self.main
     puts("Please wait...")
 
+    Hlockey::Message.colorize = ->(color, string) { Paint[string, color] }
+
     league = Hlockey::League.new
+    alerts = league.alerts.clone
 
     puts(Hlockey::Message.SeasonStarts(league.start_time)) if Time.now < league.start_time
 
     loop do
       league.update_state
+
+      unless alerts == league.alerts
+        alerts = league.alerts.clone
+        alerts.each(&method(:puts))
+        puts # newline
+      end
       puts(Hlockey::Message.SeasonDay(league.day))
 
       selected_action = user_selection(
         Actions::ACTIONS,
-        default: :Exit,
-        str_process: proc { |s| s.to_s.capitalize.sub("_", " ") }
+        default: "Exit",
+        str_process: ->(s) { s.to_s.capitalize.sub("_", " ") }
       )
-      exit if selected_action == :Exit
+      exit if selected_action.nil?
+
       Actions.send(selected_action, league)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hlockey-cli
 version: !ruby/object:Gem::Version
-  version: '3'
+  version: '4.1'
 platform: ruby
 authors:
 - Lavender Perry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlockey
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Hlockey console application.
 email: endie2@protonmail.com
 executables: