UG_RRobots 1.2 → 1.3

data/COPYRIGHT.txt

@@ -0,0 +1,6 @@
+UG RRobots
+Fork du projet RRobots
+(c) Simon Kröger
+Ruby license (http://www.ruby-lang.org/en/LICENSE.txt).
+Co-author Fork (c) Romain GEORGES 
+

data/RakeFile

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'rake'
+require "rake/clean"
+require "rake/gempackagetask"
+
+spec = Gem::Specification.new do |s| 
+  s.name = "UG_RRobots"
+  s.version = "1.3"
+  s.author = "Simon Kröger, Romain GEORGES"
+  s.email = "dev@ultragreen.net"
+  s.homepage = "http://www.ultragreen.net/projects/rrobots"
+  s.platform = Gem::Platform::RUBY
+  s.summary = "Ultragreen RRobots Fork with new features like toolboxes, config file, gemified"
+  s.files = FileList["{bin,lib,images,config,doc,contribs,robots}/**/*"].to_a.concat(['COPYRIGHT.txt','RakeFile'])
+  s.require_path = "lib"
+  #  s.autorequire = "name"
+  #  s.test_files = FileList["{test}/**/*test.rb"].to_a
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["doc/manual.rdoc","doc/manual_fr.rdoc"].concat(FileList["bin/*"].to_a)
+  #  s.add_dependency("dependency", ">= 0.x.x")
+  s.bindir = 'bin'
+  s.executables = ['rrobots','tournament']
+  s.description = "Ultragreen RRobots Fork"
+  s.rdoc_options << '--title' << 'UG RRobots a RRobots project Fork ' << '--main' << 'doc/manual.rdoc' << '--line-numbers' << '--exclude' << 'robots images' << '--diagram' 
+end
+ 
+Rake::GemPackageTask.new(spec) do |pkg| 
+  pkg.need_tar = true 
+end

data/bin/rrobots

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'misc'
 require 'robot'
 require 'yaml'
 require 'overloads'
@@ -14,7 +15,9 @@ require 'bullets'
 ##############################################
 
 def usage
-  puts "usage: rrobots.rb [resolution] [#match] [-nogui] [-speed=<N>] [-timeout=<N>] [-teams=<N>] [-with-toolboxes] <FirstRobotClassName[.rb]> <SecondRobotClassName[.rb]> <...>"
+  puts "usage: rrobots [resolution] [#match] [-nogui] [-speed=<N>] [-timeout=<N>] [-teams=<N>] [-with-toolboxes] <FirstRobotClassName[.rb]> <SecondRobotClassName[.rb]> <...>"
+  puts "Or : rrobots -list-internals"
+  puts "\t[-list-internals] (exclusive) give the list of avaibles internals Robots"
   puts "\t[resolution] (optional) should be of the form 640x480 or 800*600. default is 800x800"
   puts "\t[match] (optional) to replay a match, put the match# here, including the #sign.  "
   puts "\t[-nogui] (optional) run the match without the gui, for highest possible speed.(ignores speed value if present)"
@@ -94,8 +97,37 @@ def print_outcome(battlefield)
   end
 end
 
+
+
+
+def hash_internals
+  my_res = Hash::new
+  robots_path = gem_path('robots')
+  Dir["#{robots_path}/*.rb"].each  {|file| 
+    robots = File.basename(file, ".rb")
+    my_res[robots] = file
+  }
+  return my_res
+end
+
+def list_internals
+  title = "List of avaibles internals robots :"
+  puts title
+  puts "-"*title.size
+  hash_internals.each do |key,value|
+    puts " - #{key}"
+  end
+end
+
+
 $stdout.sync = true
 
+# look for query for robots internal list
+ARGV.grep(/^(-list-internals)/) do |item|
+  list_internals 
+  exit 0
+end
+
 # look for resolution arg
 xres, yres = 800, 800
 ARGV.grep(/^(\d+)[x\*](\d+$)/) do |item|
@@ -171,6 +203,8 @@ battlefield = Battlefield.new xres*2, yres*2, timeout, seed, with_toolboxes, mer
 
 c = 0
 team_divider = (ARGV.size / teams.size.to_f).ceil
+
+
 ARGV.map! do |robot|
   begin
     begin
@@ -180,6 +214,10 @@ ARGV.map! do |robot|
     begin
       require robot
     rescue LoadError
+    end
+    begin 
+      require hash_internals[robot]
+    rescue LoadError
   end
   in_game_name = File.basename(robot).sub(/\..*$/, '')
   in_game_name[0] = in_game_name[0,1].upcase

data/lib/battlefield.rb

@@ -1,3 +1,4 @@
+
 class Battlefield
    attr_reader :width
    attr_reader :height
@@ -15,14 +16,19 @@ class Battlefield
    attr_reader :config
 
   def initialize width, height, timeout, seed, with_toolboxes, merge, write_config
+    filename = "rrobots.yml"
     @config = Configuration::new
-    if merge and File::exist?('./rrobots.yml') then
-      file = YAML::load(File.open('./rrobots.yml')) 
+    @path_prefix = gem_path('config')
+    config_sources  = [@path_prefix]
+    config_sources.push "." if merge and File::exist?('./rrobots.yml') 
+    config_sources.each do |filepath|
+      file = YAML::load(File.open("#{filepath}/#{filename}")) 
       file.extend(Configuration_accessors)
       [:game, :toolboxes, :robots, :bullets, :battlefield].each do |accessor|
         @config.send(accessor).merge(file.send(accessor))
       end
     end
+    
     @config.write_config if write_config
     @width = (width != self.config.battlefield[:width]) ? width : self.config.battlefield[:width]
     @height = (height != self.config.battlefield[:height]) ? height : self.config.battlefield[:height]

data/lib/configuration.rb

@@ -10,12 +10,14 @@ class Configuration
   
   include Configuration_accessors
   
-  def write_config
-    File.unlink('./rrobots.yml') if File::exist?('./rrobots.yml')
-    File.open('./rrobots.yml', 'w') { |f| f.puts self.to_yaml }
+  def write_config(path='.')
+    filepath = "#{path}/#{@filename}"
+    File.unlink(filepath) if File::exist?(filepath)
+    File.open(filepath, 'w') { |f| f.puts self.to_yaml }
   end
 
-  def initialize
+  def initialize(filename="rrobots.yml")
+    @filename = filename
     @game = { :timeout => 50000 }
     @toolboxes = { :with_toolboxes => false, :life_time => 200, :spawning_chances => 100, :energy_heal_points => 20 }
     @robots = { :energy_max => 100 }

data/lib/tkarena.rb

@@ -16,13 +16,8 @@ class TkArena
     @speed_multiplier = speed_multiplier
     @text_colors = ['#ff0000', '#00ff00', '#0000ff', '#ffff00', '#00ffff', '#ff00ff', '#ffffff', '#777777']
     
-    # TODO : Perhaps a better way to do it ...
-    # regarder Rubygems pour avoir le path direct ..
-    table_map = Gem.location_of_caller.first.split('/')
-    2.times do 
-      table_map.pop
-    end
-    @path_prefix = table_map.join('/')
+    
+    @path_prefix = gem_path
     
     @default_skin_prefix = "images/red_"
     @on_game_over_handlers = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: UG_RRobots
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - "Simon Kr\xC3\xB6ger, Romain GEORGES"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +01:00
+date: 2009-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,8 @@ extensions: []
 extra_rdoc_files: 
 - doc/manual.rdoc
 - doc/manual_fr.rdoc
+- bin/rrobots
+- bin/tournament
 files: 
 - bin/rrobots
 - bin/tournament
@@ -188,13 +190,22 @@ files:
 - robots/SittingDuck.rb
 - robots/SniperDuck.rb
 - robots/WallPainter.rb
+- COPYRIGHT.txt
+- RakeFile
 has_rdoc: true
 homepage: http://www.ultragreen.net/projects/rrobots
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --title
+- "UG RRobots a RRobots project Fork "
+- --main
+- doc/manual.rdoc
+- --line-numbers
+- --exclude
+- robots images
+- --diagram
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement