rubygoal 0.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc8e60812239eff9bfbf2a776ae500a85de10ee
-  data.tar.gz: d7bc53eac176874eff82bad63e6df77aa427ce39
+  metadata.gz: 7a9f36e4a9184d9837b4834ab1449995676e02ca
+  data.tar.gz: 6c5e76bef10ba32174430b6ffd68e175eebdb463
 SHA512:
-  metadata.gz: f837c177433fdb22d6d015eb31e8b37aa64b4ba5ee3c8ea32c95d4bb24dbb11316a56770fc3847f5ab270073f3a869e603fe43e926ca5e25b9987c4478bfabd2
-  data.tar.gz: 60666ea38e195caee11e3a4bf97c634c8d17307342deab737da07470dfaa611624912dc4411b9098cf69fa5ec3871c5f8674a08591a82a0c4f3a66bf3a075386
+  metadata.gz: 256936663d874aeb3a2c9a690af37da3bc43811c98442d3f73b2321ccc9eb9ea52d3f4466b5964e6d84fa15f5c5398399fe4e8fc47053db2c58a7fd5e87538a9
+  data.tar.gz: 135a5704aea61868d8286e619821a56db2e7c923ead040dd1c97d2aa0d5b73b9e2f9067897df4f624e74e4e9ff19d095d71f6b06301bc7201e6fa31921bb86d4

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright 2014 Jorge Bejar
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-----
+
+This does not apply to files under the "media/" folder. For licensing of
+those files refer to the Legal section in the README.md file.

data/README.md

