gamebox 0.2.1 → 0.3.2

data/Gemfile

@@ -1,9 +1,2 @@
 source "http://rubygems.org"
-gem "rake"
-gem "rspec"
-gem "jeweler"
-gem "constructor"
-gem "publisher"
-gem "gosu"
-gem "chipmunk"
-gem "polaris"
+gemspec

data/Rakefile

@@ -1,30 +1,5 @@
-begin
-  require 'jeweler'
-  require File.dirname(__FILE__)+'/lib/gamebox/version'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gamebox"
-    gem.executables = "gamebox"
-    gem.rubyforge_project = "gamebox"
-    gem.summary = %Q{Framework for building and distributing games using Gosu}
-    gem.description = %Q{Framework for building and distributing games using Gosu}
-    gem.email = "shawn42@gmail.com"
-    gem.homepage = "http://shawn42.github.com/gamebox"
-    gem.authors = ["Shawn Anderson","Jason Roelofs","Karlin Fox"]
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "jeweler"
-    gem.add_dependency 'gosu'
-    gem.add_dependency 'bundler'
-    gem.add_dependency 'constructor'
-    gem.add_dependency 'publisher'
-    gem.files.exclude 'examples'
-    gem.test_files = FileList['{spec,test}/**/*.rb']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
+require 'bundler'
+Bundler::GemHelper.install_tasks
 begin
   require 'metric_fu'
 rescue LoadError
