merb-gen 0.9.7 → 0.9.8

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 (32) hide show
  1. data/LICENSE +1 -1
  2. data/Rakefile +27 -9
  3. data/bin/merb-gen +21 -3
  4. data/lib/generators/merb/merb_flat.rb +83 -14
  5. data/lib/generators/merb/merb_full.rb +66 -20
  6. data/lib/generators/merb/merb_very_flat.rb +51 -10
  7. data/lib/generators/migration.rb +5 -2
  8. data/lib/generators/resource_controller.rb +2 -2
  9. data/lib/generators/templates/application/{merb → common}/Rakefile +15 -7
  10. data/lib/generators/templates/application/common/dotgitignore +18 -0
  11. data/lib/generators/templates/application/common/merb.thor +1221 -0
  12. data/lib/generators/templates/application/merb/app/views/exceptions/not_acceptable.html.erb +1 -1
  13. data/lib/generators/templates/application/merb/app/views/exceptions/not_found.html.erb +1 -1
  14. data/lib/generators/templates/application/merb/config/environments/development.rb +1 -0
  15. data/lib/generators/templates/application/merb/config/environments/staging.rb +7 -0
  16. data/lib/generators/templates/application/merb/config/environments/test.rb +2 -1
  17. data/lib/generators/templates/application/merb/config/init.rb +1 -4
  18. data/lib/generators/templates/application/merb/config/router.rb +13 -7
  19. data/lib/generators/templates/application/merb/public/favicon.ico +0 -0
  20. data/lib/generators/templates/application/merb/public/robots.txt +5 -0
  21. data/lib/generators/templates/application/merb_flat/{application.rb → application.rbt} +1 -1
  22. data/lib/generators/templates/application/merb_flat/config/init.rb +119 -2
  23. data/lib/generators/templates/application/merb_flat/test/test_helper.rb +19 -0
  24. data/lib/generators/templates/application/merb_plugin/Rakefile +17 -22
  25. data/lib/generators/templates/application/merb_plugin/spec/spec_helper.rb +0 -1
  26. data/lib/generators/templates/application/merb_plugin/test/test_helper.rb +0 -1
  27. data/lib/generators/templates/application/merb_very_flat/application.rbt +36 -2
  28. data/lib/generators/templates/application/merb_very_flat/test/test_helper.rb +19 -0
  29. data/spec/merb_flat_spec.rb +4 -4
  30. data/spec/spec_helper.rb +0 -1
  31. metadata +16 -7
  32. data/lib/generators/templates/application/merb/merb.thor +0 -822
@@ -8,7 +8,7 @@
8
8
 
9
9
  <div id="left-container">
10
10
  <h3>Exception:</h3>
11
- <p><%%= params[:exception] %></p>
11
+ <p><%%= request.exceptions.first.message %></p>
12
12
  </div>
13
13
 
14
14
  <div id="main-container">
@@ -8,7 +8,7 @@
8
8
 
9
9
  <div id="left-container">
10
10
  <h3>Exception:</h3>
11
- <p><%%= params[:exception] %></p>
11
+ <p><%%= request.exceptions.first.message %></p>
12
12
  </div>
13
13
 
14
14
  <div id="main-container">
@@ -1,6 +1,7 @@
1
1
  Merb.logger.info("Loaded DEVELOPMENT Environment...")
2
2
  Merb::Config.use { |c|
3
3
  c[:exception_details] = true
4
+ c[:reload_templates] = true
4
5
  c[:reload_classes] = true
5
6
  c[:reload_time] = 0.5
6
7
  c[:log_auto_flush ] = true
@@ -0,0 +1,7 @@
1
+ Merb.logger.info("Loaded STAGING Environment...")
2
+ Merb::Config.use { |c|
3
+ c[:exception_details] = false
4
+ c[:reload_classes] = false
5
+ c[:log_level] = :error
6
+ c[:log_file] = Merb.log_path + "/staging.log"
7
+ }
@@ -3,4 +3,5 @@ Merb::Config.use { |c|
3
3
  c[:testing] = true
4
4
  c[:exception_details] = true
5
5
  c[:log_auto_flush ] = true
6
- }
6
+ c[:log_level] = :fatal
7
+ }
@@ -1,5 +1,3 @@
1
- $KCODE = 'UTF8'
2
-
3
1
  #
4
2
  # ==== Structure of Merb initializer
5
3
  #
@@ -47,6 +45,7 @@ $KCODE = 'UTF8'
47
45
  #
48
46
  # dependency "merb-action-args" # Provides support for querystring arguments to be passed in to controller actions
49
47
  # dependency "merb-assets" # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
48
+ # dependency "merb-helpers" # Provides the form, date/time, and other helpers
50
49
  # dependency "merb-cache" # Provides your application with caching functions
51
50
  # dependency "merb-haml" # Adds rake tasks and the haml generators to your merb app
52
51
  # dependency "merb-jquery" # Provides a #jquery method to insert jQuery code in to a content block
@@ -54,7 +53,6 @@ $KCODE = 'UTF8'
54
53
 
55
54
  # These are a few, but not all, of the merb-plugin dependencies:
56
55
  #
57
- # dependency "merb_helpers" # Provides the form, date/time, and other helpers
58
56
  # dependency "merb_param_protection" # Lets you have better control over your query string params and param logging
59
57
  # dependency "merb_stories" # Provides rspec helper methods for your application
60
58
 
@@ -134,7 +132,6 @@ end
134
132
  # See http://wiki.merbivore.com/pages/merb-core-boot-process
135
133
  # if you want to know more.
136
134
  Merb::Config.use do |c|
137
-
138
135
  # Sets up a custom session id key which is used for the session persistence
139
136
  # cookie name. If not specified, defaults to '_session_id'.
140
137
  # c[:session_id_key] = '_session_id'
@@ -2,34 +2,40 @@
2
2
  #
3
3
  # You can route a specific URL to a controller / action pair:
4
4
  #
5
- # r.match("/contact").
5
+ # match("/contact").
6
6
  # to(:controller => "info", :action => "contact")
7
7
  #
8
8
  # You can define placeholder parts of the url with the :symbol notation. These
9
9
  # placeholders will be available in the params hash of your controllers. For example:
10
10
  #
11
- # r.match("/books/:book_id/:action").
11
+ # match("/books/:book_id/:action").
12
12
  # to(:controller => "books")
13
13
  #
14
14
  # Or, use placeholders in the "to" results for more complicated routing, e.g.:
15
15
  #
16
- # r.match("/admin/:module/:controller/:action/:id").
16
+ # match("/admin/:module/:controller/:action/:id").
17
17
  # to(:controller => ":module/:controller")
18
18
  #
19
+ # You can specify conditions on the placeholder by passing a hash as the second
20
+ # argument of "match"
21
+ #
22
+ # match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/).
23
+ # to(:controller => "registration")
24
+ #
19
25
  # You can also use regular expressions, deferred routes, and many other options.
20
26
  # See merb/specs/merb/router.rb for a fairly complete usage sample.
21
27
 
22
28
  Merb.logger.info("Compiling routes...")
23
- Merb::Router.prepare do |r|
29
+ Merb::Router.prepare do
24
30
  # RESTful routes
25
- # r.resources :posts
31
+ # resources :posts
26
32
 
27
33
  # This is the default route for /:controller/:action/:id
28
34
  # This is fine for most cases. If you're heavily using resource-based
29
35
  # routes, you may want to comment/remove this line to prevent
30
36
  # clients from calling your create or destroy actions with a GET
31
- r.default_routes
37
+ default_routes
32
38
 
33
39
  # Change this for your home page to be available at /
34
- # r.match('/').to(:controller => 'whatever', :action =>'index')
40
+ # match('/').to(:controller => 'whatever', :action =>'index')
35
41
  end
@@ -0,0 +1,5 @@
1
+ # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
2
+ #
3
+ # To ban all spiders from the entire site uncomment the next two lines:
4
+ # User-Agent: *
5
+ # Disallow: /
@@ -1,4 +1,4 @@
1
- class Foo < Merb::Controller
1
+ class <%= class_name %> < Merb::Controller
2
2
 
3
3
  def _template_location(action, type = nil, controller = controller_name)
4
4
  controller == "layout" ? "layout.#{action}.#{type}" : "#{action}.#{type}"
