berlin-ai 0.0.33 → 0.0.34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    berlin-ai (0.0.29)
+    berlin-ai (0.0.33)
       rainbow (~> 1.1.4)
       sinatra (= 1.4.3)
       sinatra-contrib (= 1.4.1)
@@ -17,7 +17,7 @@ GEM
     eventmachine (1.0.3)
     method_source (0.8.2)
     minitest (4.7.5)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/README.md

@@ -64,7 +64,7 @@ Helper methods to work with nodes.
 ```ruby
 map.directed?          # Determine if a path from A to B is A -> B (directed) or A <-> B (not directed)
 map.nodes              # All the nodes.
-map.owned_nodes        # Owned nodes, including those with 0 soldiers.
+map.owned_nodes        # Your nodes, including those with 0 soldiers.
 map.enemy_nodes        # Enemy nodes.
 map.free_nodes         # Nodes not controlled by anyone.
 map.foreign_nodes      # Nodes not owned (i.e. enemy nodes and free nodes).
@@ -77,6 +77,7 @@ Node objects obtained when querying the map.
 
 ```ruby
 node.id                       # Id of the node.
+node.map                      # The map to which the node belongs to
 node.type                     # Type of node.
 node.player_id                # Owner of the node.
 node.number_of_soldiers       # Number of soldiers on the node.
@@ -85,7 +86,8 @@ node.available_soldiers       # Owned remaining soldiers on this node (result fr
 node.==(other)                # Check if two nodes are the same.
 node.adjacent?(other_node)    # Check if two nodes are adjacents.
 node.occupied?                # Check if some soldiers are on the node.
-node.owned?                   # Check if you own the node.
+node.owned?                   # Check if a player (not only you) owns the node.
+node.mine?                    # Check if you own the node.
 node.free?                    # Check if no one own the node.
 node.owned_by?(player_id)     # Check if the node is owned by a given player.
 node.adjacent_nodes           # Get a list of adjacent nodes.

data/bin/berlin-ai

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'erb'
+require 'optparse'
+
+options = {}
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: berlin-ai [options]'
+
+  opts.on("--init=NAME") do |name|
+   options[:name] = name
+  end
+end.parse!
+
+require File.expand_path('../../lib/version', __FILE__)
+
+name = options[:name]
+
+Dir.mkdir name
+
+%w(Gemfile config.ru ai.rb).each do |file|
+  path = File.expand_path("../../data/#{file}", __FILE__)
+  template = ERB.new(File.read(path))
+
+  File.open(File.expand_path("./#{name}/#{file}"), "w") do |f|
+    f.puts template.result
+  end
+end
+

data/data/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+ruby "1.9.3"
+
+gem 'berlin-ai', '<%= Berlin::AI::VERSION %>'
+gem 'thin'
+
+group :development do
+  gem 'shotgun'
+end

data/data/ai.rb

@@ -0,0 +1,7 @@
+require 'berlin-ai'
+
+class Berlin::AI::Player
+  def self.on_turn(game)
+    # Here goes magic
+  end
+end

data/data/config.ru

@@ -0,0 +1,3 @@
+require './ai'
+
+run Sinatra::Application

data/lib/ai/map.rb

@@ -15,37 +15,27 @@ module Berlin
 
       # Returns an array of all owned nodes
       def owned_nodes
-        nodes.select do |node|
-          node.owned_by?(@player_id)
-        end
+        nodes.select{ |n| n.mine? }
       end
 
       # Returns an array of all enemy nodes
       def enemy_nodes
-        nodes.select do |node|
-          node.owned? && !owned_by?(@player_id)
-        end
+        nodes.select{ |n| n.enemy? }
       end
 
       # Returns an array of all free nodes
       def free_nodes
-        nodes.select do |node|
-          node.free?
-        end
+        nodes.select{ |n| n.free? }
       end
 
       # Returns an array of all nodes that we don't owned
       def foreign_nodes
-        nodes.reject do |node|
-          node.owned_by?(@player_id)
-        end
+        nodes.reject{ |n| n.mine? }
       end
 
       # We can now loop on our owned nodes in order to find our controlled nodes.
       def controlled_nodes
-        owned_nodes.select do |node|
-          node.occupied?
-        end
+        owned_nodes.select{ |n| n.occupied? }
       end
 
       # Is the map directed?

data/lib/ai/map_internal.rb

@@ -21,7 +21,8 @@ module Berlin
             # the node and how many soldiers there is. We'll get back to that later.
             # map['nodes'] => [{:id => STRING}, ...]
             data['nodes'].each do |node|
-              map.nodes_hash[node['id']] = Berlin::AI::Node.parse(node.merge(types[node['type']]))
+              node_data = node.merge(types[node['type']]).merge(:map => map)
+              map.nodes_hash[node['id']] = Berlin::AI::Node.parse(node_data)
             end
 
             # Same thing here, with paths.

data/lib/ai/node.rb

@@ -6,12 +6,12 @@ module Berlin
     class Node
       include Internal
 
