shattered 0.3.3 → 0.4

data/bin/console

@@ -1,22 +1,4 @@
-#!/usr/bin/ruby18
-irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
+#!/usr/bin/env ruby
 
-require 'optparse'
-options = { :sandbox => false, :irb => irb }
-OptionParser.new do |opt|
-  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
-  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
-  opt.parse!(ARGV)
-end
-
-libs =  " -r irb/completion"
-libs << " -r #{File.dirname(__FILE__)}/../config/environment"
-libs << " -r console_sandbox" if options[:sandbox]
-
-if options[:sandbox]
-  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox."
-  puts "Any modifications you make will be rolled back on exit."
-else
-  puts "Loading #{ENV['RAILS_ENV']} environment."
-end
-exec "#{options[:irb]} #{libs} --prompt-mode simple"
+require "#{File.dirname(__FILE__)}/../config/boot"
+require "commands/console"

data/lib/commands/console.rb

@@ -0,0 +1,23 @@
+irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
+
+require 'optparse'
+options = { :sandbox => false, :irb => irb }
+OptionParser.new do |opt|
+	opt.banner = "Usage: console [environment] [options]"
+  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
+  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
+  opt.parse!(ARGV)
+end
+
+libs =  " -r irb/completion"
+libs << " -r #{SHATTERED_ROOT}/config/environment"
+libs << " -r console_sandbox" if options[:sandbox]
+
+ENV['SHATTERED_ENV'] = ARGV.first || ENV['SHATTERED_ENV'] || 'development'
+if options[:sandbox]
+  puts "Loading #{ENV['SHATTER_ENV']} environment in sandbox."
+  puts "Any modifications you make will be rolled back on exit."
+else
+  puts "Loading #{ENV['SHATTER_ENV']} environment."
+end
+exec "#{options[:irb]} #{libs} --simple-prompt"

data/lib/game_loader.rb

@@ -19,20 +19,19 @@ class GameLoader
     end
   end
 	def run
-		view = ShatteredView::Runner.new @environment
-		view.add_to_environment @environment
-		control = ShatteredController::Runner.new(@environment)
-		ShatteredPack::Configuration.environment=@environment
+		load_environment
 		load_all_sources(SHATTERED_ROOT)
 		
-    begin
-      require "#{SHATTERED_ROOT}/app/states/#{@environment[:start_state].to_s}_state"
-    rescue StandardError => output
-      puts output.message
-    end
-		
 		eval("#{@environment[:start_state].to_s.camelize}State").new
-		control.start_game
+
+		@control.start_game(@environment)
+	end
+	def load_environment
+	  view = ShatteredView::Runner.new @environment
+		view.add_to_environment @environment
+		@control = ShatteredController::Runner.new(@environment)
+		ShatteredPack::Configuration.environment=@environment
+		return @environment
 	end
 end
 end

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

@@ -45,7 +45,7 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
       m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib"
       m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib"
       m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb", "config/Mac/shattered.app/Contents/Resources/rb_main.rb"
+      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 destroy ).each do |file|
@@ -63,8 +63,8 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
       }
       
       # basic rmaterial
-      m.file "templates/media/basic.rmaterial", "media/templates/basic.rmaterial"
-      m.file "templates/media/offset_map.rmaterial", "media/templates/offset_map.rmaterial"
+      m.file "templates/media/basic.rmaterial", "app/media/common/templates/basic.rmaterial"
+      m.file "templates/media/offset_map.rmaterial", "app/media/common/templates/offset_map.rmaterial"
     end
   end
 
