acpc_dealer 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df72da45ec00ef10ab9807e6d541ea45321b3ab
-  data.tar.gz: e3b27ea957b98c51bfc241dbe9eed5d742d54e9b
+  metadata.gz: e1c356e89c512e17dfd0fd11da86d8822cd8dca9
+  data.tar.gz: be541dba86e52f4cf1237b06be6717f2913d0d19
 SHA512:
-  metadata.gz: e43ae1f310627ed50a5e819f8b9b600f42c03244bd3e189da66cfb89745893503011a0f70164f268a3154672a02c2e047edb8f96c21ab7fedcd01f4bcbed9470
-  data.tar.gz: 3f8c5fdda3a0c5dddb455ecc96d707710cb7d2f2302e9e6dc8b1cd046543cfbec17f182caebe42be78aefc9667306bf5caedb66b5d823ef645d83213732a7b11
+  metadata.gz: 154d40a655e3879b202f46dc0e9b24ac3fca5d17086daba25fcd149bea54fda39e61d9300bee13301851021a1229be5b0001b7155625846c5c8b9d03ae4ad2de
+  data.tar.gz: 9a276040319a850c460b588cc7a1099716b5586bfeb04b36b8122aec0df2e2a25563cc422e6a31fc5d720fd6fad1d371d6a3c585b64e3cd2c5c25323ee365f69

data/acpc_dealer.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |gem|
   gem.platform      = Gem::Platform::RUBY
 
   gem.add_dependency 'clive', '~> 1.2'
-  gem.add_dependency 'process_runner', '~> 0.0'
   gem.add_dependency 'rake-compiler', '~> 0.8'
   gem.add_dependency 'brick_and_mortar', '~> 0.1'
 

data/bin/acpc_dealer

@@ -155,10 +155,15 @@ class AcpcDealerCli < Clive
 
       host_name = if get(:host_name) then get(:host_name) else 'localhost' end
 
-      player = AcpcDealer::EXAMPLE_PLAYERS[number_of_players][betting_type]
-      players_directory = File.dirname(player)
-      FileUtils.cd players_directory
-      ProcessRunner.go [player, host_name, get(:port)]
+      Process.detach(
+        Process.spawn(
+          player,
+          host_name, get(:port),
+          chdir: File.dirname(
+            AcpcDealer::EXAMPLE_PLAYERS[number_of_players][betting_type]
+          )
+        )
+      )
 
       puts "Example player for #{number_of_players} player #{betting_type}, connected to dealer on #{host_name}:#{get(:port)}"
     end

data/lib/acpc_dealer/dealer_runner.rb

@@ -1,5 +1,4 @@
 require 'socket'
-require 'process_runner'
 
 module AcpcDealer
   class DealerRunner
@@ -29,10 +28,14 @@ module AcpcDealer
     # => Defaults to the ACPC Dealer's default.
     # @return [Array] The components of the ACPC Dealer command that would be run (the executable, followed by arguments)
     def self.command_components(dealer_arguments, port_numbers=nil)
-      dealer_start_command = DEALER_COMMAND_FORMAT.inject([AcpcDealer::DEALER_PATH]) do |command_, parameter|
+      dealer_start_command = DEALER_COMMAND_FORMAT.inject(
+        [AcpcDealer::DEALER_PATH]
+      ) do |command_, parameter|
         command_ += dealer_arguments[parameter].to_s.split
       end
-      dealer_start_command << "-p" << "#{port_numbers.join(',')}" if port_numbers
+      if port_numbers
+        dealer_start_command << "-p" << "#{port_numbers.join(',')}"
+      end
       dealer_start_command
     end
 
@@ -49,49 +52,60 @@ module AcpcDealer
     # => Defaults to +<dealer_arguments[:match_name]>.logs+.
     # @param [Array] port_numbers The port numbers to which each player will connect.
     # => Defaults to the ACPC's default.
-    # @return [Hash] The process ID of the started dealer (key +:pid+) and the array of ports that players may
-    # => use to connect to the new dealer instance (key +:port_numbers+).
-    # @raise (see ProcessRunner::go)
+    # @param [Boolean] save_action_log
+    # @param [Hash] options (see Process::spawn)
+    # @raise (see Process::detach)
+    # @raise (see Process::spawn)
     # @raise (see FileUtils::mkdir_p)
-    def self.start(dealer_arguments, log_directory=nil, port_numbers=nil, save_action_log=true)
-      unless log_directory
-        log_directory = File.expand_path("../#{dealer_arguments[:match_name]}.logs", __FILE__)
-      end
-
+    def self.start(
+      dealer_arguments,
+      log_directory=nil,
+      port_numbers=nil,
+      save_action_log=true,
+      options={}
+    )
+      log_directory ||= File.expand_path(
+        "../#{dealer_arguments[:match_name]}.logs",
+        __FILE__
+      )
       FileUtils.mkdir_p log_directory unless Dir.exist?(log_directory)
 
+      options[:chdir] ||= log_directory
+
       IO.pipe do |read_io, write_io|
-        pid = if save_action_log
-          ProcessRunner.go(
-            command_components(dealer_arguments, port_numbers),
-            err: [
-              File.join(log_directory, "#{dealer_arguments[:match_name]}.actions.log"),
-              File::CREAT|File::WRONLY
-            ],
-            out: write_io,
-            chdir: log_directory
-          )
-        else
-          ProcessRunner.go(
-            command_components(dealer_arguments, port_numbers),
-            out: write_io,
-            chdir: log_directory
-          )
+        options[:out] ||= write_io
+        if save_action_log
+          options[:err] = [
+            File.join(
+              log_directory,
+              "#{dealer_arguments[:match_name]}.actions.log"
+            ),
+            File::CREAT|File::WRONLY
+          ]
         end
+        pid = Process.detach(
+          Process.spawn(
+            *command_components(dealer_arguments, port_numbers),
+            options
+          )
+        ).pid
 
-        {pid: pid, port_numbers: read_io.gets.split, log_directory: log_directory}
+        {
+          pid: pid,
+          port_numbers: read_io.gets.split.map(&:to_i),
+          log_directory: log_directory
+        }
       end
     end
 
-    # @todo How could ports be reserved without starting a server? Would +::ports_for_players+ even want to do this?
-
-    # @return [Array<Integer>] List of random open ports. Does NOT reserve the ports though,
-    # => so it's possible that the ports will come into use between calling this method and
-    # => using them.
+    # @return [Array<Integer>] List of arbitrary open ports.
+    # => Does NOT reserve the ports,
+    # => so it's possible that the ports will come into use between calling
+    # => this method and using them.
     def self.ports_for_players(number_of_players)
-      number_of_players.times.inject([]) do |ports, i|
-        ports << TCPServer.open('localhost', 0) { |s| s.addr[1] }
+      number_of_players.times.map do
+        TCPServer.open('localhost', 0) { |s| s.addr[1] }
       end
     end
   end
-end
+end

data/lib/acpc_dealer/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealer
-  VERSION = "3.0.2"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clive
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: process_runner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement