merb-gen 0.9.7 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Yehuda Katz
+Copyright (c) 2008 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,7 +17,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.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -38,8 +38,8 @@ spec = Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = %w( merb-gen )
 
-  s.add_dependency "merb-core", ">= 0.9.7"
-  s.add_dependency "templater", ">= 0.2.0"
+  s.add_dependency "merb-core", ">= 0.9.8"
+  s.add_dependency "templater", ">= 0.3.0"
 
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec}/**/*")
@@ -50,15 +50,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
+end
 
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/bin/merb-gen

@@ -3,8 +3,26 @@
 require 'rubygems'
 require 'merb-gen'
 
-Merb::BootLoader.after_app_loads do
+if ARGV[0] == "app"
   Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
-end
+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.start :environment => 'development', :log_level => 'error'
+  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

data/lib/generators/merb/merb_flat.rb

@@ -1,29 +1,98 @@
 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
       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"
-    
-    glob!
-    
+
+    #
+    # ==== Common directories & files
+    #
+
     empty_directory :gems, 'gems'
-    
-    def destination_root
-      File.join(@destination_root, base_name)
+    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
+    #
+
+    file     :readme,      "README.txt"
+
+    template :application, "application.rb"
+
+    glob! "config"
+    glob! "views"
+
+    def class_name
+      self.name.gsub("-", "_").camel_case
     end
-    
   end
-  
+
   add_private :app_flat, MerbFlatGenerator
-  
-end
+
+end
+
+
+
+
+
+
+
+
+
+

data/lib/generators/merb/merb_full.rb

@@ -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
+
+end

data/lib/generators/merb/merb_very_flat.rb

@@ -1,31 +1,72 @@
 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
       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
 
-    file :spec_helper, 'spec/spec_helper.rb', 'spec/spec_helper.rb'
-    
+    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
+    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.camel_case
+      self.name.gsub("-", "_").camel_case
     end
-    
   end
-  
+
   add_private :app_very_flat, MerbVeryFlatGenerator
-  
 end

data/lib/generators/migration.rb

@@ -34,7 +34,8 @@ module Merb::Generators
     
     def version
       # TODO: handle ActiveRecord timestamped migrations
-      format("%03d", current_migration_nr + 1)
+      n = options[:delete] ? current_migration_nr : current_migration_nr + 1
+      format("%03d", n)
     end
 
     protected
@@ -44,7 +45,9 @@ module Merb::Generators
     end
     
     def current_migration_nr
-      current_migration_number = Dir["#{destination_directory}/*"].map{|f| File.basename(f).match(/^(\d+)/)[0].to_i  }.max.to_i
+      current_migration_number = Dir["#{destination_directory}/*"].map do |f|
+        File.basename(f).match(/^(\d+)/)[0].to_i
+      end.max.to_i
     end
     
   end

data/lib/generators/resource_controller.rb

@@ -33,13 +33,13 @@ module Merb::Generators
     end
   
     [:index, :show, :edit, :new].each do |view|
-      template "view_#{view}_none".to_sym, :orm => :none do |template|
+      template "view_#{view}_none".to_sym do |template|
         template.source = "app/views/%file_name%/#{view}.html.erb"
         template.destination = "app/views" / base_path / "#{file_name}/#{view}.html.erb"
       end
     end
     
-    template :controller_spec, :testing_framework => :rspec, :orm => :none do |template|
+    template :controller_spec, :testing_framework => :rspec do |template|
       template.source = 'spec/controllers/%file_name%_spec.rb'
       template.destination = "spec/controllers" / base_path / "#{file_name}_spec.rb"
     end

data/lib/generators/templates/application/{merb → common}/Rakefile

@@ -1,12 +1,9 @@
 require 'rubygems'
-require 'rake'
 require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
-require 'fileutils'
 
-require "merb-core"
+require 'merb-core'
 require 'merb-core/tasks/merb'
+
 include FileUtils
 
 # Load the basic runtime dependencies; this will include 
@@ -22,12 +19,23 @@ tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
 rake_files = Dir["#{tasks_path}/*.rake"]
 rake_files.each{|rake_file| load rake_file }
 
-desc "start runner environment"
+desc "Start runner environment"
 task :merb_env do
   Merb.start_environment(:environment => init_env, :adapter => 'runner')
 end
 
+<% if testing_framework.to_sym == :rspec %>
+require 'spec/rake/spectask'
+require "merb-core/test/tasks/spectasks"
+desc 'Default: run spec examples'
+task :default => 'spec'
+<% end %>
+
+<% if testing_framework.to_sym == :test_unit %>
+require 'rake/testtask'
+<% end %>
+
 ##############################################################################
 # ADD YOUR CUSTOM TASKS IN /lib/tasks
 # NAME YOUR RAKE FILES file_name.rake
-##############################################################################
+##############################################################################

data/lib/generators/templates/application/common/dotgitignore

@@ -0,0 +1,18 @@
+.DS_Store
+log/*
+tmp/*
+TAGS
+*~
+.#*
+schema/schema.rb
+schema/*_structure.sql
+schema/*.sqlite3
+schema/*.sqlite
+schema/*.db
+*.sqlite
+*.sqlite3
+*.db
+src/*
+.hgignore
+.hg/*
+.svn/*