shattered 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/bin/shatter +1 -8
  2. data/lib/game_loader.rb +3 -11
  3. data/lib/rails_generator.rb +3 -3
  4. data/lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb +1 -1
  5. data/lib/rails_generator/generators/components/model/model_generator.rb +0 -1
  6. data/lib/shatter.rb +3 -4
  7. data/lib/templates/configs/boot.rb +7 -13
  8. data/lib/templates/test/test_helper.rb +1 -1
  9. metadata +137 -167
data/bin/shatter CHANGED
@@ -1,20 +1,13 @@
1
1
  #!/usr/bin/env ruby
2
2
  #This file is adapted from the rails command.
3
3
 
4
- begin
5
- require 'active_support'
6
- rescue LoadError
7
- require 'rubygems'
8
- require_gem 'activesupport'
9
- end
10
-
11
4
  min_release = "1.8.2 (2004-12-25)"
12
5
  ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
13
6
 
14
7
  if ruby_release < min_release
15
8
  abort <<-end_message
16
9
 
17
- Rails requires Ruby version #{min_release} or later.
10
+ Shattered requires Ruby version #{min_release} or later.
18
11
  You're running #{ruby_release}; please upgrade to continue.
19
12
 
20
13
  end_message
data/lib/game_loader.rb CHANGED
@@ -1,14 +1,5 @@
1
1
  require 'singleton'
2
2
 
3
- begin
4
- require 'shattered_controller'
5
- rescue LoadError
6
- require 'rubygems'
7
- require 'shattered_controller'
8
- end
9
- require 'shattered_view'
10
- require 'shattered_model'
11
-
12
3
  include ShatteredController
13
4
  include ShatteredView
14
5
  include ShatteredModel
@@ -20,7 +11,8 @@ class GameLoader
20
11
  include Singleton
21
12
  attr_writer :environment
22
13
 
23
- # This will recourse into the app/** directories and load all ruby files inside those directories.
14
+ # This will recourse into the app/** directories and load all ruby files
15
+ # inside those directories.
24
16
  def load_all_sources(shattered_root)
25
17
  File.find_by_extension(shattered_root+"/app", "rb").each do |file|
26
18
  require(file)
@@ -30,7 +22,7 @@ class GameLoader
30
22
  view = ShatteredView::Runner.new @environment
31
23
  view.add_to_environment @environment
32
24
  control = ShatteredController::Runner.new(@environment)
33
- ShatteredSupport::Configuration.environment=@environment
25
+ ShatteredPack::Configuration.environment=@environment
34
26
  load_all_sources(SHATTERED_ROOT)
35
27
 
36
28
  begin
data/lib/rails_generator.rb CHANGED
@@ -22,13 +22,13 @@
22
22
  #++
23
23
 
24
24
  $:.unshift(File.dirname(__FILE__))
25
- $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
25
+ $:.unshift(File.dirname(__FILE__) + "/../../shattered_support/lib")
26
26
 
27
27
  begin
28
- require 'active_support'
28
+ require 'shattered_support'
29
29
  rescue LoadError
30
30
  require 'rubygems'
31
- require_gem 'activesupport'
31
+ require_gem 'shattered_support'
32
32
  end
33
33
 
34
34
  require 'rails_generator/base'
data/lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb CHANGED
@@ -25,7 +25,7 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
25
25
  m.file "templates/Rakefile", "Rakefile"
26
26
  m.file "templates/README", "README"
27
27
 
28
- # ogre plugins and configuration
28
+ # ogre plugins and configuration
29
29
  m.file "templates/configs/ogre_plugins.rcfg", "config/ogre_plugins.rcfg"
30
30
  m.template "templates/configs/ogre.cfg", "config/ogre.cfg"
31
31
  m.template "templates/configs/boot.rb", "config/boot.rb"
data/lib/rails_generator/generators/components/model/model_generator.rb CHANGED
@@ -7,7 +7,6 @@ class ModelGenerator < Rails::Generator::NamedBase #:nodoc:
7
7
  # Model, test, and fixture directories.
8
8
  m.directory File.join('app/models', class_path)
9
9
  m.directory File.join('test/unit', class_path)
10
- m.directory File.join('test/fixtures', class_path)
11
10
 
12
11
  # Model class, unit test, and fixtures.
13
12
  m.template 'model.rb', File.join('app/models', class_path, "#{file_name}_model.rb")
data/lib/shatter.rb CHANGED
@@ -1,7 +1,6 @@
1
- require 'rubygems'
2
- require 'active_support'
3
-
4
- ["shattered_support","shattered_ogre","shattered_model", "shattered_view","shattered_controller"].each do |component|
1
+ ["shattered_support", "shattered_ogre", "shattered_pack"].each do |component|
2
+ lib_path = File.expand_path(File.dirname(__FILE__)+"/../../#{component}/lib")
3
+ $: << lib_path if File.directory? lib_path
5
4
  require component
6
5
  end
7
6
 
data/lib/templates/configs/boot.rb CHANGED
@@ -1,15 +1,15 @@
1
1
 
2
2
  SHATTERED_ROOT = File.join(File.dirname(__FILE__), '..')
3
3
 
4
+
4
5
  def load_shattered_edge(path)
5
- ["shattered_ogre", "shattered_model", "shattered_view",
6
- "shatter", "shattered_controller", "shattered_support"].each do |edge|
7
- lib_path = "#{path}/#{edge}/lib"
8
- next if not File.directory? lib_path
9
- $: << lib_path
10
- end
6
+ shatter_path = "#{path}/shatter/lib"
7
+ $: << shatter_path if File.directory? shatter_path
8
+ require 'rubygems'
9
+ require 'shatter'
11
10
  end
12
11
 
12
+
13
13
  def load_plugins(path)
14
14
  Dir.foreach(path) do |plugin|
15
15
  next if plugin == ".." || plugin == "."
@@ -22,12 +22,6 @@ end
22
22
  # Load the plugins, and Shattered Edge, if present
23
23
  load_shattered_edge("#{SHATTERED_ROOT}/vendor/shattered")
24
24
 
25
- begin
26
- require 'shatter'
27
- rescue LoadError
28
- require 'rubygems'
29
- require 'shatter'
30
- end
31
-
25
+ # Load the plugins
32
26
  load_plugins("#{SHATTERED_ROOT}/vendor/plugins")
33
27
 
data/lib/templates/test/test_helper.rb CHANGED
@@ -2,4 +2,4 @@ require 'test/unit'
2
2
 
3
3
  require(File.join(File.dirname(__FILE__), '..', 'config', 'boot'))
4
4
 
5
- Shatter::GameLoader.instance.load_all_sources(SHATTERED_ROOT+"/app")
5
+ Shatter::GameLoader.instance.load_all_sources(SHATTERED_ROOT)
metadata CHANGED
@@ -1,193 +1,163 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.8.10
2
+ rubygems_version: 0.8.11
3
3
  specification_version: 1
4
4
  name: shattered
5
5
  version: !ruby/object:Gem::Version
6
- version: 0.3.2
7
- date: 2006-06-04
6
+ version: 0.3.3
7
+ date: 2006-07-18 00:00:00 -06:00
8
8
  summary: "Shattered: The main package tieing together controller, view, and model"
9
9
  require_paths:
10
- - lib
10
+ - lib
11
11
  email:
12
12
  homepage: http://www.hastilymade.com
13
13
  rubyforge_project:
14
- description: "Shattered is a Model View Control framework for creating 3d games. It uses Ogre,
15
- and the parts of rails (code and philosophy) to define a general use framework
16
- that is easy to work with."
14
+ description: Shattered is a Model View Control framework for creating 3d games. It uses Ogre, and the parts of rails (code and philosophy) to define a general use framework that is easy to work with.
17
15
  autorequire: shatter
18
16
  default_executable:
19
17
  bindir: bin
20
18
  has_rdoc: "true"
21
19
  required_ruby_version: !ruby/object:Gem::Version::Requirement
22
20
  requirements:
23
- -
24
- - ">"
25
- - !ruby/object:Gem::Version
26
- version: 0.0.0
21
+ - - ">"
22
+ - !ruby/object:Gem::Version
23
+ version: 0.0.0
27
24
  version:
28
25
  platform: ruby
26
+ signing_key:
27
+ cert_chain:
29
28
  authors: []
29
+
30
30
  files:
31
- - bin/console
32
- - bin/destroy
33
- - bin/generate
34
- - bin/runner
35
- - bin/shatter
36
- - lib/game_loader.rb
37
- - lib/rails_generator
38
- - lib/rails_generator.rb
39
- - lib/shatter.rb
40
- - lib/templates
41
- - lib/rails_generator/base.rb
42
- - lib/rails_generator/commands.rb
43
- - lib/rails_generator/generators
44
- - lib/rails_generator/lookup.rb
45
- - lib/rails_generator/manifest.rb
46
- - lib/rails_generator/options.rb
47
- - lib/rails_generator/scripts
48
- - lib/rails_generator/scripts.rb
49
- - lib/rails_generator/simple_logger.rb
50
- - lib/rails_generator/spec.rb
51
- - lib/rails_generator/generators/applications
52
- - lib/rails_generator/generators/components
53
- - lib/rails_generator/generators/applications/shattered_app
54
- - lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb
55
- - lib/rails_generator/generators/applications/shattered_app/USAGE
56
- - lib/rails_generator/generators/components/actor
57
- - lib/rails_generator/generators/components/controller
58
- - lib/rails_generator/generators/components/model
59
- - lib/rails_generator/generators/components/state
60
- - lib/rails_generator/generators/components/view
61
- - lib/rails_generator/generators/components/actor/actor_generator.rb
62
- - lib/rails_generator/generators/components/controller/controller_generator.rb
63
- - lib/rails_generator/generators/components/controller/templates
64
- - lib/rails_generator/generators/components/controller/USAGE
65
- - lib/rails_generator/generators/components/controller/templates/controller.rb
66
- - lib/rails_generator/generators/components/controller/templates/functional_test.rb
67
- - lib/rails_generator/generators/components/controller/templates/view.rhtml
68
- - lib/rails_generator/generators/components/model/model_generator.rb
69
- - lib/rails_generator/generators/components/model/templates
70
- - lib/rails_generator/generators/components/model/USAGE
71
- - lib/rails_generator/generators/components/model/templates/fixtures.yml
72
- - lib/rails_generator/generators/components/model/templates/model.rb
73
- - lib/rails_generator/generators/components/model/templates/unit_test.rb
74
- - lib/rails_generator/generators/components/state/state_generator.rb
75
- - lib/rails_generator/generators/components/state/templates
76
- - lib/rails_generator/generators/components/state/USAGE
77
- - lib/rails_generator/generators/components/state/templates/state.rb
78
- - lib/rails_generator/generators/components/view/templates
79
- - lib/rails_generator/generators/components/view/USAGE
80
- - lib/rails_generator/generators/components/view/view_generator.rb
81
- - lib/rails_generator/generators/components/view/templates/material
82
- - lib/rails_generator/generators/components/view/templates/view.rb
83
- - lib/rails_generator/scripts/destroy.rb
84
- - lib/rails_generator/scripts/generate.rb
85
- - lib/rails_generator/scripts/update.rb
86
- - lib/templates/configs
87
- - lib/templates/doc
88
- - lib/templates/environments
89
- - lib/templates/media
90
- - lib/templates/MIT-LICENSE
91
- - lib/templates/Rakefile
92
- - lib/templates/README
93
- - lib/templates/test
94
- - lib/templates/configs/boot.rb
95
- - lib/templates/configs/empty.log
96
- - lib/templates/configs/Mac
97
- - lib/templates/configs/ogre.cfg
98
- - lib/templates/configs/ogre_plugins.rcfg
99
- - lib/templates/configs/runner.rb
100
- - lib/templates/configs/Mac/shattered.app
101
- - lib/templates/configs/Mac/shattered.app/config
102
- - lib/templates/configs/Mac/shattered.app/Contents
103
- - lib/templates/configs/Mac/shattered.app/OgreLeaks.log
104
- - lib/templates/configs/Mac/shattered.app/OgreMemory.log
105
- - lib/templates/configs/Mac/shattered.app/Contents/Info.plist
106
- - lib/templates/configs/Mac/shattered.app/Contents/MacOS
107
- - lib/templates/configs/Mac/shattered.app/Contents/pbdevelopment.plist
108
- - lib/templates/configs/Mac/shattered.app/Contents/PkgInfo
109
- - lib/templates/configs/Mac/shattered.app/Contents/Resources
110
- - lib/templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac
111
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj
112
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb
113
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings
114
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib
115
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
116
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
117
- - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
118
- - lib/templates/doc/README_FOR_APP
119
- - lib/templates/environments/environment.rb
120
- - lib/templates/media/basic.rmaterial
121
- - lib/templates/media/offset_map.rmaterial
122
- - lib/templates/test/test_helper.rb
31
+ - bin/console
32
+ - bin/destroy
33
+ - bin/generate
34
+ - bin/runner
35
+ - bin/shatter
36
+ - lib/game_loader.rb
37
+ - lib/rails_generator
38
+ - lib/rails_generator.rb
39
+ - lib/shatter.rb
40
+ - lib/templates
41
+ - lib/rails_generator/base.rb
42
+ - lib/rails_generator/commands.rb
43
+ - lib/rails_generator/generators
44
+ - lib/rails_generator/lookup.rb
45
+ - lib/rails_generator/manifest.rb
46
+ - lib/rails_generator/options.rb
47
+ - lib/rails_generator/scripts
48
+ - lib/rails_generator/scripts.rb
49
+ - lib/rails_generator/simple_logger.rb
50
+ - lib/rails_generator/spec.rb
51
+ - lib/rails_generator/generators/applications
52
+ - lib/rails_generator/generators/components
53
+ - lib/rails_generator/generators/applications/shattered_app
54
+ - lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb
55
+ - lib/rails_generator/generators/applications/shattered_app/USAGE
56
+ - lib/rails_generator/generators/components/actor
57
+ - lib/rails_generator/generators/components/controller
58
+ - lib/rails_generator/generators/components/model
59
+ - lib/rails_generator/generators/components/state
60
+ - lib/rails_generator/generators/components/view
61
+ - lib/rails_generator/generators/components/actor/actor_generator.rb
62
+ - lib/rails_generator/generators/components/controller/controller_generator.rb
63
+ - lib/rails_generator/generators/components/controller/templates
64
+ - lib/rails_generator/generators/components/controller/USAGE
65
+ - lib/rails_generator/generators/components/controller/templates/controller.rb
66
+ - lib/rails_generator/generators/components/controller/templates/functional_test.rb
67
+ - lib/rails_generator/generators/components/controller/templates/view.rhtml
68
+ - lib/rails_generator/generators/components/model/model_generator.rb
69
+ - lib/rails_generator/generators/components/model/templates
70
+ - lib/rails_generator/generators/components/model/USAGE
71
+ - lib/rails_generator/generators/components/model/templates/fixtures.yml
72
+ - lib/rails_generator/generators/components/model/templates/model.rb
73
+ - lib/rails_generator/generators/components/model/templates/unit_test.rb
74
+ - lib/rails_generator/generators/components/state/state_generator.rb
75
+ - lib/rails_generator/generators/components/state/templates
76
+ - lib/rails_generator/generators/components/state/USAGE
77
+ - lib/rails_generator/generators/components/state/templates/state.rb
78
+ - lib/rails_generator/generators/components/view/templates
79
+ - lib/rails_generator/generators/components/view/USAGE
80
+ - lib/rails_generator/generators/components/view/view_generator.rb
81
+ - lib/rails_generator/generators/components/view/templates/material
82
+ - lib/rails_generator/generators/components/view/templates/view.rb
83
+ - lib/rails_generator/scripts/destroy.rb
84
+ - lib/rails_generator/scripts/generate.rb
85
+ - lib/rails_generator/scripts/update.rb
86
+ - lib/templates/configs
87
+ - lib/templates/doc
88
+ - lib/templates/environments
89
+ - lib/templates/media
90
+ - lib/templates/MIT-LICENSE
91
+ - lib/templates/Rakefile
92
+ - lib/templates/README
93
+ - lib/templates/test
94
+ - lib/templates/configs/boot.rb
95
+ - lib/templates/configs/empty.log
96
+ - lib/templates/configs/Mac
97
+ - lib/templates/configs/ogre.cfg
98
+ - lib/templates/configs/ogre_plugins.rcfg
99
+ - lib/templates/configs/runner.rb
100
+ - lib/templates/configs/Mac/shattered.app
101
+ - lib/templates/configs/Mac/shattered.app/config
102
+ - lib/templates/configs/Mac/shattered.app/Contents
103
+ - lib/templates/configs/Mac/shattered.app/OgreLeaks.log
104
+ - lib/templates/configs/Mac/shattered.app/OgreMemory.log
105
+ - lib/templates/configs/Mac/shattered.app/Contents/Info.plist
106
+ - lib/templates/configs/Mac/shattered.app/Contents/MacOS
107
+ - lib/templates/configs/Mac/shattered.app/Contents/pbdevelopment.plist
108
+ - lib/templates/configs/Mac/shattered.app/Contents/PkgInfo
109
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources
110
+ - lib/templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac
111
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj
112
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb
113
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings
114
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib
115
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
116
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
117
+ - lib/templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
118
+ - lib/templates/doc/README_FOR_APP
119
+ - lib/templates/environments/environment.rb
120
+ - lib/templates/media/basic.rmaterial
121
+ - lib/templates/media/offset_map.rmaterial
122
+ - lib/templates/test/test_helper.rb
123
123
  test_files: []
124
+
124
125
  rdoc_options:
125
- - "--exclude"
126
- - lib/rails_generator
126
+ - --exclude
127
+ - lib/rails_generator
127
128
  extra_rdoc_files: []
129
+
128
130
  executables:
129
- - shatter
131
+ - shatter
130
132
  extensions: []
133
+
131
134
  requirements:
132
- - Shattered is reliant on all shattered packages
135
+ - Shattered is reliant on all shattered packages
133
136
  dependencies:
134
- - !ruby/object:Gem::Dependency
135
- name: shattered_model
136
- version_requirement:
137
- version_requirements: !ruby/object:Gem::Version::Requirement
138
- requirements:
139
- -
140
- - ">="
141
- - !ruby/object:Gem::Version
142
- version: 0.3.2
143
- version:
144
- - !ruby/object:Gem::Dependency
145
- name: shattered_view
146
- version_requirement:
147
- version_requirements: !ruby/object:Gem::Version::Requirement
148
- requirements:
149
- -
150
- - ">="
151
- - !ruby/object:Gem::Version
152
- version: 0.3.2
153
- version:
154
- - !ruby/object:Gem::Dependency
155
- name: shattered_ogre
156
- version_requirement:
157
- version_requirements: !ruby/object:Gem::Version::Requirement
158
- requirements:
159
- -
160
- - ">="
161
- - !ruby/object:Gem::Version
162
- version: 0.3.2
163
- version:
164
- - !ruby/object:Gem::Dependency
165
- name: shattered_controller
166
- version_requirement:
167
- version_requirements: !ruby/object:Gem::Version::Requirement
168
- requirements:
169
- -
170
- - ">="
171
- - !ruby/object:Gem::Version
172
- version: 0.3.2
173
- version:
174
- - !ruby/object:Gem::Dependency
175
- name: shattered_support
176
- version_requirement:
177
- version_requirements: !ruby/object:Gem::Version::Requirement
178
- requirements:
179
- -
180
- - ">="
181
- - !ruby/object:Gem::Version
182
- version: 0.3.2
183
- version:
184
- - !ruby/object:Gem::Dependency
185
- name: activesupport
186
- version_requirement:
187
- version_requirements: !ruby/object:Gem::Version::Requirement
188
- requirements:
189
- -
190
- - ">="
191
- - !ruby/object:Gem::Version
192
- version: 0.3.2
193
- version:
137
+ - !ruby/object:Gem::Dependency
138
+ name: shattered_ogre
139
+ version_requirement:
140
+ version_requirements: !ruby/object:Gem::Version::Requirement
141
+ requirements:
142
+ - - ">="
143
+ - !ruby/object:Gem::Version
144
+ version: 0.3.3
145
+ version:
146
+ - !ruby/object:Gem::Dependency
147
+ name: shattered_pack
148
+ version_requirement:
149
+ version_requirements: !ruby/object:Gem::Version::Requirement
150
+ requirements:
151
+ - - ">="
152
+ - !ruby/object:Gem::Version
153
+ version: 0.3.3
154
+ version:
155
+ - !ruby/object:Gem::Dependency
156
+ name: shattered_support
157
+ version_requirement:
158
+ version_requirements: !ruby/object:Gem::Version::Requirement
159
+ requirements:
160
+ - - ">="
161
+ - !ruby/object:Gem::Version
162
+ version: 0.3.3
163
+ version: