berlin-ai 0.0.26 → 0.0.27

data/berlin-ai.gemspec

@@ -10,16 +10,15 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Christian Blais", "Guillaume Malette", "Jodi Giordano"]
   s.email        = ["christ.blais@gmail.com", "gmalette@gmail.com", "giordano.jodi@gmail.com"]
-  s.homepage     = "http://github.com/christianblais/berlin-ai"
+  s.homepage     = "http://github.com/thirdside/berlin-ai"
   s.summary      = "Berlin Artificial Intelligence"
   s.description  = "Berlin Artificial Intelligence"
 
-  s.add_dependency 'sinatra', '>=1.2.6'
-  s.add_dependency 'yajl-ruby', '>=0.8.2'
-  s.add_dependency 'sinatra-reloader', '>=0.5.0'
+  s.add_dependency 'sinatra', '1.4.3'
+  s.add_dependency 'yajl-ruby', '1.1.0'
+  s.add_dependency 'sinatra-contrib', '1.4.1'
   s.add_dependency 'rainbow', '~>1.1.4'
-
-  s.add_dependency 'thin'
+  s.add_dependency 'thin', '1.5.1'
 
   s.files = `git ls-files`.split("\n")
 

data/lib/berlin-ai.rb

@@ -3,19 +3,22 @@ require 'sinatra'
 require 'logger'
 require 'yajl/json_gem'
 
-# puts " __                  __ __             _______ _______ "
-# puts "|  |--..-----..----.|  |__|.-----.    |   _   |_     _|"
-# puts "|  _  ||  -__||   _||  |  ||     |    |       |_|   |_ "
-# puts "|_____||_____||__|  |__|__||__|__|    |___|___|_______|"
-# puts
+puts " __                  __ __             _______ _______ "
+puts "|  |--..-----..----.|  |__|.-----.    |   _   |_     _|"
+puts "|  _  ||  -__||   _||  |  ||     |    |       |_|   |_ "
+puts "|_____||_____||__|  |__|__||__|__|    |___|___|_______|"
+puts
 
 %w(game map node fake).each do |file|
-  require File.expand_path( File.dirname( __FILE__ ) ) + "/ai/#{file}"
+  require File.expand_path(File.dirname( __FILE__ )) + "/ai/#{file}"
 end
 
 set :verbose, true
 set :logger, Logger.new(STDOUT)
 
+# set tests to false
+$test_ais = false
+
 # Parse options
 OptionParser.new do |opts|
   opts.on("-h", "--help", "Display this screen" ) do
@@ -36,8 +39,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("-l", "--log [LOGFILE]", "Create a log file for incoming requests (defaults to 'berlin.log')") do |l|
-
-    set :logger, Logger.new( l || 'berlin.log' )
+    set :logger, Logger.new(l || 'berlin.log')
   end
 
   opts.on("-t N", "--test N", Integer, "Test against N random AI") do |t|
@@ -56,17 +58,17 @@ end.parse!
 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}"
+    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]
+      game = Berlin::AI::Game.create_or_update(params[:action], params[:infos], params[:map], params[:state])
 
-      if ['ping', 'turn'].include? params[:action]
+      if ['ping', 'turn'].include?(params[:action])
         # Clear old moves
         game.clear_moves
 
         # Let the player decides his moves
-        Berlin::AI::Player.on_turn( game )
+        Berlin::AI::Player.on_turn(game)
 
         # Get moves from AI
         moves = game.moves.to_json
@@ -96,13 +98,11 @@ def log level, message
   puts message if settings.verbose
 
   # logger
-  settings.logger.send( level, message ) if settings.logger
+  settings.logger.send(level, message) if settings.logger
 end
 
 if $test_ais
-  at_exit {
-    Berlin::Fake::Game.new($test_ais).run
-  }
+  at_exit { Berlin::Fake::Game.new($test_ais).run }
 else
   set :app_file, $0
 end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berlin-ai
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -11,56 +11,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: sinatra-reloader
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -82,17 +82,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 description: Berlin Artificial Intelligence
 email:
 - christ.blais@gmail.com
@@ -113,7 +113,7 @@ files:
 - lib/berlin-ai.rb
 - lib/version.rb
 - test/test_ai.rb
-homepage: http://github.com/christianblais/berlin-ai
+homepage: http://github.com/thirdside/berlin-ai
 licenses: []
 post_install_message: 
 rdoc_options: []