acpc_dealer 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f7eec13aa813b442c16584169492fc05f0de90
-  data.tar.gz: 90bdd31f03f7136dbb5b8249a1c910b9bde112ac
+  metadata.gz: 78ed614e19d26963f88c9fd399ff6a8f877f3fef
+  data.tar.gz: aa460540fa0fc27e2df007b3f18087e372d3faf5
 SHA512:
-  metadata.gz: 8e45011051f0a05905273f1ebe342d783431fde57bb412032f893a7ac475e4182685d5b57aac9067d1aa85db31931b5bd37bb403641f50284f06af95184ce9db
-  data.tar.gz: fccf0a2cb8757086c334b7093752aaf4eca73da134bd1c3772e5428e785390a4eb7638214a2e74e8fc7bc88551fd76b65e0b99175f779fda0ab4f0d0eab8db16
+  metadata.gz: dba4619111a26f5489f302a47a6006afbb293cb12f718d12a79fcbbe51f66a13dd40e2fe39df40ec4816da99a4a7254d23ee50686f1d4ecffa2d50491b6c2734
+  data.tar.gz: c4214f79d46b692e5fae27dcce538066da69e0681f729fadeb5a51039e89d12821bf337ed6ca7b55b6daade5ef294e255803a2f2540200e7b99152d502197568

data/lib/acpc_dealer/dealer_runner.rb

@@ -10,17 +10,17 @@ class DealerRunner
   # => (see ::start)
   DEALER_COMMAND_FORMAT = [
     # @note The name of the match to start.
-    :match_name, 
+    :match_name,
     # @note The path of the game definition to use.
-    :game_def_file_name, 
+    :game_def_file_name,
     # @note The number of hands to play.
     :hands,
     # @note The random seed to use.
-    :random_seed, 
+    :random_seed,
     # @note The names of the players in the game. Should be specified as a space delimited string of names.
     :player_names,
     # @note Should be specified as an option string that the dealer will understand.
-    :options 
+    :options
   ]
 
   # @param [Array] dealer_arguments Arguments to the new dealer instance.
@@ -28,27 +28,27 @@ class DealerRunner
   # => Defaults to +<dealer_arguments[:match_name]>.logs+.
   # @param [Array] port_numbers The port numbers to which each player will connect.
   # => Defaults to random.
-  # @return [Hash] The process ID of the started dealer (key +:pid+) and the array of ports that players may 
+  # @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)
   # @raise (see FileUtils::mkdir_p)
   def self.start(dealer_arguments, log_directory=nil, port_numbers=nil)
     dealer_start_command = DEALER_COMMAND_FORMAT.inject([AcpcDealer::DEALER_PATH]) do |command, parameter|
       command << dealer_arguments[parameter].to_s
-    end 
+    end
     dealer_start_command << "-p #{port_numbers.join(',')}" if port_numbers
 
     unless log_directory
       log_directory = File.expand_path("../#{dealer_arguments[:match_name]}.logs", __FILE__)
     end
 
-    FileUtils.mkdir_p log_directory
+    FileUtils.mkdir_p log_directory unless Dir.exist?(log_directory)
 
     IO.pipe do |read_io, write_io|
       pid = ProcessRunner.go(
-        dealer_start_command, 
+        dealer_start_command,
         err: [
-          "#{dealer_arguments[:match_name]}.actions.log", 
+          File.join(log_directory, "#{dealer_arguments[:match_name]}.actions.log"),
           File::CREAT|File::WRONLY
         ],
         out: write_io,

data/lib/acpc_dealer/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealer
-  VERSION = "0.0.3"
-end
+  VERSION = "0.0.5"
+end

data/vendor/project_acpc_server/dealer.c

@@ -127,7 +127,7 @@ static void initErrorInfo( const uint32_t maxInvalidActions,
     info->usedMatchMicros[ s ] = 0;
   }
 }
-		    
+
 
 /* update the number of invalid actions for seat
    returns >= 0 if match should continue, -1 for failure */
@@ -704,8 +704,8 @@ static int printFinalMessage( const Game *game, char *seatName[ MAX_PLAYERS ],
 
    actions are read/sent to seat p on seatFD[ p ]
 
-   if quiet is not zero, only print out errors, warnings, and final value   
-   
+   if quiet is not zero, only print out errors, warnings, and final value
+
    if logFile is not NULL, print out a single line for each completed
    match with the final state and all player values.  The values are
    printed in player, not seat order.
@@ -1186,7 +1186,7 @@ int main( int argc, char **argv )
       fprintf( stderr, "ERROR: could not open transaction file %s\n", name );
       exit( EXIT_FAILURE );
     }
-  } else { 
+  } else {
     /* no transaction file */
 
     transactionFile = NULL;
@@ -1275,8 +1275,12 @@ int main( int argc, char **argv )
     exit( EXIT_FAILURE );
   }
 
-  fflush( stderr );
-  fflush( stdout );
+  //fflush( stderr );
+  //fflush( stdout );
+  // Otherwise the last line or two of the log file
+  // won't be written sometimes when run through a
+  // Ruby interface.
+  fflush(NULL);
   if( transactionFile != NULL ) {
     fclose( transactionFile );
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clive