@@ -1,4 +1,121 @@
1
- $KCODE = 'UTF8'
1
+ #
2
+ # ==== Structure of Merb initializer
3
+ #
4
+ # 1. Load paths.
5
+ # 2. Dependencies configuration.
6
+ # 3. Libraries (ORM, testing tool, etc) you use.
7
+ # 4. Application-specific configuration.
8
+
9
+ #
10
+ # ==== Set up load paths
11
+ #
12
+
13
+ # Add the app's "gems" directory to the gem load path.
14
+ # Note that the gems directory must mirror the structure RubyGems uses for
15
+ # directories under which gems are kept.
16
+ #
17
+ # To conveniently set it up, use gem install -i <merb_app_root/gems>
18
+ # when installing gems. This will set up the structure under /gems
19
+ # automagically.
20
+ #
21
+ # An example:
22
+ #
23
+ # You want to bundle ActiveRecord and ActiveSupport with your Merb
24
+ # application to be deployment environment independent. To do so,
25
+ # install gems into merb_app_root/gems directory like this:
26
+ #
27
+ # gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem
28
+ #
29
+ # Since RubyGems will search merb_app_root/gems for dependencies, order
30
+ # in the statement above is important: we need to install ActiveSupport which
31
+ # ActiveRecord depends on first.
32
+ #
33
+ # Remember that bundling of dependencies as gems with your application
34
+ # makes it independent of the environment it runs in and is a very
35
+ # good, encouraged practice to follow.
36
+
37
+ # If you want modules and classes from libraries organized like
38
+ # merbapp/lib/magicwand/lib/magicwand.rb to autoload,
39
+ # uncomment this.
40
+ # Merb.push_path(:lib, Merb.root / "lib") # uses **/*.rb as path glob.
41
+
42
+ # ==== Dependencies
43
+
44
+ # These are a few, but not all, of the standard merb-more dependencies:
45
+ #
46
+ # dependency "merb-action-args" # Provides support for querystring arguments to be passed in to controller actions
47
+ # dependency "merb-assets" # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
48
+ # dependency "merb-helpers" # Provides the form, date/time, and other helpers
49
+ # dependency "merb-cache" # Provides your application with caching functions
50
+ # dependency "merb-haml" # Adds rake tasks and the haml generators to your merb app
51
+ # dependency "merb-jquery" # Provides a #jquery method to insert jQuery code in to a content block
52
+ # dependency "merb-mailer" # Integrates mail support via Merb Mailer
53
+
54
+ # These are a few, but not all, of the merb-plugin dependencies:
55
+ #
56
+ # dependency "merb_param_protection" # Lets you have better control over your query string params and param logging
57
+ # dependency "merb_stories" # Provides rspec helper methods for your application
58
+
59
+ # Miscellaneous dependencies:
60
+ #
61
+ # Specify more than one dependency at a time with the #dependencies method:
62
+ # dependencies "RedCloth", "BlueCloth"
63
+
64
+ # Specify a specific version of a dependency
65
+ # dependency "RedCloth", "> 3.0"
66
+
67
+ # Specify more than one dependency at a time as well as the version:
68
+ # dependencies "RedCloth" => "> 3.0", "BlueCloth" => "= 1.0.0"
69
+
70
+ # You can also add in dependencies after your application loads.
71
+ Merb::BootLoader.after_app_loads do
72
+ # For example, the magic_admin gem uses the app's model classes. This requires that the models be
73
+ # loaded already. So, we can put the magic_admin dependency here:
74
+ # dependency "magic_admin"
75
+ end
76
+
77
+ #
78
+ # ==== Set up your ORM of choice
79
+ #
80
+
81
+ # Merb doesn't come with database support by default. You need
82
+ # an ORM plugin. Install one, and uncomment one of the following lines,
83
+ # if you need a database.
84
+
85
+ # Uncomment for DataMapper ORM
86
+ <%= "# " unless orm == :datamapper %>use_orm :datamapper
87
+
88
+ # Uncomment for ActiveRecord ORM
89
+ <%= "# " unless orm == :activerecord %>use_orm :activerecord
90
+
91
+ # Uncomment for Sequel ORM
92
+ <%= "# " unless orm == :sequel %>use_orm :sequel
93
+
94
+
95
+ #
96
+ # ==== Pick what you test with
97
+ #
98
+
99
+ # This defines which test framework the generators will use.
100
+ # RSpec is turned on by default.
101
+ #
102
+ # To use Test::Unit, you need to install the merb_test_unit gem.
103
+ # To use RSpec, you don't have to install any additional gems, since
104
+ # merb-core provides support for RSpec.
105
+ #
106
+ <%= "# " unless testing_framework == :test_unit %>use_test :test_unit
107
+ <%= "# " unless testing_framework == :rspec %>use_test :rspec
108
+
109
+
110
+ #
111
+ # ==== Choose which template engine to use by default
112
+ #
113
+
114
+ # Merb can generate views for different template engines, choose your favourite as the default.
115
+
116
+ <%= "# " unless template_engine == :erb %>use_template_engine :erb
117
+ <%= "# " unless template_engine == :haml %>use_template_engine :haml
118
+
2
119
 
