merb_full.rb in merb-gen-0.9.8

- old
+ new
@@ -1,39 +1,85 @@
 module Merb::Generators
-  
   class MerbFullGenerator < NamedGenerator
+    #
+    # ==== Paths
+    #
 
     def self.source_root
       File.join(super, 'application', 'merb')
     end
-    
-    option :testing_framework, :default => :rspec, 
-                               :desc => 'Testing framework to use (one of: rspec, test_unit).'                               
-    option :orm, :default => :none, 
+
+    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
-    
-    glob!
-    
-    empty_directory :gems, 'gems'
-        
+
     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
-    
-    def destination_root
-      File.join(@destination_root, base_name)
-    end
-    
   end
-  
+
   add_private :app_full, MerbFullGenerator
-  
-end
\ No newline at end of file
+
+end