acpc_table_manager 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3019d716b6b2e7b2b460c7d6116ff66fff0d900
-  data.tar.gz: bd97b8a4c88d08bbef9f2a097e9868fa20fb9aa6
+  metadata.gz: caa21a432272320af6b1c4c92c1101224ab17c4c
+  data.tar.gz: 41195e4e8d2026cdec9e66ec8c2dc24814370751
 SHA512:
-  metadata.gz: e087449d3f52909bc0965b8938384e1073222fef34e02ad675f7eda47f360db6c91a2c002fbefdacac7783c5e836c959bb72fccc1b3f0a4d32266cdf9df263aa
-  data.tar.gz: 1b208ddf1c6e8e16b28e5d6241f585ae28b0896407d715b35ef9541db3cd6fab89d160d66a0c8223c9041aa77170c15d57b41c8aa957369d1e0cb03c691d9309
+  metadata.gz: 68d5270916d22bb56b2e335caca6ab7a6e35c4b74d01f7c7b088f33b8705619e175435425eea18263f4410eaa8c8f1b81efa36f27a2269e9529eee69393d95f5
+  data.tar.gz: d3b1f355a8969e54492baec90b5ef0d671394622f74d7765c6963a31db4540c9778812d0b25ec2e9c166434df0c91adb618535a736d17455e872537d9b4b88be

data/lib/acpc_table_manager/match.rb

@@ -183,6 +183,7 @@ class Match
     end
     def new_random_seed
       # The ACPC dealer requires 32 bit random seeds
+      # TODO The bound to rand is exclusive so this should be 2**33
       rand(2**33 - 1)
     end
     def new_random_seat(num_players)

data/lib/acpc_table_manager/table_queue.rb

@@ -27,31 +27,27 @@ module AcpcTableManager
 
       log(
         __method__,
-        {
-          game_definition_key: @game_definition_key,
-          max_num_matches: AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
-        }
+        game_definition_key: @game_definition_key,
+        max_num_matches: AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
       )
     end
 
     def start_players!(match)
       Opponents.start(match)
-      log(__method__, msg: "Opponents started for #{match.id.to_s}")
+      log(__method__, msg: "Opponents started for #{match.id}")
 
       start_proxy! match
     end
 
     def start_proxy!(match)
-      command = "#{File.expand_path('../../../exe/acpc_proxy', __FILE__)} -t #{AcpcTableManager.config_file} -m #{match.id.to_s}"
+      command = "#{File.expand_path('../../../exe/acpc_proxy', __FILE__)} -t #{AcpcTableManager.config_file} -m #{match.id}"
       log(
         __method__,
-        {
-          msg: "Starting proxy for #{match.id.to_s}",
-          command: command
-        }
+        msg: "Starting proxy for #{match.id}",
+        command: command
       )
 
-      match.proxy_pid = Timeout::timeout(3) do
+      match.proxy_pid = Timeout.timeout(3) do
         pid = Process.spawn(command)
         Process.detach(pid)
         pid
@@ -60,15 +56,15 @@ module AcpcTableManager
 
       log(
         __method__,
-        {
-          msg: "Started proxy for \"#{match.name}\" (#{match.id.to_s})",
-          pid: match.proxy_pid
-        }
+        msg: "Started proxy for \"#{match.name}\" (#{match.id})",
+        pid: match.proxy_pid
       )
       self
     end
 
-    def matches_to_start() my_matches.queue end
+    def matches_to_start
+      my_matches.queue
+    end
 
     def my_matches
       Match.where(game_definition_key: @game_definition_key.to_sym)
@@ -80,7 +76,9 @@ module AcpcTableManager
       prevNumMatchesRunning != Match.running(my_matches).length
     end
 
-    def length() matches_to_start.length end
+    def length
+      matches_to_start.length
+    end
 
     def available_special_ports
       if AcpcTableManager.exhibition_config.special_ports_to_dealer
@@ -91,32 +89,40 @@ module AcpcTableManager
     end
 
     def check!