@@ -38,27 +13,28 @@ STATS_DIRECTORIES = [
 
 desc "Report code statistics (KLOCs, etc) from the application"
 task :stats do
-  require 'code_statistics'
+  require "#{File.dirname(__FILE__)}/lib/gamebox/lib/code_statistics"
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end
 
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
   desc "Run all rspecs"
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_files = FileList['spec/*_spec.rb']
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = 'spec/**/*_spec.rb'
   end
-  task :default => :spec
 
-  desc "Run rcov rspecs"
-  Spec::Rake::SpecTask.new('rcov_rspec') do |t|
-    t.spec_files = FileList['spec/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'examples']
+  desc "Run all specs with rcov"
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+      t.rcov = true
   end
+
+  task :default => :spec
 rescue LoadError
   puts "please install rspec to run tests"
   puts "install with gem install rspec"
 end
 
+
+
 # vim: syntax=Ruby

data/TODO.txt

@@ -1,31 +1,31 @@
-planned features:
-add network manager stub
-highscore upload system (use from chingu)
+TAKE YOUR PICK:
+ - specs for stage manager
+ - collision detection performance for tiles?
+ - collision detection honoring rotation?
+ - highscore upload system (use from chingu) (takes json now)
+ - rewrite update system to be all callback based
+  * what does that do to PhysicalDirector when Director goes away?
+ - solidify rdocs (including tutorial)
+ - collidable "grouping"
 
-change update system to 
-on_update do |time|
-  # do stuff?
-end
+EXAMPLES:
+ - move to separate repo?
+ - nario: 
+    error on collision
 
-update physical objects to use chipmunk_object.rb
+SOMEDAY:
+ - add network manager stub
+ - update physical objects to use chipmunk_object.rb
 
-make complex Phyiscal behaviors 
-  - made up by a group of bodies pinned together
-  - easy joints
-physical objects should have bodies and shapes body/shape should be shorthand for bodies.first/shapes.first
-  
-  - solidify rdocs (including tutorial)
-SVGS
-	create a DynamicPhysicalActor that can be built from external verts
-add nice actor debugging
-add Extra; actor with a short time to live (TTL); useful for special effects (maybe as a behavior)
+ - make complex Phyiscal behaviors 
+  * made up by a group of bodies pinned together
+ - physical objects should have bodies and shapes body/shape should be shorthand for bodies.first/shapes.first
+
+ - create a DynamicPhysicalActor that can be built from external verts (SVG)
+
+ - add nice actor debugging
+ - add Extra; actor with a short time to live (TTL); useful for special effects (maybe as a behavior)
 	
-static deployment bundles (crate, love-clone; custom C project)
-	ruby
-	gosu
-possible features:
-AI
-	 state machine
-	 rule based
-optional GUI via rubygoo
-gamebox server (content server?)
+ - optional GUI via Fidgit?
+ - gamebox server (content server?)
+

data/docs/getting_started.rdoc

@@ -66,11 +66,11 @@ The reason I wrote Gamebox is twofold: first, to aid in 48 hour game writing com
 
 An Actor is the base class for any game object. A building, the player, the score, the bullet are all examples of actors. Actors can even be invisible. Any number of Behavior s can be added to an Actor to define how it will react to the world via the Actor.has_behaviors method.
 
-So Actors sound fun, how do I get one? That's where the ActorFactory comes in. In your Level class (demo_level.rb by default) you can use the create_actor helper method as shown below.
+So Actors sound fun, how do I get one? That's where the ActorFactory comes in. In your Stage class (demo_stage.rb by default) you can use the spawn helper method as shown below.
 
 	@score = spawn :score, :x => 10, :y => 10
 	
-This call will return an instance of the Score class (the first arg is the symbolized version of the classname). The ActorFactory will try to require the symbolized class name for you.  It will also create the view for the actor and register it to be drawn.  Which view is instantiated depends on the actor requested.  The factory will always look for a class named the same as the actor with View on the end. So the actor Score will look for ScoreView.  If ScoreView does not exist, a generic view class will be used based on the behaviors of the actor. Each ActorView class is constructed with a reference to the actor it is displaying. See ActorFactor#build for more details.
+This call will return an instance of the Score class (the first arg is the symbolized version of the classname).  It will also create the view for the actor and register it to be drawn.  Which view is instantiated depends on the actor requested.  The factory will always look for a class named the same as the actor with View on the end. So the actor Score will look for ScoreView.  If ScoreView does not exist, a generic view class will be used based on the behaviors of the actor. Each ActorView class is constructed with a reference to the actor it is displaying. See ActorFactor#build for more details.
 
 That's great, but how do I tell my actors what to do?  They can register for events of course! A common place for this is in your actor's setup method. Here is an example from the roids example.
 

data/gamebox.gemspec

@@ -1,202 +1,44 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gamebox/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{gamebox}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name        = "gamebox"
+  s.version     = Gamebox::VERSION::STRING
+  s.platform    = Gem::Platform::RUBY
   s.authors = ["Shawn Anderson", "Jason Roelofs", "Karlin Fox"]
-  s.date = %q{2010-11-02}
-  s.default_executable = %q{gamebox}
-  s.description = %q{Framework for building and distributing games using Gosu}
   s.email = %q{shawn42@gmail.com}
-  s.executables = ["gamebox"]
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "History.txt",
-     "README.txt",
-     "Rakefile",
-     "TODO.txt",
-     "VERSION",
-     "bin/gamebox",
-     "docs/CODE_REVIEW",
-     "docs/gamebox.bat",
-     "docs/getting_started.rdoc",
-     "docs/logo.ico",
-     "docs/logo.png",
-     "gamebox.gemspec",
-     "lib/gamebox.rb",
-     "lib/gamebox/actor.rb",
-     "lib/gamebox/actor_factory.rb",
-     "lib/gamebox/actor_view.rb",
-     "lib/gamebox/actors/collidable_debugger.rb",
-     "lib/gamebox/actors/curtain.rb",
-     "lib/gamebox/actors/fps.rb",
-     "lib/gamebox/actors/label.rb",
-     "lib/gamebox/actors/logo.rb",
-     "lib/gamebox/actors/score.rb",
-     "lib/gamebox/actors/spatial_debugger.rb",
-     "lib/gamebox/actors/svg_actor.rb",
-     "lib/gamebox/arbiter.rb",
-     "lib/gamebox/backstage.rb",
-     "lib/gamebox/behavior.rb",
-     "lib/gamebox/behaviors/animated.rb",
-     "lib/gamebox/behaviors/audible.rb",
-     "lib/gamebox/behaviors/collidable.rb",
-     "lib/gamebox/behaviors/collidable/aabb_collidable.rb",
-     "lib/gamebox/behaviors/collidable/circle_collidable.rb",
-     "lib/gamebox/behaviors/collidable/collidable_shape.rb",
-     "lib/gamebox/behaviors/collidable/polygon_collidable.rb",
-     "lib/gamebox/behaviors/graphical.rb",
-     "lib/gamebox/behaviors/layered.rb",
-     "lib/gamebox/behaviors/physical.rb",
-     "lib/gamebox/behaviors/updatable.rb",
-     "lib/gamebox/class_finder.rb",
-     "lib/gamebox/config_manager.rb",
-     "lib/gamebox/console_app.rb",
-     "lib/gamebox/data/config/objects.yml",
-     "lib/gamebox/data/fonts/Asimov.ttf",
-     "lib/gamebox/data/fonts/GAMEBOX_FONTS_GO_HERE",
-     "lib/gamebox/data/graphics/GAMEBOX_GRAPHICS_GO_HERE",
-     "lib/gamebox/data/graphics/logo.png",
-     "lib/gamebox/data/music/GAMEBOX_MUSIC_GOES_HERE",
-     "lib/gamebox/data/sounds/GAMEBOX_SOUND_FX_GO_HERE",
-     "lib/gamebox/director.rb",
-     "lib/gamebox/event_compat.rb",
-     "lib/gamebox/ftor.rb",
-     "lib/gamebox/gamebox_application.rb",
-     "lib/gamebox/gamebox_generator.rb",
-     "lib/gamebox/generators/actor_generator.rb",
-     "lib/gamebox/generators/view_generator.rb",
-     "lib/gamebox/hooked_gosu_window.rb",
-     "lib/gamebox/input_manager.rb",
-     "lib/gamebox/lib/aliasing.rb",
-     "lib/gamebox/lib/code_statistics.rb",
-     "lib/gamebox/lib/diy.rb",
-     "lib/gamebox/lib/inflections.rb",
-     "lib/gamebox/lib/inflector.rb",
-     "lib/gamebox/lib/linked_list.rb",
-     "lib/gamebox/lib/metaclass.rb",
-     "lib/gamebox/lib/numbers_ext.rb",
-     "lib/gamebox/lib/platform.rb",
-     "lib/gamebox/lib/publisher_ext.rb",
-     "lib/gamebox/lib/rect.rb",
-     "lib/gamebox/lib/sorted_list.rb",
-     "lib/gamebox/physical_director.rb",
-     "lib/gamebox/physical_stage.rb",
-     "lib/gamebox/physics.rb",
-     "lib/gamebox/resource_manager.rb",
-     "lib/gamebox/sound_manager.rb",
-     "lib/gamebox/spatial_hash.rb",
-     "lib/gamebox/spatial_stagehand.rb",
-     "lib/gamebox/spec/helper.rb",
-     "lib/gamebox/stage.rb",
-     "lib/gamebox/stage_manager.rb",
-     "lib/gamebox/stagehand.rb",
-     "lib/gamebox/svg_document.rb",
-     "lib/gamebox/tasks/gamebox_tasks.rb",
-     "lib/gamebox/templates/actor.erb",
-     "lib/gamebox/templates/actor_spec.erb",
-     "lib/gamebox/templates/actor_view.erb",
-     "lib/gamebox/templates/actor_view_spec.erb",
-     "lib/gamebox/templates/template_app/.gitignore",
-     "lib/gamebox/templates/template_app/Gemfile",
-     "lib/gamebox/templates/template_app/README",
-     "lib/gamebox/templates/template_app/Rakefile",
-     "lib/gamebox/templates/template_app/config/boot.rb",
-     "lib/gamebox/templates/template_app/config/environment.rb",
-     "lib/gamebox/templates/template_app/config/game.yml",
-     "lib/gamebox/templates/template_app/config/stage_config.yml",
-     "lib/gamebox/templates/template_app/data/fonts/FONTS_GO_HERE",
-     "lib/gamebox/templates/template_app/data/graphics/GRAPHICS_GO_HERE",
-     "lib/gamebox/templates/template_app/data/music/MUSIC_GOES_HERE",
-     "lib/gamebox/templates/template_app/data/sounds/SOUND_FX_GO_HERE",
-     "lib/gamebox/templates/template_app/script/generate",
-     "lib/gamebox/templates/template_app/spec/helper.rb",
-     "lib/gamebox/templates/template_app/src/app.rb",
-     "lib/gamebox/templates/template_app/src/demo_stage.rb",
-     "lib/gamebox/templates/template_app/src/game.rb",
-     "lib/gamebox/templates/template_app/src/my_actor.rb",
-     "lib/gamebox/version.rb",
-     "lib/gamebox/viewport.rb",
-     "lib/gamebox/views/graphical_actor_view.rb",
-     "lib/gamebox/wrapped_screen.rb",
-     "load_paths.rb",
-     "script/perf_polaris.rb",
-     "script/perf_spatial_hash.rb",
-     "spec/actor_spec.rb",
-     "spec/actor_view_spec.rb",
-     "spec/animated_spec.rb",
-     "spec/arbiter_spec.rb",
-     "spec/backstage_spec.rb",
-     "spec/behavior_spec.rb",
-     "spec/collidable_spec.rb",
-     "spec/helper.rb",
-     "spec/label_spec.rb",
-     "spec/physical_spec.rb",
-     "spec/resource_manager_spec.rb",
-     "spec/spatial_hash_spec.rb",
-     "spec/stage_manager_spec.rb",
-     "spec/stage_spec.rb",
-     "spec/viewport_spec.rb"
-  ]
   s.homepage = %q{http://shawn42.github.com/gamebox}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{gamebox}
-  s.rubygems_version = %q{1.3.7}
+  s.description = %q{Framework for building and distributing games using Gosu}
   s.summary = %q{Framework for building and distributing games using Gosu}
-  s.test_files = [
-    "spec/actor_spec.rb",
-     "spec/actor_view_spec.rb",
-     "spec/animated_spec.rb",
-     "spec/arbiter_spec.rb",
-     "spec/backstage_spec.rb",
-     "spec/behavior_spec.rb",
-     "spec/collidable_spec.rb",
-     "spec/helper.rb",
-     "spec/label_spec.rb",
-     "spec/physical_spec.rb",
-     "spec/resource_manager_spec.rb",
-     "spec/spatial_hash_spec.rb",
-     "spec/stage_manager_spec.rb",
-     "spec/stage_spec.rb",
-     "spec/viewport_spec.rb"
-  ]
+  s.rubyforge_project = "gamebox"
+
+  s.files         = `git ls-files`.split("\n").reject{ |f| f[/^examples\//] || f[/^\./] }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency "gosu"
+  s.add_dependency "constructor"
+  s.add_dependency "publisher"
+  s.add_dependency "diy"
+  s.add_dependency "tween"
+  s.add_dependency "require_all"
+  s.add_dependency "kvo"
+  s.add_dependency "pry", '0.9.6'
+  s.add_dependency "pry-remote"
+
+  # TODO make this optional
+  s.add_dependency "chipmunk"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency "rspec-core"
+  s.add_development_dependency "rspec-mocks"
+  s.add_development_dependency "rspec-expectations"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "polaris"
+  s.add_development_dependency 'rcov'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<gosu>, [">= 0"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
-      s.add_runtime_dependency(%q<constructor>, [">= 0"])
-      s.add_runtime_dependency(%q<publisher>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<gosu>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<constructor>, [">= 0"])
-      s.add_dependency(%q<publisher>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<gosu>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<constructor>, [">= 0"])
-    s.add_dependency(%q<publisher>, [">= 0"])
-  end
 end
 

data/lib/gamebox.rb

@@ -1,16 +1,20 @@
-[
-"gamebox",
-"gamebox/actors", 
-"gamebox/ai", 
-"gamebox/behaviors", 
-"gamebox/generators", 
-"gamebox/lib", 
-"gamebox/tasks", 
-"gamebox/views"
-].each do |path|
-  $: << File.dirname(__FILE__)+"/"+path
-end
-
 GAMEBOX_PATH = File.join(File.dirname(__FILE__),"gamebox/")
-require 'gamebox_application'
+require 'chipmunk'
+require 'diy'
+require 'constructor'
+require 'kvo'
+require 'tween'
+require 'gosu'
+include Gosu
+require 'pry'
+require 'pry-remote'
+
+
+# TODO move this to some logging class
+def log(output, level = :debug)
+  t = Time.now
+  puts "[#{t.min}:#{t.sec}:#{t.usec}] [#{level}] #{output}"
+end
 
+require 'require_all'
+require_all Dir.glob("#{GAMEBOX_PATH}/**/*.rb").reject { |f| f.match("template_app") || f.match("spec") || f.match("gamebox_application.rb")}

data/lib/gamebox/actor.rb

@@ -1,29 +1,36 @@
-require 'publisher'
-require 'inflector'
-
 # Actor represent a game object.
 # Actors can have behaviors added and removed from them. Such as :physical or :animated.
 # They are created and hooked up to their optional View class in Stage#create_actor.
 class Actor
-  extend Publisher
-  can_fire_anything
+  include Kvo
   
-  attr_accessor :behaviors, :x, :y, :stage, :input_manager,
+  attr_accessor :behaviors, :stage, :input_manager,
     :resource_manager, :alive, :opts, :visible, :director, 
+    :wrapped_screen,
     :actor_type
 
+  # TODO change alive and visible to be KVO
+  kvo_attr_accessor :x, :y, :alive, :visible
+
+  can_fire_anything
+
+  DEFAULT_PARAMS = {
+    :x => 0,
+    :y => 0,
+  }.freeze
+
   def initialize(opts={}) # :nodoc:
-    @opts = opts
-    @x = opts[:x]
-    @y = opts[:y]
-    @x ||= 0
-    @y ||= 0
-    @stage = opts[:stage]
-    @input_manager = opts[:input]
-    @resource_manager = opts[:resources]
-    @director = opts[:director]
-    @actor_type = opts[:actor_type]
-    @alive = true
+    @opts = DEFAULT_PARAMS.merge opts
+    self.x = @opts[:x]
+    self.y = @opts[:y]
+
+    @stage = @opts[:stage]
+    @input_manager = @opts[:input]
+    @resource_manager = @opts[:resources]
+    @director = @opts[:director]
+    @actor_type = @opts[:actor_type]
+    @wrapped_screen = @opts[:wrapped_screen]
+    self.alive = true
 
     @behaviors = {}
 
@@ -62,13 +69,17 @@ class Actor
 
   # Is the actor still alive?
   def alive?
-    @alive
+    self.alive
+  end
+
+  def screen
+    @wrapped_screen
   end
 
   # Tells the actor's Director that he wants to be removed; and unsubscribes
   # the actor from all input events.
   def remove_self
-    @alive = false
+    self.alive = false
     fire :remove_me
     @input_manager.unsubscribe_all self
   end
@@ -91,11 +102,6 @@ class Actor
       behavior_sym = behavior_def
       behavior_opts = {}
     end
-    begin
-      require behavior_sym.to_s;
-    rescue LoadError
-      # maybe its included somewhere else
-    end
     klass = Object.const_get Inflector.camelize(behavior_sym)
     @behaviors[behavior_sym] = klass.new self, behavior_opts
   end
@@ -131,16 +137,20 @@ class Actor
   
   def hide
     fire :hide_me if visible?
-    @visible = false
+    self.visible = false
   end
   
   def show
     fire :show_me unless visible?
-    @visible = true
+    self.visible = true
   end
   
   def visible?
-    @visible
+    self.visible
+  end
+
+  def viewport
+    @stage.viewport
   end
 
   def self.behaviors