3
120
  # Move this to application.rb if you want it to be reloadable in dev mode.
4
121
  Merb::Router.prepare do |r|
@@ -9,7 +126,7 @@ end
9
126
  Merb::Config.use { |c|
10
127
  c[:environment] = 'production',
11
128
  c[:framework] = {},
12
- c[:log_level] = 'debug',
129
+ c[:log_level] = :debug,
13
130
  c[:use_mutex] = false,
14
131
  c[:session_store] = 'cookie',
15
132
  c[:session_id_key] = '_session_id',
@@ -0,0 +1,19 @@
1
+ require "rubygems"
2
+
3
+ # Add the local gems dir if found within the app root; any dependencies loaded
4
+ # hereafter will try to load from the local gems before loading system gems.
5
+ if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
6
+ $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
7
+ end
8
+
9
+ require "merb-core"
10
+
11
+ # TODO: Boot Merb, via the Test Rack adapter
12
+ Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
13
+ :merb_root => File.join(File.dirname(__FILE__), ".." )
14
+
15
+
16
+ class Test::Unit::TestCase
17
+ include Merb::Test::RequestHelper
18
+ # Add more helper methods to be used by all tests here...
19
+ end
@@ -1,11 +1,10 @@
1
1
  require 'rubygems'
2
2
  require 'rake/gempackagetask'
3
- require 'rubygems/specification'
4
- require 'date'
5
- require 'merb-core/version'
6
- require 'merb-core/tasks/merb_rake_helper'
7
3
 
8
- NAME = "<%= base_name %>"
4
+ require 'merb-core'
5
+ require 'merb-core/tasks/merb'
6
+
7
+ GEM_NAME = "<%= base_name %>"
9
8
  GEM_VERSION = "0.0.1"
10
9
  AUTHOR = "Your Name"
11
10
  EMAIL = "Your Email"
@@ -14,7 +13,7 @@ SUMMARY = "Merb plugin that provides ..."
14
13
 
15
14
  spec = Gem::Specification.new do |s|
16
15
  s.rubyforge_project = 'merb'
17
- s.name = NAME
16
+ s.name = GEM_NAME
18
17
  s.version = GEM_VERSION
19
18
  s.platform = Gem::Platform::RUBY
20
19
  s.has_rdoc = true
@@ -29,7 +28,7 @@ spec = Gem::Specification.new do |s|
29
28
  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec<%= bin ? ',bin' : '' %>}/**/*")
30
29
  <% if bin %>
31
30
  s.bindir = "bin"
32
- s.executables = [NAME]
31
+ s.executables = [GEM_NAME]
33
32
  <% end %>
34
33
  end
35
34
 
@@ -37,23 +36,19 @@ Rake::GemPackageTask.new(spec) do |pkg|
37
36
  pkg.gem_spec = spec
38
37
  end
39
38
 
40
- desc "install the plugin locally"
41
- task :install => [:package] do
42
- sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
39
+ desc "install the plugin as a gem"
40
+ task :install do
41
+ Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
43
42
  end
44
43
 
45
- desc "create a gemspec file"
46
- task :make_spec do
47
- File.open("#{NAME}.gemspec", "w") do |file|
48
- file.puts spec.to_ruby
49
- end
44
+ desc "Uninstall the gem"
45
+ task :uninstall do
46
+ Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
50
47
  end
51
48
 
52
- namespace :jruby do
53
-
54
- desc "Run :package and install the resulting .gem with jruby"
55
- task :install => :package do
56
- sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
49
+ desc "Create a gemspec file"
50
+ task :gemspec do
51
+ File.open("#{GEM_NAME}.gemspec", "w") do |file|
52
+ file.puts spec.to_ruby
57
53
  end
58
-
59
- end
54
+ end
@@ -1,2 +1 @@
1
- $TESTING=true
2
1
  $:.push File.join(File.dirname(__FILE__), '..', 'lib')
@@ -1,2 +1 @@
1
- $TESTING=true
2
1
  $:.push File.join(File.dirname(__FILE__), '..', 'lib')
@@ -1,13 +1,47 @@
1
- $KCODE = 'UTF8'
2
-
3
1
  # run very flat apps with merb -I <app file>.
4
2
 
3
+ # Uncomment for DataMapper ORM
4
+ <%= "# " unless orm == :datamapper %>use_orm :datamapper
5
+
6
+ # Uncomment for ActiveRecord ORM
7
+ <%= "# " unless orm == :activerecord %>use_orm :activerecord
8
+
9
+ # Uncomment for Sequel ORM
10
+ <%= "# " unless orm == :sequel %>use_orm :sequel
11
+
12
+
13
+ #
14
+ # ==== Pick what you test with
15
+ #
16
+
17
+ # This defines which test framework the generators will use.
18
+ # RSpec is turned on by default.
19
+ #
20
+ # To use Test::Unit, you need to install the merb_test_unit gem.
21
+ # To use RSpec, you don't have to install any additional gems, since
22
+ # merb-core provides support for RSpec.
23
+ #
24
+ <%= "# " unless testing_framework == :test_unit %>use_test :test_unit
25
+ <%= "# " unless testing_framework == :rspec %>use_test :rspec
26
+
27
+ #
28
+ # ==== Choose which template engine to use by default
29
+ #
30
+
31
+ # Merb can generate views for different template engines, choose your favourite as the default.
32
+
33
+ <%= "# " unless template_engine == :erb %>use_template_engine :erb
34
+ <%= "# " unless template_engine == :haml %>use_template_engine :haml
35
+
5
36
  Merb::Config.use { |c|
6
37
  c[:framework] = { :public => [Merb.root / "public", nil] },
7
38
  c[:session_store] = 'none',
8
39
  c[:exception_details] = true
40
+ c[:log_level] = :debug # or error, warn, info or fatal
9
41
  }
10
42
 
43
+
44
+
11
45
  Merb::Router.prepare do |r|
12
46
  r.match('/').to(:controller => '<%= base_name %>', :action =>'index')
13
47
  end
@@ -0,0 +1,19 @@
1
+ require "rubygems"
2
+
3
+ # Add the local gems dir if found within the app root; any dependencies loaded
4
+ # hereafter will try to load from the local gems before loading system gems.
5
+ if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
6
+ $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
7
+ end
8
+
9
+ require "merb-core"
10
+
11
+ # TODO: Boot Merb, via the Test Rack adapter
12
+ Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
13
+ :merb_root => File.join(File.dirname(__FILE__), ".." )
14
+
15
+
16
+ class Test::Unit::TestCase
17
+ include Merb::Test::RequestHelper
18
+ # Add more helper methods to be used by all tests here...
19
+ end
@@ -13,9 +13,9 @@ describe Merb::Generators::MerbFlatGenerator do
13
13
  it "should create a number of views"
14
14
 
15
15
  it "should render templates successfully" do
16
- lambda { @generator.render! }.should_not raise_error
16
+ lambda do
17
+ @generator.render!
18
+ end.should_not raise_error
17
19
  end
18
-
19
20
  end
20
-
21
- end
21
+ end
data/spec/spec_helper.rb CHANGED
@@ -1,4 +1,3 @@
1
- $TESTING=true
2
1
  $:.push File.join(File.dirname(__FILE__), '..', 'lib')
3
2
 
4
3
  require 'rubygems'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-gen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.7
4
+ version: 0.9.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-09-14 00:00:00 +03:00
12
+ date: 2008-10-06 00:00:00 +03:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - ">="
22
22
  - !ruby/object:Gem::Version
23
- version: 0.9.7
23
+ version: 0.9.8
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: templater
@@ -30,7 +30,7 @@ dependencies:
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.0
33
+ version: 0.3.0
34
34
  version:
35
35
  description: Generators suite for Merb.
36
36
  email: jonas.nicklas@gmail.com
@@ -65,6 +65,10 @@ files:
65
65
  - lib/generators/session_migration.rb
66
66
  - lib/generators/templates
67
67
  - lib/generators/templates/application
68
+ - lib/generators/templates/application/common
69
+ - lib/generators/templates/application/common/dotgitignore
70
+ - lib/generators/templates/application/common/merb.thor
71
+ - lib/generators/templates/application/common/Rakefile
68
72
  - lib/generators/templates/application/merb
69
73
  - lib/generators/templates/application/merb/app
70
74
  - lib/generators/templates/application/merb/app/controllers
@@ -89,31 +93,34 @@ files:
89
93
  - lib/generators/templates/application/merb/config/environments/development.rb
90
94
  - lib/generators/templates/application/merb/config/environments/production.rb
91
95
  - lib/generators/templates/application/merb/config/environments/rake.rb
96
+ - lib/generators/templates/application/merb/config/environments/staging.rb
92
97
  - lib/generators/templates/application/merb/config/environments/test.rb
93
98
  - lib/generators/templates/application/merb/config/init.rb
94
99
  - lib/generators/templates/application/merb/config/rack.rb
95
100
  - lib/generators/templates/application/merb/config/router.rb
96
- - lib/generators/templates/application/merb/merb.thor
97
101
  - lib/generators/templates/application/merb/public
102
+ - lib/generators/templates/application/merb/public/favicon.ico
98
103
  - lib/generators/templates/application/merb/public/images
99
104
  - lib/generators/templates/application/merb/public/images/merb.jpg
100
105
  - lib/generators/templates/application/merb/public/merb.fcgi
106
+ - lib/generators/templates/application/merb/public/robots.txt
101
107
  - lib/generators/templates/application/merb/public/stylesheets
102
108
  - lib/generators/templates/application/merb/public/stylesheets/master.css
103
- - lib/generators/templates/application/merb/Rakefile
104
109
  - lib/generators/templates/application/merb/spec
105
110
  - lib/generators/templates/application/merb/spec/spec.opts
106
111
  - lib/generators/templates/application/merb/spec/spec_helper.rb
107
112
  - lib/generators/templates/application/merb/test
108
113
  - lib/generators/templates/application/merb/test/test_helper.rb
109
114
  - lib/generators/templates/application/merb_flat
110
- - lib/generators/templates/application/merb_flat/application.rb
115
+ - lib/generators/templates/application/merb_flat/application.rbt
111
116
  - lib/generators/templates/application/merb_flat/config
112
117
  - lib/generators/templates/application/merb_flat/config/framework.rb
113
118
  - lib/generators/templates/application/merb_flat/config/init.rb
114
119
  - lib/generators/templates/application/merb_flat/README.txt
115
120
  - lib/generators/templates/application/merb_flat/spec
116
121
  - lib/generators/templates/application/merb_flat/spec/spec_helper.rb
122
+ - lib/generators/templates/application/merb_flat/test
123
+ - lib/generators/templates/application/merb_flat/test/test_helper.rb
117
124
  - lib/generators/templates/application/merb_flat/views
118
125
  - lib/generators/templates/application/merb_flat/views/foo.html.erb
119
126
  - lib/generators/templates/application/merb_plugin
@@ -135,6 +142,8 @@ files:
135
142
  - lib/generators/templates/application/merb_very_flat/application.rbt
136
143
  - lib/generators/templates/application/merb_very_flat/spec
137
144
  - lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb
145
+ - lib/generators/templates/application/merb_very_flat/test
146
+ - lib/generators/templates/application/merb_very_flat/test/test_helper.rb
138
147
  - lib/generators/templates/component
139
148
  - lib/generators/templates/component/controller
140
149
  - lib/generators/templates/component/controller/app