acpc_dealer 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4fa53f651257274bf2aef2413cce48c12293cc2
-  data.tar.gz: df26215d5c964c16c787474f3e3a903979eabec0
+  metadata.gz: 542b5073d045209f50bb901d42889333d11cf2c6
+  data.tar.gz: d2d0ca0919f50b6a8c74e94e45ce3d3785375a5a
 SHA512:
-  metadata.gz: b3d5cf620ff3c03cd4e1fcf9c881866288eeae0e2020dbe7a5d5ad16e8140d840e2f200f26d20a838ef0c6ef5db9613bd0da81741a376a87fe76c6136a0603c2
-  data.tar.gz: f315138fc37434e1941dab2c8c0adf237e7b31fa12f25ceecfbea45960a3b7220153f59509a2b9c609dcf22f7aded0a4543cf58893a27b33d0f8d9443f3cfec8
+  metadata.gz: 02b2d87deefe40a81943b2294f1d8782fc90ebc22c1119653f3257aa680ce784037e860f0c7b55a96af47c10dd83745047c14b5bea4680e428215c97e282fbb2
+  data.tar.gz: 905ddacae6985df06de5155353b6bb6c2b995a60583830158106318cf39f6fd255f79a88680cd309fb08b7afbbf1c8a6f38d2640be54305622f47aba21a71d28

data/Brickfile

@@ -0,0 +1,6 @@
+-
+  name: project_acpc_server
+  version: 41
+  location:
+    method: svn
+    url: http://www.computerpokercompetition.org/repos/project_acpc_server/trunk/

data/README.md

@@ -1,6 +1,8 @@
 ACPC Dealer
 ============
 
+[![Build Status](https://travis-ci.org/dmorrill10/acpc_dealer.svg?branch=master)](https://travis-ci.org/dmorrill10/acpc_dealer)
+
 The [Annual Computer Poker Competition Dealer][ACPC Dealer GitHub] gem wraps the [<em>ACPC Dealer Server</em>][ACPC competition server] in a handy gem with a convenient runner class, and a script for compiling and running the dealer and example players.
 
 ## Installation
@@ -17,15 +19,11 @@ Or install it yourself as:
 
     $ gem install acpc_dealer
 
-Then run (may need to restart your terminal first):
-
-    $ acpc_dealer --compile
-to compile the ACPC Dealer and example players.
 
 ## Usage
 
 Run
-    
+
     $ acpc_dealer -h
 to see a list of commands available in the command line interface.
 
@@ -45,9 +43,12 @@ See the [issue tracker](https://github.com/dmorrill10/acpc_dealer/issues) for cu
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+Please test your changes, otherwise I may not be able to find the time to
+incorporate them into this project.
+
 Copyright
 ---------
-Copyright &copy; 2012 by the Computer Poker Research Group, University of Alberta. See [LICENSE](LICENSE.md) for details.
+Copyright &copy; 2012-2017 by the Computer Poker Research Group, University of Alberta. See [LICENSE](LICENSE.md) for details.
 
 
 <!---

data/Rakefile

@@ -8,15 +8,19 @@ require 'rubygems/package_task'
 
 require File.expand_path('../lib/acpc_dealer/version', __FILE__)
 
-desc 'Build gem'
-task :default => [:test]
+task :default => :test
 
-task :compile => ['dealer:clean', 'dealer:compile']
+desc 'Compile hand_evaluator and dealer'
+task :compile => ['compile:hand_evaluator', 'compile:dealer']
 
+desc 'Run tests'
 task :test => :compile
 
 task :build => :clean
 
+desc 'Remove compiled products'
+task :clean => ['clean:hand_evaluator', 'clean:dealer']
+
 Rake::TestTask.new do |t|
   t.libs << "lib" << 'spec/support'
   t.test_files = FileList['spec/**/*_spec.rb']
@@ -28,25 +32,37 @@ def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../acpc_dealer.gemspec', __FILE__)))
 end
 
-Gem::PackageTask.new(gemspec) { |pkg| }
+Gem::PackageTask.new(gemspec)
 Rake::ExtensionTask.new('hand_evaluator', gemspec)
 
-task :clean => 'dealer:clean' do
-  sh "rm -f lib/hand_evaluator.so"
-end
-
-namespace :dealer do
+namespace :compile do
   desc 'Compile ACPC dealer'
-  task :compile do
+  task :dealer do
     Dir.chdir(File.expand_path('../vendor/project_acpc_server', __FILE__)) do
       sh "make"
     end
   end
+end
+
+namespace :clean do
+  desc 'Clean hand_evaluator'
+  task :hand_evaluator do
+    Dir.chdir(File.expand_path('../ext/hand_evaluator', __FILE__)) do
+      begin
+        sh 'make clean'
+      rescue
+      end
+    end
+    sh "rm -f #{File.expand_path('../lib/hand_evaluator.so', __FILE__)}"
+  end
 
   desc 'Clean ACPC dealer'
-  task :clean do
-    Dir.chdir(File.expand_path('../vendor/project_acpc_server', __FILE__)) do
-      sh "make clean"
+  task :dealer do
+    begin
+      Dir.chdir(File.expand_path('../vendor/project_acpc_server', __FILE__)) do
+        sh "make clean"
+      end
+    rescue Errno::ENOENT
     end
   end
-end
+end

data/acpc_dealer.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   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'
 
   gem.add_development_dependency 'minitest', '~> 5.0'
   gem.add_development_dependency 'mocha', '~> 0.13'
@@ -22,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov', '~> 0.7'
 
   gem.files         = Dir.glob("lib/**/*") + Dir.glob("ext/**/*") + Dir.glob('*.gemspec') +
-    %w(Rakefile README.md) + Dir.glob('spec/**/*') + Dir.glob("vendor/**/*")
+    %w(Rakefile README.md Brickfile) + Dir.glob('spec/**/*')
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.extensions    = Dir.glob("ext/**/extconf.rb")
   gem.require_paths = ["lib"]

data/bin/acpc_dealer

@@ -31,6 +31,10 @@ class AcpcDealerCli < Clive
     game_def
   end
 
+  opt :v, :version, "Display version" do
+    puts AcpcDealer::VERSION
+  end
+
   command :compile, 'Compiles the ACPC Dealer program' do
     opt :c, :clean, 'Do a clean and full recompile' do
       print 'Cleaning...'

data/ext/hand_evaluator/extconf.rb

@@ -2,4 +2,14 @@
 #Run 'ruby -r mkmf extconf.rb' to generate a Makefile
 
 require 'mkmf'
+root_dir = File.expand_path('../../../', __FILE__)
+Dir.chdir(root_dir) do
+  command = "mortar --store #{File.join(root_dir, '.bricks')}"
+  puts "Getting Bricks (non-gem dependencies): `#{command}`"
+  system command
+
+  command = 'rake compile:dealer'
+  puts "Compiling project_acpc_server: `#{command}`"
+  system command
+end
 create_makefile("hand_evaluator")

data/lib/acpc_dealer/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealer
-  VERSION = "2.4.1"
+  VERSION = "3.0.0"
 end

data/spec/dealer_runner_spec.rb

@@ -1,5 +1,5 @@
 require_relative 'support/spec_helper'
-
+require 'timeout'
 require 'socket'
 require 'tmpdir'
 
@@ -8,13 +8,35 @@ require_relative '../lib/acpc_dealer/dealer_runner'
 include AcpcDealer
 
 describe DealerRunner do
-  before do
-    reset_state!
+  let(:various_numbers_of_players) { [2, 3] }
+
+  def cleanup(pid)
+    Process.kill 'KILL', pid
+    begin
+      Timeout::timeout(3) do
+        Process.getpgid(pid)
+        sleep 0.2
+      end
+    rescue Errno::ESRCH
+    else
+      ->() { Process.getpgid(pid) }.must_raise Errno::ESRCH
+    end
+  end
+
+  def check_process_exists(pid)
+    Process.getpgid(pid)
+  rescue Errno::ESRCH => e
+    flunk "Dealer with pid #{pid} does not exist: #{e.message}"
   end
 
-  def reset_state!
-    @pid = nil
-    @port_numbers = nil
+  def check_ports_are_in_use(port_numbers)
+    port_numbers.each do |port|
+      begin
+        Socket.tcp('localhost', port, connect_timeout: 1)
+      rescue
+        flunk "No dealer listening on port #{port}"
+      end
+    end
   end
 
   describe '::ports_for_players' do
@@ -22,7 +44,7 @@ describe DealerRunner do
       various_numbers_of_players.each do |number_of_players|
         DealerRunner.ports_for_players(number_of_players).each do |port|
           begin
-            TCPServer.open('localhost', port) { }
+            TCPServer.open('localhost', port) {}
           rescue Errno::EADDRINUSE => e
             flunk "Port #{port} is not open: #{e.message}"
           end
@@ -31,94 +53,76 @@ describe DealerRunner do
     end
   end
 
+  def in_tmp_dir_with_process_cleanup
+    Dir.mktmpdir do |temp_log_directory|
+      cleanup(yield(temp_log_directory))
+    end
+  end
+
   describe '::start' do
+    let(:options) { ['--start_timeout 1000'].join(' ') }
+    let(:match_name) { 'test_match' }
+    let(:hands) { 10 }
+    let(:random_seed) { 0 }
+
+    def player_names(number_of_players)
+      number_of_players.times.inject([]) do |names, i|
+        names << "p#{i}"
+      end.join(' ')
+    end
+
+    def game_def(number_of_players)
+      GAME_DEFINITION_FILE_PATHS[number_of_players][:limit]
+    end
+
     it 'starts a dealer asynchronously that can clean up after itself and returns both its PID and the ports that each player can use to connect' do
       various_numbers_of_players.each do |number_of_players|
-        Dir.mktmpdir do |temp_log_directory|
-          result = DealerRunner.start(
+        in_tmp_dir_with_process_cleanup do |temp_log_directory|
+          patient = DealerRunner.start(
             {
-              match_name: 'test_match',
-              game_def_file_name: GAME_DEFINITION_FILE_PATHS[number_of_players][:limit],
-              hands: 10,
-              random_seed: 0,
-              player_names: number_of_players.times.inject([]) do |names, i|
-                names << "p#{i}"
-              end.join(' '),
-              options: ['--start_timeout 1000'].join(' ')
+              match_name: match_name,
+              game_def_file_name: game_def(number_of_players),
+              hands: hands,
+              random_seed: random_seed,
+              player_names: player_names(number_of_players),
+              options: options
             },
             temp_log_directory
           )
 
-          @pid = result[:pid]
-          @port_numbers = result[:port_numbers]
-
-          result[:log_directory].must_equal temp_log_directory
-
-          check_ports_are_in_use
-
-          check_process_exists
-
-          cleanup
-          reset_state!
+          patient[:log_directory].must_equal temp_log_directory
+          check_process_exists patient[:pid]
+          check_ports_are_in_use patient[:port_numbers]
+          patient[:pid]
         end
       end
     end
 
     it 'starts a dealer listening on specific ports' do
       various_numbers_of_players.each do |number_of_players|
-        Dir.mktmpdir do |temp_log_directory|
-          port_numbers = [10000, 20000]
-          result = DealerRunner.start(
+        in_tmp_dir_with_process_cleanup do |temp_log_directory|
+          port_numbers = [10_000, 20_000]
+          patient = DealerRunner.start(
             {
-              match_name: 'test_match',
-              game_def_file_name: GAME_DEFINITION_FILE_PATHS[number_of_players][:limit],
-              hands: 10,
-              random_seed: 0,
-              player_names: number_of_players.times.inject([]) do |names, i|
-                names << "p#{i}"
-              end.join(' '),
-              options: ['--start_timeout 1000'].join(' ')
+              match_name: match_name,
+              game_def_file_name: game_def(number_of_players),
+              hands: hands,
+              random_seed: random_seed,
+              player_names: player_names(number_of_players),
+              options: options
             },
             temp_log_directory,
             port_numbers
           )
 
-          @pid = result[:pid]
-          @port_numbers = result[:port_numbers]
-          (@port_numbers.map { |n| n.to_i })[0..port_numbers.length-1].must_equal port_numbers
+          patient[:port_numbers].map(&:to_i)[0..port_numbers.length - 1].must_equal port_numbers
 
-          result[:log_directory].must_equal temp_log_directory
-
-          check_ports_are_in_use
-
-          check_process_exists
-
-          cleanup
-          reset_state!
+          patient[:log_directory].must_equal temp_log_directory
+          check_process_exists patient[:pid]
+          check_ports_are_in_use patient[:port_numbers]
+          patient[:pid]
         end
       end
     end
   end
-
-  def cleanup
-    Process.kill 'KILL', @pid
-    sleep 1
-
-    ->() { Process.getpgid(@pid) }.must_raise Errno::ESRCH
-  end
-  def check_process_exists
-    begin
-      Process.getpgid(@pid)
-    rescue Errno::ESRCH => e
-      flunk "Dealer with pid #{@pid} does not exist: #{e.message}"
-    end
-  end
-  def check_ports_are_in_use
-    @port_numbers.each do |port|
-      ->() do
-        TCPServer.open('localhost', port)
-      end.must_raise Errno::EADDRINUSE
-    end
-  end
-  def various_numbers_of_players() [2, 3] end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clive
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: brick_and_mortar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ extensions:
 - ext/hand_evaluator/extconf.rb
 extra_rdoc_files: []
 files:
+- Brickfile
 - README.md
 - Rakefile
 - acpc_dealer.gemspec
@@ -126,88 +141,10 @@ files:
 - lib/acpc_dealer.rb
 - lib/acpc_dealer/dealer_runner.rb
 - lib/acpc_dealer/version.rb
+- lib/hand_evaluator.bundle
 - spec/connection_information_spec.rb
 - spec/dealer_runner_spec.rb
 - spec/support/spec_helper.rb
-- vendor/project_acpc_server/LICENCE
-- vendor/project_acpc_server/Makefile
-- vendor/project_acpc_server/README
-- vendor/project_acpc_server/README.submission
-- vendor/project_acpc_server/acpc_play_match.pl
-- vendor/project_acpc_server/bm_run_matches.c
-- vendor/project_acpc_server/bm_server.c
-- vendor/project_acpc_server/bm_server.config
-- vendor/project_acpc_server/bm_widget.c
-- vendor/project_acpc_server/dealer.c
-- vendor/project_acpc_server/evalHandTables
-- vendor/project_acpc_server/example_player.c
-- vendor/project_acpc_server/example_player.limit.2p.sh
-- vendor/project_acpc_server/example_player.limit.3p.sh
-- vendor/project_acpc_server/example_player.nolimit.2p.sh
-- vendor/project_acpc_server/example_player.nolimit.3p.sh
-- vendor/project_acpc_server/game.c
-- vendor/project_acpc_server/game.h
-- vendor/project_acpc_server/holdem.limit.2p.reverse_blinds.game
-- vendor/project_acpc_server/holdem.limit.3p.game
-- vendor/project_acpc_server/holdem.nolimit.2p.reverse_blinds.game
-- vendor/project_acpc_server/holdem.nolimit.3p.game
-- vendor/project_acpc_server/kuhn.limit.3p.game
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player.sf1.sh
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player.sf2.sh
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player.sf3.sh
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/LICENCE
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/Makefile
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/README.md
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/CExceptionConfig.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/dealer_connection.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/dealer_connection.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/kuhn_3p_equilibrium_player.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/kuhn_3p_equilibrium_player.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/main.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/player_config.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/src/player_config.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/support/test_helper.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/support/test_helper.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/test_kuhn_3p_equilibrium_player.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/test_kuhn_3p_equilibrium_player_sub_family_1.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/test_kuhn_3p_equilibrium_player_sub_family_2.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/test/test_kuhn_3p_equilibrium_player_sub_family_3.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/docs/license.txt
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/docs/readme.txt
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/lib/CException.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/lib/CException.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/release/build.info
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/cexception/release/version.info
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/History.md
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/Makefile
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/Readme.md
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/package.json
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/src/commander.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/src/commander.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/commander.c/test.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/colour_prompt.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/colour_reporter.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/generate_config.yml
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/generate_module.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/generate_test_runner.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/test_file_filter.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/auto/unity_test_summary.rb
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/docs/Unity Summary.txt
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/docs/license.txt
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/release/build.info
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/release/version.info
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/src/unity.c
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/src/unity.h
-- vendor/project_acpc_server/kuhn_3p_equilibrium_player/vendor/unity/src/unity_internals.h
-- vendor/project_acpc_server/net.c
-- vendor/project_acpc_server/net.h
-- vendor/project_acpc_server/play_match.pl
-- vendor/project_acpc_server/protocol.md
-- vendor/project_acpc_server/protocol.odt
-- vendor/project_acpc_server/protocol.pdf
-- vendor/project_acpc_server/rng.c
-- vendor/project_acpc_server/rng.h
-- vendor/project_acpc_server/validate_submission.pl
 homepage: https://github.com/dmorrill10/acpc_dealer
 licenses:
 - MIT
@@ -228,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the Annual Computer Poker Competition's dealer program.