@@ -87,11 +87,10 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
   # Installation skeleton.  Intermediate directories are automatically
   # created so don't sweat their absence here.
   BASEDIRS = %w(
-    app/controllers
     app/models
     app/views
-    media/programs
-    media/templates
+    app/media/common/programs
+    app/media/common/templates
     config/Mac/shattered.app/Contents/MacOS
     config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib
     doc

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

@@ -6,18 +6,17 @@
 # Rails::Generator::Scripts::Generate.new.run(ARGV)
 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 #:nodoc:
  def manifest
-   model=["model", file_name]
-   view=["view", file_name]
-   controller=["controller", file_name]
-   Rails::Generator::Scripts::Generate.new.run(model)
-   Rails::Generator::Scripts::Generate.new.run(view)
-   Rails::Generator::Scripts::Generate.new.run(controller)
-      
-   record do |m|   
+   generators = [ModelGenerator, ViewGenerator]
+   record do |m|
+     generators.each do |generator|
+       generator.check_collisions(m, class_path, class_name)
+     end
+     generators.each do |generator|
+       generator.generate(m, class_path, file_name)
+     end
    end
  end
-end
+end

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

@@ -1,16 +1,22 @@
 class ModelGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
-      # Check for class naming collisions.
+      self.class.check_collisions(m, class_path, class_name)
+      self.class.generate(m, class_path, file_name)
+    end
+  end
+  
+  def self.check_collisions(m, class_path, class_name)
+     # Check for class naming collisions.
       m.class_collisions class_path, class_name, "#{class_name}Test"
+  end
+  def self.generate(m, class_path, file_name)
+    # Model, test, and fixture directories.
+    m.directory File.join('app/models', class_path)
+    m.directory File.join('test/unit', class_path)
 
-      # Model, test, and fixture directories.
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('test/unit', class_path)
-
-      # Model class, unit test, and fixtures.
-      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}_model.rb")
-      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
-    end
+    # Model class, unit test, and fixtures.
+    m.template '../../model/templates/model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
+    m.template '../../model/templates/unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
   end
 end

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

@@ -1,2 +1,2 @@
-class <%= class_name %>Model < ShatteredModel::Base
+class <%= class_name %> < ShatteredModel::Base
 end

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

@@ -1,3 +1,4 @@
 class <%= class_name %>View < ShatteredView::Base
-  mesh "<%= file_name %>"
+  material "<%= file_name %>_material", :template => "basic", :texture => "<%= file_name %>.png"
+  mesh "<%= file_name %>", :material => :<%= file_name %>_material
 end

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

@@ -1,18 +1,28 @@
 class ViewGenerator < Rails::Generator::NamedBase #:nodoc:
   def manifest
     record do |m|
-      # Check for class naming collisions.
+      self.class.check_collisions(m, class_path, class_name)
+      self.class.generate(m, class_path, file_name)
+    end
+  end
+  
+  def self.check_collisions(m, class_path, class_name)
+     # Check for class naming collisions.
       m.class_collisions class_path, "#{class_name}View"
+  end
+  def self.generate(m, class_path, file_name)
+    # Controller, helper, views, and test directories.
+    m.directory File.join('app/views', class_path)
+    m.directory File.join('app/media', class_path, file_name)
 
-      # Controller, helper, views, and test directories.
-      m.directory File.join('app/views', class_path)
-      m.directory File.join('app/views', class_path, file_name)
-
-      # Controller class, functional test, and helper class.
-      m.template 'view.rb',
-                  File.join('app/views',
-                            class_path,
-                            "#{file_name}_view.rb")
-    end
+    # Controller class, functional test, and helper class.
+    m.template '../../view/templates/view.rb',
+                File.join('app/views',
+                          class_path,
+                          "#{file_name}_view.rb")
+    m.file "../../../../../templates/media/default.mesh",
+            File.join( 'app/media', class_path, file_name, "#{file_name}.mesh")
+    m.file "../../../../../templates/media/default.png",
+            File.join( 'app/media', class_path, file_name, "#{file_name}.png")
   end
 end

data/lib/templates/configs/boot.rb

@@ -1,6 +1,15 @@
+# Don't change this file. Configuration is done in config/environment.rb
 
-SHATTERED_ROOT = File.join(File.dirname(__FILE__), '..')
+unless defined?(SHATTERED_ROOT)
+  root_path = File.join(File.dirname(__FILE__), '..')
 
+  unless RUBY_PLATFORM =~ /mswin32/
+    require 'pathname'
+    root_path = Pathname.new(root_path).cleanpath(true).to_s
+  end
+
+  SHATTERED_ROOT = root_path
+end
 
 def load_shattered_edge(path)
   shatter_path = "#{path}/shatter/lib"
@@ -9,7 +18,6 @@ def load_shattered_edge(path)
   require 'shatter'
 end
 
-
 def load_plugins(path)
   Dir.foreach(path) do |plugin|
     next if plugin == ".." || plugin == "."

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: shattered
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2006-07-18 00:00:00 -06:00
+  version: "0.4"
+date: 2006-09-10 00:00:00 -06:00
 summary: "Shattered: The main package tieing together controller, view, and model"
 require_paths: 
 - lib
@@ -33,11 +33,13 @@ files:
 - bin/generate
 - bin/runner
 - bin/shatter
