berlin-ai 0.0.15 → 0.0.16

data/lib/berlin-ai.rb

@@ -12,50 +12,80 @@ puts
   require File.expand_path( File.dirname( __FILE__ ) ) + "/ai/#{file}"
 end
 
+# Sinatra options
+set :app_file, $0
+set :verbose, false
+set :logger, false
+
 # Parse options
 OptionParser.new do |opts|
-  opts.on("-p N", "--port=N", Integer, "Set running port to N") do |p|
+  opts.on("-h", "--help", "Display this screen" ) do
+    puts opts
+    exit
+  end
+  
+  opts.on("-p N", "--port N", Integer, "Set running port to N") do |p|
     set :port, p
   end
   
-  opts.on("--debug", "Run in debug mode (reloads code at each request)") do |d|
-    if d
-      require 'sinatra/reloader'
-      
-      configure do |c|
-        c.also_reload $0
-      end
+  opts.on("-d", "--debug", "Run in debug mode (reloads code at each request)") do
+    require 'sinatra/reloader'
+    
+    configure do |c|
+      c.also_reload $0
     end
   end
+  
+  opts.on("-l", "--log [LOGFILE]", "Create a log file for incoming requests (defaults to 'berlin.log')") do |l|
+    require 'logger'
+    
+    set :logger, Logger.new( l || 'berlin.log' )
+  end
+  
+  opts.on("-v", "--verbose", "Print information to STDOUT") do
+    enable :verbose
+  end
 end.parse!
 
-# Sinatra options
-set :app_file, $0
-
 post '/' do
   begin
     # Check if it's one of the four Berlin keywords
     if ['ping', 'turn', 'game_start', 'game_over'].include? params[:action]
+      log :info, "New request of type #{params[:action]} : #{params.inspect}"
+      
       game = Berlin::AI::Game.create_or_update params[:action], params[:infos], params[:map], params[:state]
 
       if ['ping', 'turn'].include? params[:action]
         # Let the player decides his moves
         Berlin::AI::Player.on_turn( game )
         
+        # Get moves from AI
+        moves = game.moves.to_json
+        
+        # Log time!
+        log :info, "Respond with: #{moves}"
+        
         # Return the response to Berlin
-        return game.moves.to_json
+        return moves
       end
     else
-      p params.inspect
+      log :error, params.inspect
     end
 
     # For every other type of request, respond with 200 OK
     200
   rescue Exception => e
-    p e.inspect
-    p e.backtrace
+    log :fatal, "#{e.inspect}\n#{e.backtrace}"
     
     # Internal server error
     500
   end
 end
+
+def log level, message
+  # verbose
+  puts message if settings.verbose
+  
+  # logger
+  settings.logger.send( level, message ) if settings.logger
+end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Berlin
   module AI
     MAJOR = 0
     MINOR = 0
-    BUILD = 15
+    BUILD = 16
 
     VERSION = "#{MAJOR}.#{MINOR}.#{BUILD}"
   end

data/test/test_ai.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'berlin-ai'
 
-class Berlin::AI::Player
-  def self.on_turn( game )    
-    game.add_move( 1, 2, 12 )
-    game.add_move( 3, 4, 10 )
+class Berlin::AI::Player  
+  def self.on_turn( game )
+    game.add_move( 1, 2, 3 )
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: berlin-ai
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Christian Blais
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -04:00
+date: 2011-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency