merb_full.rb in merb-gen-0.9.5

- old
+ new

@@ -5,12 +5,14 @@
     def self.source_root
       File.join(super, 'application', 'merb')
     end
     
     option :testing_framework, :default => :rspec, 
-                               :desc => 'Testing framework to use (one of: spec, test_unit).'                               
+                               :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
\ No newline at end of file