merb-gen 0.9.8 → 0.9.9

data/spec/resource_controller_spec.rb

@@ -46,26 +46,8 @@ describe Merb::Generators::ResourceControllerGenerator do
     @generator.should create('/tmp/app/views/stuff/edit.html.erb')
     @generator.should create('/tmp/app/views/stuff/show.html.erb')
   end
-  
-  it "should create a helper" do
-    @generator.should create('/tmp/app/helpers/stuff_helper.rb')
-  end
-  
-  describe "with rspec" do
-    
-    it "should create a controller spec"
 
-    it "should create a helper spec" do
-      @generator.should create('/tmp/spec/helpers/stuff_helper_spec.rb')
-    end
-    
-  end
-  
-  describe "with test_unit" do
-    
-    it "should create a controller test"
-    
-  end
+
   
   describe "with a namespace" do
     
@@ -87,22 +69,6 @@ describe Merb::Generators::ResourceControllerGenerator do
     it "should create a helper" do
       @generator.should create('/tmp/app/helpers/john/monkey/stuff_helper.rb')
     end
-
-    describe "with rspec" do
-
-      it "should create a controller spec"
-
-      it "should create a helper spec" do
-        @generator.should create('/tmp/spec/helpers/john/monkey/stuff_helper_spec.rb')
-      end
-
-    end
-
-    describe "with test_unit" do
-
-      it "should create a controller test"
-
-    end
     
   end
   

data/spec/spec_helper.rb

@@ -6,11 +6,13 @@ require 'merb-core'
 require 'merb-gen'
 require 'templater/spec/helpers'
 
+Merb.disable(:initfile)
+
 Spec::Runner.configure do |config|
   config.include Templater::Spec::Helpers
 end
 
-shared_examples_for "named generator" do
+describe "named generator", :shared => true do
 
   describe '#file_name' do
 
@@ -268,4 +270,4 @@ shared_examples_for "namespaced generator" do
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +03:00
+date: 2008-10-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.3.3
     version: 
 description: Generators suite for Merb.
 email: jonas.nicklas@gmail.com
@@ -52,10 +52,10 @@ files:
 - lib/generators/helper.rb
 - lib/generators/layout.rb
 - lib/generators/merb
+- lib/generators/merb/merb_core.rb
 - lib/generators/merb/merb_flat.rb
-- lib/generators/merb/merb_full.rb
+- lib/generators/merb/merb_stack.rb
 - lib/generators/merb/merb_very_flat.rb
-- lib/generators/merb.rb
 - lib/generators/merb_plugin.rb
 - lib/generators/migration.rb
 - lib/generators/model.rb
@@ -66,51 +66,68 @@ files:
 - lib/generators/templates
 - lib/generators/templates/application
 - lib/generators/templates/application/common
+- lib/generators/templates/application/common/doc.thor
 - lib/generators/templates/application/common/dotgitignore
+- lib/generators/templates/application/common/dothtaccess
+- lib/generators/templates/application/common/jquery.js
 - lib/generators/templates/application/common/merb.thor
 - lib/generators/templates/application/common/Rakefile
-- lib/generators/templates/application/merb
-- lib/generators/templates/application/merb/app
-- lib/generators/templates/application/merb/app/controllers
-- lib/generators/templates/application/merb/app/controllers/application.rb
-- lib/generators/templates/application/merb/app/controllers/exceptions.rb
-- lib/generators/templates/application/merb/app/helpers
-- lib/generators/templates/application/merb/app/helpers/global_helpers.rb
-- lib/generators/templates/application/merb/app/models
-- lib/generators/templates/application/merb/app/models/merb
-- lib/generators/templates/application/merb/app/models/merb/session.rb
-- lib/generators/templates/application/merb/app/views
-- lib/generators/templates/application/merb/app/views/exceptions
-- lib/generators/templates/application/merb/app/views/exceptions/internal_server_error.html.erb
-- lib/generators/templates/application/merb/app/views/exceptions/not_acceptable.html.erb
-- lib/generators/templates/application/merb/app/views/exceptions/not_found.html.erb
-- lib/generators/templates/application/merb/autotest
-- lib/generators/templates/application/merb/autotest/discover.rb
-- lib/generators/templates/application/merb/autotest/merb.rb
-- lib/generators/templates/application/merb/autotest/merb_rspec.rb
-- lib/generators/templates/application/merb/config
-- lib/generators/templates/application/merb/config/environments
-- lib/generators/templates/application/merb/config/environments/development.rb
-- lib/generators/templates/application/merb/config/environments/production.rb
-- lib/generators/templates/application/merb/config/environments/rake.rb
-- lib/generators/templates/application/merb/config/environments/staging.rb
-- lib/generators/templates/application/merb/config/environments/test.rb
-- lib/generators/templates/application/merb/config/init.rb
-- lib/generators/templates/application/merb/config/rack.rb
-- lib/generators/templates/application/merb/config/router.rb
-- lib/generators/templates/application/merb/public
-- lib/generators/templates/application/merb/public/favicon.ico
-- lib/generators/templates/application/merb/public/images
-- lib/generators/templates/application/merb/public/images/merb.jpg
-- lib/generators/templates/application/merb/public/merb.fcgi
-- lib/generators/templates/application/merb/public/robots.txt
-- lib/generators/templates/application/merb/public/stylesheets
-- lib/generators/templates/application/merb/public/stylesheets/master.css
-- lib/generators/templates/application/merb/spec
-- lib/generators/templates/application/merb/spec/spec.opts
-- lib/generators/templates/application/merb/spec/spec_helper.rb
-- lib/generators/templates/application/merb/test
-- lib/generators/templates/application/merb/test/test_helper.rb
+- lib/generators/templates/application/merb_core
+- lib/generators/templates/application/merb_core/app
+- lib/generators/templates/application/merb_core/app/controllers
+- lib/generators/templates/application/merb_core/app/controllers/application.rb
+- lib/generators/templates/application/merb_core/app/controllers/exceptions.rb
+- lib/generators/templates/application/merb_core/app/helpers
+- lib/generators/templates/application/merb_core/app/helpers/global_helpers.rb
+- lib/generators/templates/application/merb_core/app/views
+- lib/generators/templates/application/merb_core/app/views/exceptions
+- lib/generators/templates/application/merb_core/app/views/exceptions/internal_server_error.html.erb
+- lib/generators/templates/application/merb_core/app/views/exceptions/not_acceptable.html.erb
+- lib/generators/templates/application/merb_core/app/views/exceptions/not_found.html.erb
+- lib/generators/templates/application/merb_core/autotest
+- lib/generators/templates/application/merb_core/autotest/discover.rb
+- lib/generators/templates/application/merb_core/autotest/merb.rb
+- lib/generators/templates/application/merb_core/autotest/merb_rspec.rb
+- lib/generators/templates/application/merb_core/config
+- lib/generators/templates/application/merb_core/config/environments
+- lib/generators/templates/application/merb_core/config/environments/development.rb
+- lib/generators/templates/application/merb_core/config/environments/production.rb
+- lib/generators/templates/application/merb_core/config/environments/rake.rb
+- lib/generators/templates/application/merb_core/config/environments/staging.rb
+- lib/generators/templates/application/merb_core/config/environments/test.rb
+- lib/generators/templates/application/merb_core/config/init.rb
+- lib/generators/templates/application/merb_core/config/rack.rb
+- lib/generators/templates/application/merb_core/config/router.rb
+- lib/generators/templates/application/merb_core/doc
+- lib/generators/templates/application/merb_core/doc/rdoc
+- lib/generators/templates/application/merb_core/doc/rdoc/generators
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/merb_generator.rb
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/api_grease.js
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/index.html.erb
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb.css
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb.rb
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb_doc_styles.css
+- lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/prototype.js
+- lib/generators/templates/application/merb_core/lib
+- lib/generators/templates/application/merb_core/lib/merb
+- lib/generators/templates/application/merb_core/lib/merb/session.rb
+- lib/generators/templates/application/merb_core/public
+- lib/generators/templates/application/merb_core/public/favicon.ico
+- lib/generators/templates/application/merb_core/public/images
+- lib/generators/templates/application/merb_core/public/images/merb.jpg
+- lib/generators/templates/application/merb_core/public/javascripts
+- lib/generators/templates/application/merb_core/public/javascripts/application.js
+- lib/generators/templates/application/merb_core/public/merb.fcgi
+- lib/generators/templates/application/merb_core/public/robots.txt
+- lib/generators/templates/application/merb_core/public/stylesheets
+- lib/generators/templates/application/merb_core/public/stylesheets/master.css
+- lib/generators/templates/application/merb_core/spec
+- lib/generators/templates/application/merb_core/spec/spec.opts
+- lib/generators/templates/application/merb_core/spec/spec_helper.rb
+- lib/generators/templates/application/merb_core/test
+- lib/generators/templates/application/merb_core/test/test_helper.rb
 - lib/generators/templates/application/merb_flat
 - lib/generators/templates/application/merb_flat/application.rbt
 - lib/generators/templates/application/merb_flat/config
@@ -138,6 +155,69 @@ files:
 - lib/generators/templates/application/merb_plugin/test/%base_name%_test.rb
 - lib/generators/templates/application/merb_plugin/test/test_helper.rb
 - lib/generators/templates/application/merb_plugin/TODO
+- lib/generators/templates/application/merb_stack
+- lib/generators/templates/application/merb_stack/app
+- lib/generators/templates/application/merb_stack/app/controllers
+- lib/generators/templates/application/merb_stack/app/controllers/application.rb
+- lib/generators/templates/application/merb_stack/app/controllers/exceptions.rb
+- lib/generators/templates/application/merb_stack/app/helpers
+- lib/generators/templates/application/merb_stack/app/helpers/global_helpers.rb
+- lib/generators/templates/application/merb_stack/app/models
+- lib/generators/templates/application/merb_stack/app/models/user.rb
+- lib/generators/templates/application/merb_stack/app/views
+- lib/generators/templates/application/merb_stack/app/views/exceptions
+- lib/generators/templates/application/merb_stack/app/views/exceptions/internal_server_error.html.erb
+- lib/generators/templates/application/merb_stack/app/views/exceptions/not_acceptable.html.erb
+- lib/generators/templates/application/merb_stack/app/views/exceptions/not_found.html.erb
+- lib/generators/templates/application/merb_stack/autotest
+- lib/generators/templates/application/merb_stack/autotest/discover.rb
+- lib/generators/templates/application/merb_stack/autotest/merb.rb
+- lib/generators/templates/application/merb_stack/autotest/merb_rspec.rb
+- lib/generators/templates/application/merb_stack/config
+- lib/generators/templates/application/merb_stack/config/database.yml
+- lib/generators/templates/application/merb_stack/config/dependencies.rb
+- lib/generators/templates/application/merb_stack/config/environments
+- lib/generators/templates/application/merb_stack/config/environments/development.rb
+- lib/generators/templates/application/merb_stack/config/environments/production.rb
+- lib/generators/templates/application/merb_stack/config/environments/rake.rb
+- lib/generators/templates/application/merb_stack/config/environments/staging.rb
+- lib/generators/templates/application/merb_stack/config/environments/test.rb
+- lib/generators/templates/application/merb_stack/config/init.rb
+- lib/generators/templates/application/merb_stack/config/rack.rb
+- lib/generators/templates/application/merb_stack/config/router.rb
+- lib/generators/templates/application/merb_stack/doc
+- lib/generators/templates/application/merb_stack/doc/rdoc
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/merb_generator.rb
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/api_grease.js
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/index.html.erb
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb.css
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb.rb
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb_doc_styles.css
+- lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/prototype.js
+- lib/generators/templates/application/merb_stack/merb
+- lib/generators/templates/application/merb_stack/merb/merb-auth
+- lib/generators/templates/application/merb_stack/merb/merb-auth/setup.rb
+- lib/generators/templates/application/merb_stack/merb/merb-auth/strategies.rb
+- lib/generators/templates/application/merb_stack/merb/session
+- lib/generators/templates/application/merb_stack/merb/session/session.rb
+- lib/generators/templates/application/merb_stack/public
+- lib/generators/templates/application/merb_stack/public/favicon.ico
+- lib/generators/templates/application/merb_stack/public/images
+- lib/generators/templates/application/merb_stack/public/images/merb.jpg
+- lib/generators/templates/application/merb_stack/public/javascripts
+- lib/generators/templates/application/merb_stack/public/javascripts/application.js
+- lib/generators/templates/application/merb_stack/public/merb.fcgi
+- lib/generators/templates/application/merb_stack/public/robots.txt
+- lib/generators/templates/application/merb_stack/public/stylesheets
+- lib/generators/templates/application/merb_stack/public/stylesheets/master.css
+- lib/generators/templates/application/merb_stack/spec
+- lib/generators/templates/application/merb_stack/spec/spec.opts
+- lib/generators/templates/application/merb_stack/spec/spec_helper.rb
+- lib/generators/templates/application/merb_stack/test
+- lib/generators/templates/application/merb_stack/test/test_helper.rb
 - lib/generators/templates/application/merb_very_flat
 - lib/generators/templates/application/merb_very_flat/application.rbt
 - lib/generators/templates/application/merb_very_flat/spec
@@ -162,9 +242,6 @@ files:
 - lib/generators/templates/component/helper/app
 - lib/generators/templates/component/helper/app/helpers
 - lib/generators/templates/component/helper/app/helpers/%file_name%_helper.rb
-- lib/generators/templates/component/helper/spec
-- lib/generators/templates/component/helper/spec/helpers
-- lib/generators/templates/component/helper/spec/helpers/%file_name%_helper_spec.rb
 - lib/generators/templates/component/layout
 - lib/generators/templates/component/layout/app
 - lib/generators/templates/component/layout/app/views
@@ -174,44 +251,16 @@ files:
 - lib/generators/templates/component/layout/spec/views
 - lib/generators/templates/component/layout/spec/views/layout
 - lib/generators/templates/component/layout/spec/views/layout/%file_name%.html.erb_spec.rb
-- lib/generators/templates/component/migration
-- lib/generators/templates/component/migration/activerecord
-- lib/generators/templates/component/migration/activerecord/schema
-- lib/generators/templates/component/migration/activerecord/schema/migrations
-- lib/generators/templates/component/migration/datamapper
-- lib/generators/templates/component/migration/datamapper/schema
-- lib/generators/templates/component/migration/datamapper/schema/migrations
-- lib/generators/templates/component/migration/sequel
-- lib/generators/templates/component/migration/sequel/schema
-- lib/generators/templates/component/migration/sequel/schema/migrations
 - lib/generators/templates/component/model
-- lib/generators/templates/component/model/activerecord
-- lib/generators/templates/component/model/activerecord/app
-- lib/generators/templates/component/model/activerecord/app/models
 - lib/generators/templates/component/model/app
 - lib/generators/templates/component/model/app/models
 - lib/generators/templates/component/model/app/models/%file_name%.rb
-- lib/generators/templates/component/model/datamapper
-- lib/generators/templates/component/model/datamapper/app
-- lib/generators/templates/component/model/datamapper/app/models
-- lib/generators/templates/component/model/none
-- lib/generators/templates/component/model/none/app
-- lib/generators/templates/component/model/none/app/models
-- lib/generators/templates/component/model/rspec
-- lib/generators/templates/component/model/rspec/spec
-- lib/generators/templates/component/model/rspec/spec/models
-- lib/generators/templates/component/model/sequel
-- lib/generators/templates/component/model/sequel/app
-- lib/generators/templates/component/model/sequel/app/models
 - lib/generators/templates/component/model/spec
 - lib/generators/templates/component/model/spec/models
 - lib/generators/templates/component/model/spec/models/%file_name%_spec.rb
 - lib/generators/templates/component/model/test
 - lib/generators/templates/component/model/test/models
 - lib/generators/templates/component/model/test/models/%file_name%_test.rb
-- lib/generators/templates/component/model/test_unit
-- lib/generators/templates/component/model/test_unit/test
-- lib/generators/templates/component/model/test_unit/test/models
 - lib/generators/templates/component/part_controller
 - lib/generators/templates/component/part_controller/app
 - lib/generators/templates/component/part_controller/app/parts
@@ -220,11 +269,6 @@ files:
 - lib/generators/templates/component/part_controller/app/parts/views/%file_name%_part
 - lib/generators/templates/component/part_controller/app/parts/views/%file_name%_part/index.html.erb
 - lib/generators/templates/component/resource_controller
-- lib/generators/templates/component/resource_controller/activerecord
-- lib/generators/templates/component/resource_controller/activerecord/app
-- lib/generators/templates/component/resource_controller/activerecord/app/controllers
-- lib/generators/templates/component/resource_controller/activerecord/app/views
-- lib/generators/templates/component/resource_controller/activerecord/app/views/%file_name%
 - lib/generators/templates/component/resource_controller/app
 - lib/generators/templates/component/resource_controller/app/controllers
 - lib/generators/templates/component/resource_controller/app/controllers/%file_name%.rb
@@ -234,35 +278,14 @@ files:
 - lib/generators/templates/component/resource_controller/app/views/%file_name%/index.html.erb
 - lib/generators/templates/component/resource_controller/app/views/%file_name%/new.html.erb
 - lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb
-- lib/generators/templates/component/resource_controller/datamapper
-- lib/generators/templates/component/resource_controller/datamapper/app
-- lib/generators/templates/component/resource_controller/datamapper/app/controllers
-- lib/generators/templates/component/resource_controller/datamapper/app/views
-- lib/generators/templates/component/resource_controller/datamapper/app/views/%file_name%
-- lib/generators/templates/component/resource_controller/none
-- lib/generators/templates/component/resource_controller/none/app
-- lib/generators/templates/component/resource_controller/none/app/controllers
-- lib/generators/templates/component/resource_controller/none/app/views
-- lib/generators/templates/component/resource_controller/none/app/views/%file_name%
-- lib/generators/templates/component/resource_controller/sequel
-- lib/generators/templates/component/resource_controller/sequel/app
-- lib/generators/templates/component/resource_controller/sequel/app/controllers
-- lib/generators/templates/component/resource_controller/sequel/app/views
-- lib/generators/templates/component/resource_controller/sequel/app/views/%file_name%
 - lib/generators/templates/component/resource_controller/spec
-- lib/generators/templates/component/resource_controller/spec/controllers
-- lib/generators/templates/component/resource_controller/spec/controllers/%file_name%_spec.rb
+- lib/generators/templates/component/resource_controller/spec/requests
+- lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb
 - lib/generators/templates/component/resource_controller/test
 - lib/generators/templates/component/resource_controller/test/controllers
 - lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb
-- lib/generators/templates/component/session_migration
-- lib/generators/templates/component/session_migration/activerecord
-- lib/generators/templates/component/session_migration/activerecord/schema
-- lib/generators/templates/component/session_migration/activerecord/schema/migrations
-- lib/generators/templates/component/session_migration/sequel
-- lib/generators/templates/component/session_migration/sequel/schema
-- lib/generators/templates/component/session_migration/sequel/schema/migrations
 - lib/merb-gen
+- lib/merb-gen/app_generator.rb
 - lib/merb-gen/generator.rb
 - lib/merb-gen/named_generator.rb
 - lib/merb-gen/namespaced_generator.rb
@@ -277,12 +300,11 @@ files:
 - spec/fixtures/templates/no_modules.test
 - spec/fixtures/templates/some_modules.test
 - spec/generator_spec.rb
-- spec/helper_spec.rb
 - spec/layout_spec.rb
+- spec/merb_core_spec.rb
 - spec/merb_flat_spec.rb
-- spec/merb_full_spec.rb
 - spec/merb_plugin_spec.rb
-- spec/merb_spec.rb
+- spec/merb_stack_spec.rb
 - spec/merb_very_flat_spec.rb
 - spec/migration_spec.rb
 - spec/model_spec.rb

data/lib/generators/merb/merb_full.rb

@@ -1,85 +0,0 @@
-module Merb::Generators
-  class MerbFullGenerator < NamedGenerator
-    #
-    # ==== Paths
-    #
-
-    def self.source_root
-      File.join(super, 'application', 'merb')
-    end
-
-    def self.common_templates_dir
-      File.expand_path(File.join(File.dirname(__FILE__), '..',
-                      'templates', 'application', 'common'))
-    end
-
-    def destination_root
-      File.join(@destination_root, base_name)
-    end
-
-    def common_templates_dir
-      self.class.common_templates_dir
-    end
-
-    #
-    # ==== Generator options
-    #
-
-    option :testing_framework, :default => :rspec,
-                               :desc => 'Testing framework to use (one of: rspec, test_unit).'
-    option :orm, :default => :none,
-                 :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel).'
-    option :template_engine, :default => :erb,
-                :desc => 'Template engine to prefer for this application (one of: erb, haml).'
-
-    desc <<-DESC
-      This generates a Merb application with Ruby on Rails like structure.
-      Generator lets you configure your ORM and testing framework of choice.
-    DESC
-
-    first_argument :name, :required => true, :desc => "Application name"
-
-    #
-    # ==== Common directories & files
-    #
-
-    empty_directory :gems, 'gems'
-    file :thorfile do |file|
-      file.source      = File.join(common_templates_dir, "merb.thor")
-      file.destination = "merb.thor"
-    end
-
-    template :rakefile do |template|
-      template.source = File.join(common_templates_dir, "Rakefile")
-      template.destination = "Rakefile"
-    end
-
-    template :gitignore do |template|
-      template.source = File.join(common_templates_dir, 'dotgitignore')
-      template.destination = ".gitignore"
-    end
-
-    directory :test_dir do |directory|
-      dir    = testing_framework == :rspec ? "spec" : "test"
-
-      directory.source      = File.join(source_root, dir)
-      directory.destination = dir
-    end
-
-    #
-    # ==== Layout specific things
-    #
-
-    glob! "app"
-    glob! "autotest"
-    glob! "config"
-    glob! "public"
-
-    invoke :layout do |generator|
-      generator.new(destination_root, options, 'application')
-    end
-  end
-
-  add_private :app_full, MerbFullGenerator
-
-end

data/lib/generators/merb.rb

@@ -1,24 +0,0 @@
-module Merb::Generators
-  
-  class MerbGenerator < Generator
-
-    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: rspec, test_unit)'
-    option :orm, :default => :none, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
-    option :flat, :as => :boolean, :desc => "Generate a flat application: one file + configs + templates directory."
-    option :very_flat, :as => :boolean, :desc => "Generate a very flat, Sinatra-like one file application."
-    
-    desc <<-DESC
-      Generates a merb application.
-    DESC
-    
-    first_argument :name, :required => true, :desc => "Application name"
-    
-    invoke :app_full, :flat => nil, :very_flat => nil
-    invoke :app_flat, :flat => true
-    invoke :app_very_flat, :very_flat => true
-
-  end
-  
-  add :app, MerbGenerator
-  
-end

data/lib/generators/templates/application/merb/config/environments/staging.rb

@@ -1,7 +0,0 @@
-Merb.logger.info("Loaded STAGING Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = false
-  c[:reload_classes] = false
-  c[:log_level] = :error
-  c[:log_file] = Merb.log_path + "/staging.log"
-}

data/lib/generators/templates/application/merb/config/environments/test.rb

@@ -1,7 +0,0 @@
-Merb.logger.info("Loaded TEST Environment...")
-Merb::Config.use { |c|
-  c[:testing] = true
-  c[:exception_details] = true
-  c[:log_auto_flush ] = true
-  c[:log_level] = :fatal
-}

data/lib/generators/templates/component/helper/spec/helpers/%file_name%_helper_spec.rb

@@ -1,5 +0,0 @@
-require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
-
-describe Merb::<%= full_class_name %>Helper do
-
-end

data/lib/generators/templates/component/resource_controller/spec/controllers/%file_name%_spec.rb

@@ -1,7 +0,0 @@
-require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
-
-describe <%= full_class_name %>, "index action" do
-  before(:each) do
-    dispatch_to(<%= full_class_name %>, :index)
-  end
-end

data/spec/helper_spec.rb

@@ -1,43 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Generators::HelperGenerator do
-
-  before(:each) do
-    @generator = Merb::Generators::HelperGenerator.new('/tmp', {}, 'Stuff')
-  end
-  
-  it_should_behave_like "namespaced generator"
-  
-  it "should create a helper" do
-    @generator.should create('/tmp/app/helpers/stuff_helper.rb')
-  end
-  
-  describe "with rspec" do
-    
-    it "should create a helper spec" do
-      @generator.should create('/tmp/spec/helpers/stuff_helper_spec.rb')
-    end
-    
-  end
-  
-  describe "with a namespace" do
-    
-    before(:each) do
-      @generator = Merb::Generators::HelperGenerator.new('/tmp', {}, 'John::Monkey::Stuff')
-    end
-    
-    it "should create a helper" do
-      @generator.should create('/tmp/app/helpers/john/monkey/stuff_helper.rb')
-    end
-
-    describe "with rspec" do
-
-      it "should create a helper spec" do
-        @generator.should create('/tmp/spec/helpers/john/monkey/stuff_helper_spec.rb')
-      end
-
-    end
-
-  end
-  
-end

data/spec/merb_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Generators::MerbGenerator do
-      
-  it "should invoke the full generator by default" do
-    @generator = Merb::Generators::MerbGenerator.new('/tmp', {}, 'testing')
-    @generator.should invoke(Merb::Generators::MerbFullGenerator).with('testing')
-  end
-  
-  it "should invoke the flat generator if flat is true" do
-    @generator = Merb::Generators::MerbGenerator.new('/tmp', { :flat => true }, 'testing')
-    @generator.should invoke(Merb::Generators::MerbFlatGenerator).with('testing')
-  end
-  
-  it "should invoke the very flat generator if very flat is true" do
-    @generator = Merb::Generators::MerbGenerator.new('/tmp', { :very_flat => true }, 'testing')
-    @generator.should invoke(Merb::Generators::MerbVeryFlatGenerator).with('testing')
-  end
-  
-end