-      attr_accessor :id, :player_id, :number_of_soldiers, :incoming_soldiers,
+      attr_accessor :id, :map, :player_id, :number_of_soldiers, :incoming_soldiers,
                     :available_soldiers, :type, :soldiers_per_turn, :points
 
       # Returns true if other_node is adjacent to self
       def adjacent?(other_node)
-        @links.include? other_node
+        @links.include?(other_node)
       end
       
       # Returns true if self has more than zero soldier
@@ -24,6 +24,16 @@ module Berlin
         !!@player_id
       end
 
+      # Returns true if yours
+      def mine?
+        owned_by?(@map.player_id)
+      end
+
+      # Returns true if owned by somebody else than you
+      def enemy?
+        owned? && !mine?
+      end
+
       # Returns true if no one on the node
       def free?
         !owned?
@@ -41,7 +51,7 @@ module Berlin
       
       # Returns a list of all adjacent nodes, plus self
       def adjacent_nodes_and_self
-        adjacent_nodes.push( self )
+        adjacent_nodes.push(self)
       end
     end
   end

data/lib/version.rb

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

data/test/map_test.rb

@@ -9,15 +9,16 @@ require "test/unit"
 class MapTest < Test::Unit::TestCase
 
   def setup
-    @node1 = Berlin::AI::Node.new(:id => 1, :player_id => 1)
-    @node2 = Berlin::AI::Node.new(:id => 2, :player_id => 1)
-    @node3 = Berlin::AI::Node.new(:id => 3, :player_id => nil)
-    @node4 = Berlin::AI::Node.new(:id => 4, :player_id => 2)
-    @node5 = Berlin::AI::Node.new(:id => 5, :player_id => 3)
-
     @map = Berlin::AI::Map.new
     @map.player_id = 1
-    @map.nodes = {1 => @node1, 2 => @node2, 3 => @node3, 4 => @node4, 5 => @node5}
+
+    @node1 = Berlin::AI::Node.new(:id => 1, :map => @map, :player_id => 1, :number_of_soldiers => 0)
+    @node2 = Berlin::AI::Node.new(:id => 2, :map => @map, :player_id => 1, :number_of_soldiers => 3)
+    @node3 = Berlin::AI::Node.new(:id => 3, :map => @map, :player_id => nil)
+    @node4 = Berlin::AI::Node.new(:id => 4, :map => @map, :player_id => 2)
+    @node5 = Berlin::AI::Node.new(:id => 5, :map => @map, :player_id => 3)
+
+    @map.nodes_hash = {1 => @node1, 2 => @node2, 3 => @node3, 4 => @node4, 5 => @node5}
   end
 
   def test_nodes_returns_an_array_of_all_nodes
@@ -28,8 +29,20 @@ class MapTest < Test::Unit::TestCase
     assert_equal [@node1, @node2], @map.owned_nodes
   end
 
-  def test_foreign_nodes_returns_and_array_of_nodes_that_the_current_player_does_not_owned
+  def test_foreign_nodes_returns_an_array_of_nodes_that_the_current_player_does_not_owned
     assert_equal [@node3, @node4, @node5], @map.foreign_nodes
   end
 
+  def test_enemy_nodes_returns_an_array_of_nodes_owned_by_other_players
+    assert_equal [@node4, @node5], @map.enemy_nodes
+  end
+
+  def test_free_nodes_returns_an_array_of_free_nodes
+    assert_equal [@node3], @map.free_nodes
+  end
+
+  def test_controlled_nodes_returns_an_array_of_owned_nodes_with_at_least_one_soldier
+    assert_equal [@node2], @map.controlled_nodes
+  end
+
 end

data/test/node_test.rb

@@ -18,7 +18,9 @@ class NodeTest < Test::Unit::TestCase
 
   def test_reset_resets_all_turn_relative_data
     node = Berlin::AI::Node.new(:number_of_soldiers => 2, :incoming_soldiers => 3, :available_soldiers => 4)
+    
     node.reset!
+    
     assert_equal 0, node.incoming_soldiers
     assert_equal node.number_of_soldiers, node.available_soldiers
   end
@@ -34,7 +36,7 @@ class NodeTest < Test::Unit::TestCase
     assert !node1.adjacent?(node3)
   end
 
-  def test_occupied_returns_true_if_the_node_has_at_least_one_soldiers
+  def test_occupied_returns_true_if_the_node_has_at_least_one_soldier
     node = Berlin::AI::Node.new
 
     assert !node.occupied?
@@ -73,5 +75,18 @@ class NodeTest < Test::Unit::TestCase
 
     assert node.owned?
   end
+
+  def test_mine_returns_true_if_owned_by_current_player
+    Struct.new('Map', :player_id)
+    node = Berlin::AI::Node.new
+
+    node.map = Struct::Map.new(1)
+
+    assert !node.mine?
+
+    node.player_id = 1
+    
+    assert node.mine?
+  end
  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berlin-ai
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -139,6 +139,10 @@ files:
 - LICENSE
 - README.md
 - berlin-ai.gemspec
+- bin/berlin-ai
+- data/Gemfile
+- data/ai.rb
+- data/config.ru
 - lib/ai/fake.rb
 - lib/ai/game.rb
 - lib/ai/game_internal.rb