@@ -1,62 +1,85 @@
-#Bienvenidos a RubyGoal!
+[![Build Status](https://travis-ci.org/wyeworks/rubygoal.png)](https://travis-ci.org/wyeworks/rubygoal)
+[![Code Climate](https://codeclimate.com/github/wyeworks/rubygoal.png)](https://codeclimate.com/github/wyeworks/rubygoal)
+[![Inline docs](http://inch-ci.org/github/wyeworks/rubygoal.png?branch=master)](http://inch-ci.org/github/wyeworks/rubygoal)
 
-## ¿Qué es RubyGoal?
+#Welcome to RubyGoal!
 
-RubyGoal es un juego en el cual tú serás el coach de un equipo de
-fútbol.
+## What is RubyGoal?
 
-La estrategia del coach la vas a tener que implementar tú en ruby.
+RubyGoal is a game in which you will be coaching your football team.
 
-## Dependencias
+You will be coding your strategy in RUBY :D .
 
-GNU/Linux, Asegúrate tener todas las dependencias instaladas.
+## Dependencies
+
+GNU/Linux, Make sure you have all dependencies installed.
 
 Ubuntu/Debian:
 
 ```bash
 # Gosu's dependencies for both C++ and Ruby
-sudo apt-get install build-essential freeglut3-dev libfreeimage-dev libgl1-mesa-dev \
-                     libopenal-dev libpango1.0-dev libsdl-ttf2.0-dev libsndfile-dev \
-                     libxinerama-dev
+sudo apt-get install build-essential libsdl2-dev libsdl2-ttf-dev
+libpango1.0-dev \
+                     libgl1-mesa-dev libfreeimage-dev libopenal-dev
+                     libsndfile-dev
 ```
 
-Para otras distros: https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
+For other distros:  https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 
-## ¿Cómo hago para correrlo?
+## How do i run it?
 
 ```bash
 gem install rubygoal
 ```
 
-Correr el juego con los `Coach` de ejemplo
+Run the game with example `CoachDefinition`
 ```bash
 rubygoal
 ```
 
-Correr el juego con tu implementación de `Coach`
+Run the game with your custom `CoachDefinition` implementation
 ```bash
 rubygoal coach_1.rb
 ```
 
-Correr el juego con tu implementación de ambos `Coach`
+Run the game with your home and away `CoachDefinition` implementations
 ```bash
 rubygoal coach_1.rb coach_2.rb
 ```
 
-## ¿Cómo hago para implementar mi Coach?
+If you want to run the game from the source code, clone the project and
+run the following commands:
 
-Mirate los `Coach` ya definidos en `lib/rubygoal/coaches`, sobre todo lee con
-atención y en su totalidad `lib/rubygoal/coaches/template.rb`
+```bash
+BUNDLE_GEMFILE=Gemfile.dev bundle install
+BUNDLE_GEMFILE=Gemfile.dev bundle exec ruby gui/bin/rubygoal [coach_file] [coach_file]
+```
 
-## Legal
+Also, you can simulate a game without the GUI by running
+
+```bash
+bundle install
+bundle exec ruby bin/rubygoal [coach_file] [coach_file]
+```
 
-Todo el código fuente, salvo los archivos bajo la carpeta `media/`, está
-licenciado bajo los términos de la licencia del MIT. Ver el archivo `MIT-LICENSE`
-bajo la ruta de la gema.
+When you simuate a game, a JSON file is created in the same folder. You
+could run this using our experiment webcomponent to play Rubygoal in the
+web: https://github.com/jmbejar/rubygoal-webplayer
+
+## How do i write my own coach class?
+
+You can find a complete guide explaining how to program a coach in
+www.rubygoal.com
+
+Aditionally, you can take a look to the already defined `CoachDefinition` at
+`lib/rubygoal/coach_definition`.
+Specially pay attention to the example coaches in `lib/rubygoal/coaches/`
+
+
+## Legal
+All source code, except the files under the `media/` folder, is
+licensed under the Apache License 2.0. Please see the `LICENSE` file under
+the gem root folder.
 
-La imagen de Alberto Kesman utilizada en el archivo `media/goal.png` fue
-tomada de https://commons.wikimedia.org/wiki/File:Albertok.jpg que se
-encuentra licenciada bajo los términos de la licencia CC-BY-SA 3.0
-(https://creativecommons.org/licenses/by-sa/3.0/deed.es). Como
-consecuencia, el archivo `media/goal.png` queda licenciado también bajo
-esta licencia como trabajo derivado.
+All media files under the `media/` folder are licensed under the Creative
+Commons 4.0 Attribution license. Please see https://creativecommons.org/licenses/by/4.0/

data/bin/rubygoal

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
 
-require 'rubygoal'
-Rubygoal.start
+require 'rubygoal/gui'
+Rubygoal::Gui.start

data/lib/rubygoal/gui/ball.rb

@@ -0,0 +1,26 @@
+require 'gosu'
+
+module Rubygoal::Gui
+  class Ball
+    IMAGE_SIZE = 20
+
+    def initialize(window, ball)
+      @ball = ball
+
+      image_path = File.dirname(__FILE__) + '/../../../media/ball.png'
+      @image = Gosu::Image.new(window, image_path, false)
+    end
+
+    def draw
+      half_side_lenght = IMAGE_SIZE / 2
+      image_center_x = ball.position.x - half_side_lenght
+      image_center_y = ball.position.y - half_side_lenght
+
+      image.draw(image_center_x, image_center_y, 1)
+    end
+
+    private
+
+    attr_reader :ball, :image
+  end
+end

data/lib/rubygoal/gui/field.rb

@@ -0,0 +1,21 @@
+require 'gosu'
+
+require 'rubygoal/gui/ball'
+require 'rubygoal/gui/players'
+
+module Rubygoal::Gui
+  class Field
+    def initialize(window)
+      image_path = File.dirname(__FILE__) + '/../../../media/background.png'
+      @background_image = Gosu::Image.new(window, image_path, true)
+    end
+
+    def draw
+      background_image.draw(0, 0, 0);
+    end
+
+    private
+
+    attr_reader :background_image
+  end
+end

data/lib/rubygoal/gui/game.rb

@@ -0,0 +1,166 @@
+require 'gosu'
+
+require 'rubygoal/gui/goal'
+require 'rubygoal/gui/field'
+require 'rubygoal/gui/ball'
+require 'rubygoal/gui/players'
+
+require 'rubygoal/coordinate'
+require 'rubygoal/game'
+
+module Rubygoal::Gui
+  class Game < Gosu::Window
+    WINDOW_WIDTH  = 1920
+    WINDOW_HEIGHT = 1080
+
+    TIME_LABEL_POSITION       = Rubygoal::Position.new(870, 68)
+    SCORE_HOME_LABEL_POSITION = Rubygoal::Position.new(1150, 68)
+    SCORE_AWAY_LABEL_POSITION = Rubygoal::Position.new(1220, 68)
+
+    TEAM_NAME_HOME_LABEL_POSITION = Rubygoal::Position.new(105, 580)
+    TEAM_NAME_AWAY_LABEL_POSITION = Rubygoal::Position.new(1815, 580)
+
+    DEFAULT_FONT_SIZE = 48
+
+    LABEL_IMAGE_FONT_SIZE = 64
+    LABEL_IMAGE_WIDTH     = 669
+
+    def initialize(game)
+      super(WINDOW_WIDTH, WINDOW_HEIGHT, false)
+      self.caption = "Ruby Goal"
+
+      @game = game
+
+      @gui_field = Field.new(self)
+      @gui_goal = Goal.new(self)
+      @gui_ball = Ball.new(self, game.ball)
+      @gui_players = players.map { |p| Players.new(self, p) }
+
+      @font = Gosu::Font.new(
+        self,
+        Gosu.default_font_name,
+        DEFAULT_FONT_SIZE
+      )
+
+      @home_team_label = create_label_image(game.coach_home.name)
+      @away_team_label = create_label_image(game.coach_away.name)
+    end
+
+    def update
+      game.update
+    end
+
+    def draw
+      gui_field.draw
+      gui_ball.draw
+      gui_players.each(&:draw)
+
+      draw_scoreboard
+      draw_team_labels
+      gui_goal.draw if game.celebrating_goal?
+    end
+
+    def button_down(id)
+      if id == Gosu::KbEscape
+        close
+      end
+    end
+
+    private
+
+    def players
+      game.players
+    end
+
+    def create_label_image(name)
+      name_characters_limit = 20
+      name = truncate_label(name, name_characters_limit)
+
+      font_name    = Gosu.default_font_name
+      font_size    = LABEL_IMAGE_FONT_SIZE
+      line_spacing = 1
+      label_width  = LABEL_IMAGE_WIDTH
+      alignment    = :center
+
+      Gosu::Image.from_text(
+        self,
+        name,
+        font_name,
+        font_size,
+        line_spacing,
+        label_width,
+        alignment
+      )
+    end
+
+    def truncate_label(name, limit)
+      words = name.split
+
+      left = limit
+      truncated = []
+      words.each do |word|
+        break unless left > 0
+
+        truncated << word
+        left -= word.length + 1
+      end
+
+      truncated.join(' ')
+    end
+
+    def draw_scoreboard
+      draw_text(time_text, TIME_LABEL_POSITION, :gray)
+      draw_text(game.score_home.to_s, SCORE_HOME_LABEL_POSITION, :white)
+      draw_text(game.score_away.to_s, SCORE_AWAY_LABEL_POSITION, :white)
+    end
+
+    def draw_team_labels
+      draw_vertical_text(home_team_label, TEAM_NAME_HOME_LABEL_POSITION, :down)
+      draw_vertical_text(away_team_label, TEAM_NAME_AWAY_LABEL_POSITION, :up)
+    end
+
+    def draw_text(text, position, color, scale = 1)
+      horizontal_alignment = 0.5
+      vertical_alignment   = 0.5
+      z_order              = 1
+      horizontal_scale     = scale
+      vertical_scale       = scale
+
+      font.draw_rel(
+        text,
+        position.x,
+        position.y,
+        horizontal_alignment,
+        vertical_alignment,
+        z_order,
+        horizontal_scale,
+        vertical_scale,
+        color_to_hex(color)
+      )
+    end
+
+    def draw_vertical_text(label, position, direction = :down)
+      angle = direction == :down ? -90 : 90
+      label.draw_rot(position.x, position.y, 1, angle)
+    end
+
+    def time_text
+      minutes = Integer(game.time) / 60
+      seconds = Integer(game.time) % 60
+      "%d:%02d" % [minutes, seconds]
+    end
+
+    def color_to_hex(color)
+      case color
+      when :white
+        0xffffffff
+      when :gray
+        0xff6d6e70
+      end
+    end
+
+    attr_reader :game, :gui_field, :gui_goal,
+                :gui_ball, :gui_players,
+                :font, :home_team_label, :away_team_label
+  end
+end

data/lib/rubygoal/gui/goal.rb

@@ -0,0 +1,23 @@
+require 'gosu'
+
+require 'rubygoal/coordinate'
+
+module Rubygoal::Gui
+  class Goal
+    CELEBRATION_IMAGE_POSITION = Rubygoal::Position.new(680, 466)
+
+    def initialize(window)
+      image_path = File.dirname(__FILE__) + '/../../../media/goal.png'
+      @image = Gosu::Image.new(window, image_path, true)
+    end
+
+    def draw
+      position = CELEBRATION_IMAGE_POSITION
+      image.draw(position.x, position.y, 1)
+    end
+
+    private
+
+    attr_reader :image
+  end
+end

data/lib/rubygoal/gui/players.rb

@@ -0,0 +1,28 @@
+require 'gosu'
+require 'forwardable'
+
+require 'rubygoal/util'
+
+module Rubygoal::Gui
+  class Players
+    extend Forwardable
+    def_delegators :player, :type, :side, :position, :destination, :rotation, :moving?
+
+    def initialize(window, player)
+      @player = player
+      @image = Gosu::Image.new(window, image_filename, false)
+    end
+
+    def draw
+      image.draw_rot(position.x, position.y, 1, rotation - 180)
+    end
+
+    private
+
+    def image_filename
+      File.dirname(__FILE__) + "/../../../media/#{type}_#{side}.png"
+    end
+
+    attr_reader :player, :image
+  end
+end

data/lib/rubygoal/gui/version.rb

@@ -0,0 +1,5 @@
+module Rubygoal
+  module Gui
+    VERSION = Gem::Version.new '2.0.0'
+  end
+end

data/lib/rubygoal/gui.rb

@@ -0,0 +1,20 @@
+require 'rubygoal'
+require 'rubygoal/gui/game'
+
+module Rubygoal
+  module Gui
+    class << self
+      def start
+        game = Rubygoal::Game.new(load_coach(:home), load_coach(:away))
+        gui = Game.new(game)
+        gui.show
+      end
+
+      private
+
+      def load_coach(side)
+        CoachLoader.new(side).coach
+      end
+    end
+  end
+end

data/lib/rubygoal.rb

@@ -1,7 +1,18 @@
-require 'rubygoal/game'
+require 'rubygoal-core'
+require 'rubygoal/gui/game'
 
 module Rubygoal
-  def self.start
-    Game.new.show
+  class << self
+    def start
+      game = Game.new(load_coach(:home), load_coach(:away))
+      gui = Gui::Game.new(game)
+      gui.show
+    end
+
+    private
+
+    def load_coach(side)
+      CoachLoader.new(side).coach
+    end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rubygoal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jorge Bejar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gosu
+  name: rubygoal-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.50
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.50
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
+        version: '0.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 description: Rubygoal
 email:
 - jorge@wyeworks.com
@@ -46,32 +46,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
-- MIT-LICENSE
 - bin/rubygoal
-- lib/rubygoal/ball.rb
-- lib/rubygoal/coach.rb
-- lib/rubygoal/coach_loader.rb
-- lib/rubygoal/coaches/coach_away.rb
-- lib/rubygoal/coaches/coach_home.rb
-- lib/rubygoal/coaches/template.rb
-- lib/rubygoal/config.rb
-- lib/rubygoal/config_definitions.rb
-- lib/rubygoal/coordinate.rb
-- lib/rubygoal/field.rb
-- lib/rubygoal/field_metrics.rb
-- lib/rubygoal/formation.rb
-- lib/rubygoal/game.rb
-- lib/rubygoal/goal.rb
-- lib/rubygoal/match.rb
-- lib/rubygoal/moveable.rb
-- lib/rubygoal/player.rb
-- lib/rubygoal/players/average.rb
-- lib/rubygoal/players/captain.rb
-- lib/rubygoal/players/fast.rb
-- lib/rubygoal/team.rb
-- lib/rubygoal/version.rb
 - lib/rubygoal.rb
+- lib/rubygoal/gui.rb
+- lib/rubygoal/gui/ball.rb
+- lib/rubygoal/gui/field.rb
+- lib/rubygoal/gui/game.rb
+- lib/rubygoal/gui/goal.rb
+- lib/rubygoal/gui/players.rb
+- lib/rubygoal/gui/version.rb
 - media/average_away.png
 - media/average_home.png
 - media/background.png
@@ -81,13 +66,9 @@ files:
 - media/fast_away.png
 - media/fast_home.png
 - media/goal.png
-- test/formation_test.rb
-- test/random.txt
-- test/record.txt
-- test/test.rb
 homepage: https://github.com/wyeworks/rubygoal
 licenses:
-- MIT
+- Apache License 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -95,22 +76,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Rubygoal
-test_files:
-- test/formation_test.rb
-- test/random.txt
-- test/record.txt
-- test/test.rb
+summary: Rubygoal Game - Soccer game for Rubysts
+test_files: []

data/MIT-LICENSE

@@ -1,24 +0,0 @@
-Copyright (c) 2014 Jorge Bejar
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-This does not apply to files under the "media/" folder.

data/lib/rubygoal/ball.rb

@@ -1,41 +0,0 @@
-require 'gosu'
-
-require 'rubygoal/field_metrics'
-require 'rubygoal/moveable'
-
-module Rubygoal
-  class Ball
-    include Moveable
-
-    def initialize(window, position)
-      super()
-      @position = position
-      @image = Gosu::Image.new(window, Config.ball.image_file, false)
-    end
-
-    def goal?
-      FieldMetrics.goal?(position)
-    end
-
-    def draw
-      image.draw(position.x - Config.ball.width / 2, position.y - Config.ball.height / 2, 1)
-    end
-
-    def update
-      super
-      if FieldMetrics.out_of_bounds_width?(position)
-        velocity.x *= -1
-      end
-      if FieldMetrics.out_of_bounds_height?(position)
-        velocity.y *= -1
-      end
-
-      velocity.x *= 0.95
-      velocity.y *= 0.95
-    end
-
-    private
-
-    attr_reader :image
-  end
-end