merb-gen 0.9.8 → 0.9.9

data/README

@@ -6,10 +6,13 @@ generators for Merb.
 ==== Usage
 
 To generate directory structure for a new merb app, run merb-gen app <app-name>.
-For instance, <tt>merb-gen app foo</tt> would create a new foo merb app inside of the foo directory.
+For instance, <tt>merb-gen app foo</tt> would create a new foo merb stack application
+inside of the foo directory. Merb stack sets up commonly used Merb and DataMapper gems
+to quickly get you started.
 
-Use <tt>--flat</tt> to generate a flattened application (very simple directory structure)
-and <tt>--very-flat</tt> to generate a single file application.
+Use <tt>merb-gen core</tt> to generate minimal merb-core application with full layout.
+Use <tt>merb-gen flat</tt> to generate a flattened application (very simple directory structure)
+and <tt>merb-gen very-flat</tt> to generate a single file application.
 
 To generate a new merb plugin, run merb-gen plugin &lt;plugin_name&gt;.
 

data/Rakefile

@@ -4,6 +4,8 @@ require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
+
 ##############################################################################
 # Package && release
 ##############################################################################
@@ -17,7 +19,7 @@ GEM_EMAIL  = "jonas.nicklas@gmail.com"
 
 GEM_NAME    = "merb-gen"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -38,11 +40,11 @@ spec = Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = %w( merb-gen )
 
-  s.add_dependency "merb-core", ">= 0.9.8"
-  s.add_dependency "templater", ">= 0.3.0"
+  s.add_dependency "merb-core", ">= 0.9.9"
+  s.add_dependency "templater", ">= 0.3.3"
 
   s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec,merb}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/bin/merb-gen

@@ -3,26 +3,4 @@
 require 'rubygems'
 require 'merb-gen'
 
-if ARGV[0] == "app"
-  Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
-else
-  Merb::BootLoader.after_app_loads do
-    Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
-  end
-
-  Merb::Config.setup({
-    :log_level        => :fatal,
-    :log_delimiter    => " ~ ",
-    :log_auto_flush   => false,
-    :reload_templates => false,
-    :reload_classes   => false
-  })
-
-  Merb::BootLoader::Logger.run  
-  Merb::BootLoader::BuildFramework.run
-  Merb::BootLoader::Dependencies.run
-
-  Merb::BootLoader::BeforeAppLoads.run
-  Merb::BootLoader::ReloadClasses.run
-  Merb::BootLoader::AfterAppLoads.run
-end
+Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)

data/lib/generators/controller.rb

@@ -36,9 +36,11 @@ module Merb::Generators
       template.source = 'test/controllers/%file_name%_test.rb'
       template.destination = "test/controllers" / base_path / "#{file_name}_test.rb"
     end
-    
+
+    def after_generation
+      STDOUT.puts "\n\nDon't forget to add request/controller tests first."
+    end
   end
   
   add :controller, ControllerGenerator
-  
 end

data/lib/generators/helper.rb

@@ -19,11 +19,6 @@ module Merb::Generators
       template.destination = "app/helpers" / base_path / "#{file_name}_helper.rb"
     end
     
-    template :helper_spec, :testing_framework => :rspec do |template|
-      template.source = 'spec/helpers/%file_name%_helper_spec.rb'
-      template.destination = "spec/helpers" / base_path / "#{file_name}_helper_spec.rb"
-    end
-    
   end
   
   add :helper, HelperGenerator

data/lib/generators/merb/merb_core.rb

@@ -0,0 +1,95 @@
+module Merb
+  module Generators
+    class MerbCoreGenerator < AppGenerator
+      #
+      # ==== Paths
+      #
+      
+      def self.source_root
+        File.join(super, 'application', 'merb_core')
+      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
+
+      file :gitignore do |file|
+        file.source = File.join(common_templates_dir, 'dotgitignore')
+        file.destination = ".gitignore"
+      end
+
+      file :htaccess do |file|
+        file.source = File.join(common_templates_dir, 'dothtaccess')
+        file.destination = 'public/.htaccess'
+      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
+      #
+
+      # empty array means all files are considered to be just
+      # files, not templates
+      glob! "app"
+      glob! "autotest"
+      glob! "config"
+      glob! "doc",      []
+      glob! "public"      
+
+      invoke :layout do |generator|
+        generator.new(destination_root, options, 'application')
+      end
+    end
+
+    add :core, MerbCoreGenerator
+
+  end
+end

data/lib/generators/merb/merb_flat.rb

@@ -1,90 +1,91 @@
-module Merb::Generators
-  class MerbFlatGenerator < NamedGenerator
-    #
-    # ==== Paths
-    #
-
-    def self.source_root
-      File.join(super, 'application', 'merb_flat')
-    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
+module Merb
+  module Generators
+    class MerbFlatGenerator < AppGenerator
+      #
+      # ==== Paths
+      #
+
+      def self.source_root
+        File.join(super, 'application', 'merb_flat')
+      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 flat merb application: all code but config files and
       templates fits in one application. This is something in between Sinatra
       and "regular" Merb application.
     DESC
 
-    first_argument :name, :required => true, :desc => "Application name"
+      first_argument :name, :required => true, :desc => "Application name"
 
-    #
-    # ==== Common directories & files
-    #
+      #
+      # ==== 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
+      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 :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
+      file :gitignore do |file|
+        file.source = File.join(common_templates_dir, 'dotgitignore')
+        file.destination = ".gitignore"
+      end
 
-    directory :test_dir do |directory|
-      dir    = testing_framework == :rspec ? "spec" : "test"
+      directory :test_dir do |directory|
+        dir = testing_framework == :rspec ? "spec" : "test"
 
-      directory.source      = File.join(source_root, dir)
-      directory.destination = dir
-    end
+        directory.source      = File.join(source_root, dir)
+        directory.destination = dir
+      end
 
-    #
-    # ==== Layout specific things
-    #
+      #
+      # ==== Layout specific things
+      #
 
-    file     :readme,      "README.txt"
+      file     :readme,      "README.txt"
 
-    template :application, "application.rb"
+      template :application, "application.rb"
 
-    glob! "config"
-    glob! "views"
+      glob! "config"
+      glob! "views"
 
-    def class_name
-      self.name.gsub("-", "_").camel_case
+      def class_name
+        self.name.gsub("-", "_").camel_case
+      end
     end
-  end
-
-  add_private :app_flat, MerbFlatGenerator
 
+    add :flat, MerbFlatGenerator
+  end
 end
 
 

data/lib/generators/merb/merb_stack.rb

@@ -0,0 +1,110 @@
+module Merb
+  module Generators
+    class MerbStackGenerator < AppGenerator
+      #
+      # ==== Paths
+      #
+
+      def self.source_root
+        File.join(super, 'application', 'merb_stack')
+      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
+      
+      def testing_framework
+        :rspec
+      end
+      
+      def orm
+        :datamapper
+      end
+
+      #
+      # ==== Generator options
+      #
+
+      option :template_engine, :default => :erb,
+      :desc => 'Template engine to prefer for this application (one of: erb, haml).'
+
+      desc <<-DESC
+      This generates a "prepackaged" (or "opinionated") Merb application that uses DataMapper,
+      RSpec, helpers, assets, mailer, caching, slices and merb-auth all out of the box.
+    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 = "tasks/merb.thor"
+      end
+
+      template :rakefile do |template|
+        template.source = File.join(common_templates_dir, "Rakefile")
+        template.destination = "Rakefile"
+      end
+
+      file :gitignore do |file|
+        file.source = File.join(common_templates_dir, 'dotgitignore')
+        file.destination = ".gitignore"
+      end
+
+      file :htaccess do |file|
+        file.source = File.join(common_templates_dir, 'dothtaccess')
+        file.destination = 'public/.htaccess'
+      end
+      
+      file :doctask do |file|
+        file.source = File.join(common_templates_dir, 'doc.thor')
+        file.destination = 'tasks/doc.thor'
+      end
+      
+      file :jquery do |file|
+        file.source = File.join(common_templates_dir, 'jquery.js')
+        file.destination = 'public/javascripts/jquery.js'
+      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
+      #
+
+      # empty array means all files are considered to be just
+      # files, not templates
+      glob! "app"
+      glob! "autotest"
+      glob! "config"
+      glob! "doc",      []
+      glob! "public"
+      glob! "lib"
+      glob! "merb"
+
+      invoke :layout do |generator|
+        generator.new(destination_root, options, 'application')
+      end
+    end
+
+    add :app,   MerbStackGenerator
+  end
+end

data/lib/generators/merb/merb_very_flat.rb

@@ -1,72 +1,69 @@
-module Merb::Generators
-
-  class MerbVeryFlatGenerator < NamedGenerator
-
-    def self.source_root
-      File.join(super, 'application', 'merb_very_flat')
-    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
-      File.expand_path(File.join(File.dirname(__FILE__), '..',
-                      'templates', 'application', 'common'))
-    end
-
-
-    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
+module Merb
+  module Generators
+    class MerbVeryFlatGenerator < AppGenerator
+      def self.source_root
+        File.join(super, 'application', 'merb_very_flat')
+      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
+        File.expand_path(File.join(File.dirname(__FILE__), '..',
+                                   'templates', 'application', 'common'))
+      end
+
+      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 very flat merb application: the whole application
       fits in one file, very much like Sinatra or Camping.
     DESC
 
-    first_argument :name, :required => true, :desc => "Application name"
-
-    template :application do |template|
-      template.source = 'application.rbt'
-      template.destination = "#{base_name}.rb"
-    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      = dir
-      directory.destination = dir
+      first_argument :name, :required => true, :desc => "Application name"
+
+      template :application do |template|
+        template.source = 'application.rbt'
+        template.destination = "#{base_name}.rb"
+      end
+
+      file :gitignore do |file|
+        file.source = File.join(common_templates_dir, 'dotgitignore')
+        file.destination = ".gitignore"
+      end
+
+      directory :test_dir do |directory|
+        dir = testing_framework == :rspec ? "spec" : "test"
+        directory.source      = dir
+        directory.destination = dir
+      end
+
+      template :rakefile do |template|
+        template.source = File.join(common_templates_dir, "Rakefile")
+        template.destination = "Rakefile"
+      end
+
+      file :thorfile do |file|
+        file.source      = File.join(common_templates_dir, "merb.thor")
+        file.destination = "merb.thor"
+      end
+
+      def class_name
+        self.name.gsub("-", "_").camel_case
+      end
     end
 
-    template :rakefile do |template|
-      template.source = File.join(common_templates_dir, "Rakefile")
-      template.destination = "Rakefile"
-    end
-
-    file :thorfile do |file|
-      file.source      = File.join(common_templates_dir, "merb.thor")
-      file.destination = "merb.thor"
-    end
-
-    def class_name
-      self.name.gsub("-", "_").camel_case
-    end
+    add :very_flat, MerbVeryFlatGenerator
   end
-
-  add_private :app_very_flat, MerbVeryFlatGenerator
 end

data/lib/generators/merb_plugin.rb

@@ -1,6 +1,11 @@
 module Merb::Generators
   
   class MerbPluginGenerator < NamedGenerator
+    
+    def initialize(*args)
+      Merb.disable(:initfile)
+      super
+    end
 
     def self.source_root
       File.join(super, 'application', 'merb_plugin')

data/lib/generators/model.rb

@@ -2,6 +2,7 @@ module Merb::Generators
   
   class ModelGenerator < NamespacedGenerator
 
+    
     def self.source_root
       File.join(super, 'component', 'model')
     end
@@ -39,9 +40,11 @@ module Merb::Generators
     def attributes_for_accessor
       self.attributes.keys.map{|a| ":#{a}" }.compact.uniq.join(", ")
     end
-    
+
+    def after_generation
+      STDOUT.puts "\n\nDon't forget to add model tests first."
+    end
   end
   
   add :model, ModelGenerator
-  
 end

data/lib/generators/resource.rb

@@ -8,6 +8,9 @@ module Merb::Generators
     
     first_argument :name, :required => true, :desc => "resource name (singular)"
     second_argument :attributes, :as => :hash, :default => {}, :desc => "space separated resource model properties in form of name:type. Example: state:string"
+
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
+    option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     
     invoke :model do |generator|
       generator.new(destination_root, options, model_name, attributes)
@@ -24,9 +27,11 @@ module Merb::Generators
     def model_name
       name
     end
-    
+
+    def after_generation
+      STDOUT << message("Don't forget to set your resource route in config/router.rb for instance: resources :#{model_name.downcase}s ")
+    end
   end
   
   add :resource, ResourceGenerator
-  
 end