+- lib/commands
 - lib/game_loader.rb
 - lib/rails_generator
 - lib/rails_generator.rb
 - lib/shatter.rb
 - lib/templates
+- lib/commands/console.rb
 - lib/rails_generator/base.rb
 - lib/rails_generator/commands.rb
 - lib/rails_generator/generators
@@ -54,17 +56,11 @@ files:
 - lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb
 - lib/rails_generator/generators/applications/shattered_app/USAGE
 - lib/rails_generator/generators/components/actor
-- lib/rails_generator/generators/components/controller
 - lib/rails_generator/generators/components/model
 - lib/rails_generator/generators/components/state
 - lib/rails_generator/generators/components/view
 - lib/rails_generator/generators/components/actor/actor_generator.rb
-- lib/rails_generator/generators/components/controller/controller_generator.rb
-- lib/rails_generator/generators/components/controller/templates
-- 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/view.rhtml
+- lib/rails_generator/generators/components/actor/templates
 - lib/rails_generator/generators/components/model/model_generator.rb
 - lib/rails_generator/generators/components/model/templates
 - lib/rails_generator/generators/components/model/USAGE
@@ -118,6 +114,8 @@ files:
 - lib/templates/doc/README_FOR_APP
 - lib/templates/environments/environment.rb
 - lib/templates/media/basic.rmaterial
+- lib/templates/media/default.mesh
+- lib/templates/media/default.png
 - lib/templates/media/offset_map.rmaterial
 - lib/templates/test/test_helper.rb
 test_files: []
@@ -141,7 +139,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: "0.4"
     version: 
 - !ruby/object:Gem::Dependency 
   name: shattered_pack
@@ -150,7 +148,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: "0.4"
     version: 
 - !ruby/object:Gem::Dependency 
   name: shattered_support
@@ -159,5 +157,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: "0.4"
     version: 

data/lib/rails_generator/generators/components/controller/USAGE

@@ -1,30 +0,0 @@
-Description:
-    The controller generator creates stubs for a new controller and its views.
-
-    The generator takes a controller name and a list of views as arguments.
-    The controller name may be given in CamelCase or under_score and should
-    not be suffixed with 'Controller'.  To create a controller within a
-    module, specify the controller name as 'module/controller'.
-
-    The generator creates a controller class in app/controllers with view
-    templates in app/views/controller_name, a helper class in app/helpers,
-    and a functional test suite in test/functional.
-
-Example:
-    ./script/generate controller CreditCard open debit credit close
-
-    Credit card controller with URLs like /credit_card/debit.
-        Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.rhtml [...]
-        Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/functional/credit_card_controller_test.rb
-
-Modules Example:
-    ./script/generate controller 'admin/credit_card' suspend late_fee
-
-    Credit card admin controller with URLs /admin/credit_card/suspend.
-        Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.rhtml [...]
-        Helper:     app/helpers/admin/credit_card_helper.rb
-        Test:       test/functional/admin/credit_card_controller_test.rb
-

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

@@ -1,32 +0,0 @@
-class ControllerGenerator < Rails::Generator::NamedBase #:nodoc:
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions class_path, "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
-
-      # Controller, helper, views, and test directories.
-      m.directory File.join('app/controllers', class_path)
-      #m.directory File.join('app/helpers', class_path)
-      #m.directory File.join('app/views', class_path, file_name)
-      #m.directory File.join('test/functional', class_path)
-
-      # Controller class, functional test, and helper class.
-      m.template 'controller.rb',
-                  File.join('app/controllers',
-                            class_path,
-                            "#{file_name}_controller.rb")
-
-      # Functional tests are a good idea, but not yet encompassed
-#      m.template 'functional_test.rb',
- #                 File.join('test/functional',
-  #                          class_path,
-   #                         "#{file_name}_controller_test.rb")
-
-#      m.template 'helper.rb',
- #                 File.join('app/helpers',
-  #                          class_path,
-   #                         "#{file_name}_helper.rb")
-
-    end
-  end
-end

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

@@ -1,5 +0,0 @@
-class <%= class_name %>Controller < ShatteredController::Base
-  key :pressed => :w, :action => :move_forward
-  def move_forward
-  end
-end

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

@@ -1,18 +0,0 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_controller'
-
-# Re-raise errors caught by the controller.
-class <%= class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

data/lib/rails_generator/generators/components/controller/templates/view.rhtml

@@ -1,2 +0,0 @@
-<h1><%= class_name %>#<%= action %></h1>
-<p>Find me in <%= path %></p>