shattered 0.3.1 → 0.3.2

data/bin/destroy

@@ -0,0 +1,9 @@
+#!/opt/local/bin/ruby
+
+require File.dirname(__FILE__) + '/../config/boot'
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+require 'rails_generator/scripts/destroy'
+	
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+Rails::Generator::Scripts::Destroy.new.run(ARGV)

data/bin/runner

@@ -1,6 +1,6 @@
-#!/usr/bin/ruby18
+#!/usr/local/bin/ruby
 
-if PLATFORM =~ /darwin/
+if PLATFORM =~ /powerpc-darwin/
 	path = File.dirname(__FILE__) + "/../config/Mac/"
 	puts `(cd #{path}shattered.app; ./Contents/MacOS/shattered_mac)`
 else

data/lib/game_loader.rb

@@ -13,7 +13,7 @@ include ShatteredController
 include ShatteredView
 include ShatteredModel
 
-module Shatter
+module Shatter #:nodoc:all
 #This class is loads the view, controller, and model.  It then loads
 #and starts the game based on these.
 class GameLoader
@@ -43,4 +43,4 @@ class GameLoader
 		control.start_game
 	end
 end
-end
+end

data/lib/rails_generator/base.rb

@@ -14,7 +14,7 @@ require File.dirname(__FILE__) + '/spec'
 # generator and just replaces the code templates with its own.
 #
 # Now go forth and multiply^Wgenerate.
-module Rails
+module Rails #:nodoc:all
   module Generator
     class GeneratorError < StandardError; end
     class UsageError < GeneratorError; end

data/lib/rails_generator/commands.rb

@@ -3,7 +3,7 @@ require 'optparse'
 require 'fileutils'
 require 'erb'
 
-module Rails
+module Rails #:nodoc:all
   module Generator
     module Commands
       # Here's a convenient way to get a handle on generator commands.

data/lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb

@@ -1,6 +1,6 @@
 require 'rbconfig'
 
-class ShatteredAppGenerator < Rails::Generator::Base
+class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
@@ -33,6 +33,9 @@ class ShatteredAppGenerator < Rails::Generator::Base
       # Environments
       m.file "templates/environments/environment.rb", "config/environment.rb"
       
+      # Testing
+      m.file "templates/test/test_helper.rb", "test/test_helper.rb"
+      
       # Mac OSX
       m.file "templates/configs/Mac/shattered.app/Contents/Info.plist", "config/Mac/shattered.app/Contents/Info.plist"
       m.file "templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac", "config/Mac/shattered.app/Contents/MacOS/shattered_mac"
@@ -45,7 +48,7 @@ class ShatteredAppGenerator < Rails::Generator::Base
       m.file "templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb", "config/Mac/shattered.app/Contents/Resources/rb_main.rb"
       
       # Scripts
-      %w( generate runner console ).each do |file|
+      %w( generate runner console destroy ).each do |file|
         m.file "../bin/#{file}", "script/#{file}", script_options
       end
 

data/lib/rails_generator/generators/components/actor/actor_generator.rb

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/../model/model_generator'
 require File.dirname(__FILE__) + '/../view/view_generator'
 require File.dirname(__FILE__) + '/../controller/controller_generator'
 
-class ActorGenerator < Rails::Generator::NamedBase
+class ActorGenerator < Rails::Generator::NamedBase #:nodoc:
  def manifest
    model=["model", file_name]
    view=["view", file_name]

data/lib/rails_generator/generators/components/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-class ControllerGenerator < Rails::Generator::NamedBase
+class ControllerGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
       # Check for class naming collisions.

data/lib/rails_generator/generators/components/model/model_generator.rb

@@ -1,4 +1,4 @@
-class ModelGenerator < Rails::Generator::NamedBase
+class ModelGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
       # Check for class naming collisions.

data/lib/rails_generator/generators/components/state/state_generator.rb

@@ -1,4 +1,4 @@
-class StateGenerator < Rails::Generator::NamedBase
+class StateGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
       # Check for class naming collisions.

data/lib/rails_generator/generators/components/view/view_generator.rb

@@ -1,4 +1,4 @@
-class ViewGenerator < Rails::Generator::NamedBase
+class ViewGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
       # Check for class naming collisions.

data/lib/rails_generator/lookup.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec'
 
-class Object
+class Object #:nodoc:all
   class << self
     # Lookup missing generators using const_missing.  This allows any
     # generator to reference another without having to know its location:
@@ -21,21 +21,23 @@ class Object
   end
 end
 
-# User home directory lookup adapted from RubyGems.
-def Dir.user_home
-  if ENV['HOME']
-    ENV['HOME']
-  elsif ENV['USERPROFILE']
-    ENV['USERPROFILE']
-  elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
-    "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
-  else
-    File.expand_path '~'
+class Dir #:nodoc:all
+  # User home directory lookup adapted from RubyGems.
+  def self.user_home 
+    if ENV['HOME']
+      ENV['HOME']
+    elsif ENV['USERPROFILE']
+      ENV['USERPROFILE']
+    elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
+      "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
+    else
+      File.expand_path '~'
+    end
   end
 end
 
 
-module Rails
+module Rails #:nodoc:all
   module Generator
 
     # Generator lookup is managed by a list of sources which return specs

data/lib/rails_generator/manifest.rb

@@ -1,4 +1,4 @@
-module Rails
+module Rails #:nodoc:all
   module Generator
 
     # Manifest captures the actions a generator performs.  Instantiate

data/lib/rails_generator/options.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-module Rails
+module Rails #:nodoc:all
   module Generator
     module Options
       def self.append_features(base)

data/lib/rails_generator/scripts.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/options'
 
-module Rails
+module Rails #:nodoc:all
   module Generator
     module Scripts
 

data/lib/rails_generator/scripts/destroy.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../scripts'
 
-module Rails::Generator::Scripts
+module Rails::Generator::Scripts #:nodoc:all
   class Destroy < Base
     mandatory_options :command => :destroy
   end

data/lib/rails_generator/scripts/generate.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../scripts'
 
-module Rails::Generator::Scripts
+module Rails::Generator::Scripts #:nodoc:all
   class Generate < Base
     mandatory_options :command => :create
   end

data/lib/rails_generator/scripts/update.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../scripts'
 
-module Rails::Generator::Scripts
+module Rails::Generator::Scripts #:nodoc:all
   class Update < Base
     mandatory_options :command => :update
 

data/lib/rails_generator/simple_logger.rb

@@ -1,6 +1,6 @@
-module Rails
+module Rails #:nodoc:all
   module Generator
-    class SimpleLogger # :nodoc:
+    class SimpleLogger
       attr_reader :out
       attr_accessor :quiet
 

data/lib/rails_generator/spec.rb

@@ -1,4 +1,4 @@
-module Rails
+module Rails #:nodoc:all
   module Generator
     # A spec knows where a generator was found and how to instantiate it.
     # Metadata include the generator's name, its base path, and the source

data/lib/shatter.rb

@@ -1,10 +1,8 @@
-["shattered_model", "shattered_view","shattered_controller"].each do |component|
-  begin
-    require component
-  rescue MissingSourceFile
-    require 'rubygems'
-    require component
-  end
+require 'rubygems'
+require 'active_support'
+
+["shattered_support","shattered_ogre","shattered_model", "shattered_view","shattered_controller"].each do |component|
+  require component
 end
 
 require File.dirname(__FILE__) + '/game_loader'

data/lib/templates/configs/ogre_plugins.rcfg

@@ -1,18 +1,16 @@
 // The PluginFolder tells Ogre where OgreMain.dll can be found.
-<% if PLATFORM =~ /mswin/ %>
+<% if PLATFORM =~ /mswin/ || PLATFORM =~ /linux/ %>
 PluginFolder=<%= SHATTERED_OGRE_DLLS %>
-<% elsif PLATFORM =~ /darwin/ %>
-<% else %>
-PluginFolder=/usr/local/lib/OGRE
 <% end %>
 
 // Each of these plugins loads a seperate subsystem of Ogre.
 <% 
 plugins = %w( RenderSystem_GL RenderSystem_Direct3D9 
                     Plugin_ParticleFX Plugin_BSPSceneManager 
-                    Plugin_OctreeSceneManager Plugin_CgProgramManager )
+                    Plugin_OctreeSceneManager Plugin_CgProgramManager )
 plugins -= ["RenderSystem_Direct3D9"] unless PLATFORM =~ /mswin32/
+plugins -= ["Plugin_CgProgramManager"] if PLATFORM =~ /i686-darwin/
 %>
 <% plugins.each do |plugin| %>
 Plugin=<%= plugin %>
-<% end %>
+<% end %>

data/lib/templates/media/basic.rmaterial

@@ -8,6 +8,7 @@ material <%= name %>
    { 
       pass 
       { 
+        lighting off
 		texture_unit 
         { 
 			texture <%= texture %>

data/lib/templates/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'test/unit'
+
+require(File.join(File.dirname(__FILE__), '..', 'config', 'boot'))
+
+Shatter::GameLoader.instance.load_all_sources(SHATTERED_ROOT+"/app")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shattered
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-05-16
+  version: 0.3.2
+date: 2006-06-04
 summary: "Shattered: The main package tieing together controller, view, and model"
 require_paths: 
   - lib
@@ -29,6 +29,7 @@ platform: ruby
 authors: []
 files: 
   - bin/console
+  - bin/destroy
   - bin/generate
   - bin/runner
   - bin/shatter
@@ -63,7 +64,6 @@ files:
   - lib/rails_generator/generators/components/controller/USAGE
   - lib/rails_generator/generators/components/controller/templates/controller.rb
   - lib/rails_generator/generators/components/controller/templates/functional_test.rb
-  - lib/rails_generator/generators/components/controller/templates/helper.rb
   - lib/rails_generator/generators/components/controller/templates/view.rhtml
   - lib/rails_generator/generators/components/model/model_generator.rb
   - lib/rails_generator/generators/components/model/templates
@@ -90,6 +90,7 @@ files:
   - lib/templates/MIT-LICENSE
   - lib/templates/Rakefile
   - lib/templates/README
+  - lib/templates/test
   - lib/templates/configs/boot.rb
   - lib/templates/configs/empty.log
   - lib/templates/configs/Mac
@@ -118,6 +119,7 @@ files:
   - lib/templates/environments/environment.rb
   - lib/templates/media/basic.rmaterial
   - lib/templates/media/offset_map.rmaterial
+  - lib/templates/test/test_helper.rb
 test_files: []
 rdoc_options: 
   - "--exclude"
@@ -137,7 +139,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: shattered_view
@@ -147,7 +149,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: shattered_ogre
@@ -157,7 +159,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: shattered_controller
@@ -167,7 +169,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: shattered_support
@@ -177,7 +179,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -187,5 +189,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: "0.3"
+            version: 0.3.2
       version: 

data/lib/rails_generator/generators/components/controller/templates/helper.rb

@@ -1,2 +0,0 @@
-module <%= class_name %>Helper
-end