+      return if length < 1
+
       my_matches_to_start = matches_to_start.to_a
-      num_running_matches = Match.running(my_matches).length
-      log(
-        __method__,
-        {
-            num_running_matches: num_running_matches,
-            num_matches_to_start: my_matches_to_start.length
-        }
-      )
+
+      max_running_matches = AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
+      check_num_running_matches = max_running_matches > 0
+
+      num_running_matches = 0
+      if check_num_running_matches
+        num_running_matches = Match.running(my_matches).length
+        log(
+          __method__,
+          num_running_matches: num_running_matches,
+          num_matches_to_start: my_matches_to_start.length
+        )
+      end
 
       matches_started = []
-      while (
+      while
         !my_matches_to_start.empty? &&
-        num_running_matches < AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
-      )
+        (
+          !check_num_running_matches ||
+          num_running_matches < max_running_matches
+        )
+
         matches_started << dequeue(my_matches_to_start.pop)
         num_running_matches += 1
       end
 
       log(
         __method__,
-        {
-          matches_started: matches_started,
-          num_running_matches: num_running_matches,
-          num_matches_to_start: matches_to_start.length
-        }
+        matches_started: matches_started,
+        num_running_matches: num_running_matches,
+        num_matches_to_start: matches_to_start.length
       )
 
       matches_started
@@ -126,14 +132,14 @@ module AcpcTableManager
 
     def port(available_ports)
       port_ = available_ports.pop
-      while !AcpcDealer::port_available?(port_)
+      until AcpcDealer.port_available?(port_)
         if available_ports.empty?
-          raise NoPortForDealerAvailable.new("None of the special ports (#{available_special_ports}) are open")
+          raise NoPortForDealerAvailable, "None of the special ports (#{available_special_ports}) are open"
         end
         port_ = available_ports.pop
       end
       unless port_
-        raise NoPortForDealerAvailable.new("None of the special ports (#{available_special_ports}) are open")
+        raise NoPortForDealerAvailable, "None of the special ports (#{available_special_ports}) are open"
       end
       port_
     end
@@ -148,7 +154,7 @@ module AcpcTableManager
           0
         end
       end
-      return ports, available_ports
+      [ports, available_ports]
     end
 
     # @return [Object] The match that has been started or +nil+ if none could
@@ -170,7 +176,7 @@ module AcpcTableManager
       num_repetitions = 0
       dealer_info = nil
 
-      while dealer_info.nil? do
+      while dealer_info.nil?
         log(
           __method__,
           msg: "Added #{match.id} list of running matches",
@@ -183,7 +189,7 @@ module AcpcTableManager
         rescue Timeout::Error => e
           log(
             __method__,
-            {warning: "The dealer for match \"#{match.name}\" (#{match.id}) timed out."},
+            { warning: "The dealer for match \"#{match.name}\" (#{match.id}) timed out." },
             Logger::Severity::WARN
           )
           begin
@@ -192,7 +198,7 @@ module AcpcTableManager
             available_ports = available_special_ports
             log(
               __method__,
-              {warning: "#{ports_to_be_used} ports unavailable, retrying with all special ports, #{available_ports}."},
+              { warning: "#{ports_to_be_used} ports unavailable, retrying with all special ports, #{available_ports}." },
               Logger::Severity::WARN
             )
           end
@@ -200,14 +206,14 @@ module AcpcTableManager
             sleep 1
             log(
               __method__,
-              {warning: "Retrying with all special ports, #{available_ports}."},
+              { warning: "Retrying with all special ports, #{available_ports}." },
               Logger::Severity::WARN
             )
             num_repetitions += 1
           else
             log(
               __method__,
-              {warning: "Unable to start match after retry, giving up."},
+              { warning: 'Unable to start match after retry, giving up.' },
               Logger::Severity::ERROR
             )
             match.unable_to_start_dealer = true

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = "3.0.13"
+  VERSION = '3.0.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony