merb-gen 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,78 +1,68 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Generators suite for Merb."
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Jonas Nicklas"
-GEM_EMAIL  = "jonas.nicklas@gmail.com"
-
-GEM_NAME    = "merb-gen"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.bindir = "bin"
-  s.executables = %w( merb-gen )
-
-  s.add_dependency "merb-core", ">= #{Merb::VERSION}"
-  s.add_dependency "templater", ">= 0.3.3"
-
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec,merb}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-gen/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Generators::VERSION
+
+    gemspec.name        = "merb-gen"
+    gemspec.description = "Merb plugin containing useful code generators"
+    gemspec.summary     = "Merb plugin that provides a suite of code generators for Merb."
+
+    gemspec.authors     = [ "Jonas Nicklas" ]
+    gemspec.email       = "jonas.nicklas@gmail.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{bin,lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency('merb-core', "~> #{Merb::VERSION}")
+    gemspec.add_dependency "templater", ">= 1.0.0"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
+
+    # Executable files
+    gemspec.executables = 'merb-gen'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 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
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Generators::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/bin/merb-gen

@@ -1,6 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'merb-gen'
 
-Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require '.bundle/environment'
+rescue LoadError
+  begin
+    require 'rubygems'
+    require 'bundler'
+    Bundler.setup
+  rescue Bundler::GemfileNotFound
+  end
+end
+
+Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)

data/lib/generators/fcgi.rb

@@ -0,0 +1,16 @@
+module Merb::Generators
+  class FcgiGenerator < AppGenerator
+    
+    desc <<-DESC
+      Generates the configuration files needed to run Merb with FastCGI.
+    DESC
+    
+    def self.source_root
+      File.join(super, 'component', 'fcgi')
+    end
+    
+    file :dothtaccess, "dothtaccess", File.join("public", ".htaccess")
+    file :merbfcgi, "merb.fcgi", File.join("public", "merb.fcgi")
+  end
+  add :fcgi, FcgiGenerator
+end

data/lib/generators/merb/merb_core.rb

@@ -44,7 +44,19 @@ module Merb
       # ==== Common directories & files
       #
 
-      empty_directory :gems, 'gems'
+      empty_directory :lib_tasks, 'lib/tasks'
+
+      empty_directory :bin, 'bin'
+      template :merb do |template|
+        template.source = File.join(common_templates_dir, "merb")
+        template.destination = "bin/merb"
+      end
+
+      template :gemfile do |template|
+        template.source = File.join(common_templates_dir, "Gemfile")
+        template.destination = "Gemfile"
+      end
+
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -55,22 +67,12 @@ module Merb
         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
-      
-      directory :thor_file do |directory|
-        directory.source = File.join(common_templates_dir, "merb_thor")
-        directory.destination = File.join("tasks", "merb.thor")
-      end
 
       #
       # ==== Layout specific things
@@ -83,7 +85,7 @@ module Merb
       glob! "config"
       glob! "doc",      []
       glob! "public"      
-
+      
       invoke :layout do |generator|
         generator.new(destination_root, options, 'application')
       end

data/lib/generators/merb/merb_flat.rb

@@ -44,7 +44,17 @@ module Merb
       # ==== Common directories & files
       #
 
-      empty_directory :gems, 'gems'
+      empty_directory :bin, 'bin'
+      template :merb do |template|
+        template.source = File.join(common_templates_dir, "merb")
+        template.destination = "bin/merb"
+      end
+
+      template :gemfile do |template|
+        template.source = File.join(common_templates_dir, "Gemfile")
+        template.destination = "Gemfile"
+      end
+
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -62,11 +72,6 @@ module Merb
         directory.destination = dir
       end
       
-      directory :thor_file do |directory|
-        directory.source = File.join(common_templates_dir, "merb_thor")
-        directory.destination = File.join("tasks", "merb.thor")
-      end
-
       #
       # ==== Layout specific things
       #

data/lib/generators/merb/merb_stack.rb

@@ -1,3 +1,5 @@
+require 'merb-gen/version'
+
 module Merb
   module Generators
     class MerbStackGenerator < AppGenerator
@@ -48,7 +50,14 @@ module Merb
       # ==== Common directories & files
       #
 
-      empty_directory :gems, 'gems'
+      empty_directory :bin, 'bin'
+      template :merb do |template|
+        template.source = File.join(common_templates_dir, "merb")
+        template.destination = "bin/merb"
+      end
+
+      empty_directory :lib_tasks, 'lib/tasks'
+
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -59,26 +68,11 @@ module Merb
         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 :thor_file do |directory|
-        directory.source = File.join(common_templates_dir, "merb_thor")
-        directory.destination = File.join("tasks", "merb.thor")
-      end
-
       directory :test_dir do |directory|
         dir = testing_framework == :rspec ? "spec" : "test"
 
@@ -89,17 +83,15 @@ module Merb
       #
       # ==== Layout specific things
       #
-
-      def merb_gems_version
-        Merb::VERSION
-      end
+      template :gemfile, "Gemfile", "Gemfile"
+      file :passenger_config, "config.ru"
 
       def dm_gems_version
-        Merb::DM_VERSION
+        Merb::Generators::DM_VERSION_REQUIREMENT
       end
       
       def do_gems_version
-        Merb::DO_VERSION
+        Merb::Generators::DO_VERSION_REQUIREMENT
       end
       
       # empty array means all files are considered to be just

data/lib/generators/merb/merb_very_flat.rb

@@ -1,6 +1,10 @@
 module Merb
   module Generators
     class MerbVeryFlatGenerator < AppGenerator
+      #
+      # ==== Paths
+      #
+
       def self.source_root
         File.join(super, 'application', 'merb_very_flat')
       end
@@ -15,10 +19,13 @@ module Merb
       end
 
       def common_templates_dir
-        File.expand_path(File.join(File.dirname(__FILE__), '..',
-                                   'templates', 'application', 'common'))
+        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,
@@ -33,6 +40,26 @@ module Merb
 
       first_argument :name, :required => true, :desc => "Application name"
 
+      #
+      # ==== Common directories & files
+      #
+
+      empty_directory :bin, 'bin'
+      template :merb do |template|
+        template.source = File.join(common_templates_dir, "merb")
+        template.destination = "bin/merb"
+      end
+
+      template :gemfile do |template|
+        template.source = File.join(common_templates_dir, "Gemfile")
+        template.destination = "Gemfile"
+      end
+
+      template :rakefile do |template|
+        template.source = File.join(common_templates_dir, "Rakefile")
+        template.destination = "Rakefile"
+      end
+
       template :application do |template|
         template.source = 'application.rbt'
         template.destination = "#{base_name}.rb"
@@ -49,15 +76,9 @@ module Merb
         directory.destination = dir
       end
 
-      directory :thor_file do |directory|
-        directory.source = File.join(common_templates_dir, "merb_thor")
-        directory.destination = File.join("tasks", "merb.thor")
-      end
-
-      template :rakefile do |template|
-        template.source = File.join(common_templates_dir, "Rakefile")
-        template.destination = "Rakefile"
-      end
+      #
+      # ==== Layout specific things
+      #
 
       def class_name
         self.name.gsub("-", "_").camel_case

data/lib/generators/passenger.rb

@@ -0,0 +1,15 @@
+module Merb::Generators
+  class PassengerGenerator < AppGenerator
+    
+    desc <<-DESC
+      Generates the configuration files needed to run Merb with Phusion Passenger.
+    DESC
+    
+    def self.source_root
+      File.join(super, 'application', 'merb_stack')
+    end
+
+    file :config, "config.ru"
+  end
+  add :passenger, PassengerGenerator
+end

data/lib/generators/resource_controller.rb

@@ -32,7 +32,7 @@ module Merb::Generators
       template.destination = "app/controllers" / base_path / "#{file_name}.rb"
       self.add_resource_route(self.plural_model) unless skip_route_definition?
     end
-
+  
     [:index, :show, :edit, :new].each do |view|
       template "view_#{view}_none".to_sym, :template_engine => :erb, :orm => :none do |template|
         template.source = "app/views/%file_name%/#{view}.html.erb"

data/lib/generators/templates/application/common/Gemfile

@@ -0,0 +1,12 @@
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = "<%= merb_gems_version %>"
+
+# If you did disable json for Merb, comment out this line.
+# If you want use json gem just change it.
+# Don't use json gem version lower than 1.1.7! Older versions has security bug!
+gem "json_pure", ">= 1.1.7", :require => "json"
+gem "merb-core", merb_gems_version
+
+<%= gems_for_orm(orm) %>
+<%= gems_for_template_engine(template_engine) %>
+<%= gems_for_testing_framework(testing_framework) %>

data/lib/generators/templates/application/common/Rakefile

@@ -1,4 +1,13 @@
-require 'rubygems'
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require '.bundle/environment'
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
 require 'rake/rdoctask'
 
 require 'merb-core'

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

@@ -16,6 +16,6 @@ src/*
 .hgignore
 .hg/*
 .svn/*
-gems/gems/*
-gems/specifications/*
-merb_profile_results
+gems/
+!gems/cache/
+merb_profile_results

data/lib/generators/templates/application/common/merb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require File.expand_path('.bundle/environment', __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
+require 'merb-core'
+
+ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a mongrel]
+end
+
+Merb.start

data/lib/generators/templates/application/merb_core/autotest/merb_rspec.rb

@@ -14,7 +14,7 @@ class Autotest::MerbRspec < Autotest
     super
 
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% 
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3|.*\.thor)%
     # Ignore SCM directories and custom Autotest mappings
     %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
 
@@ -44,7 +44,7 @@ class Autotest::MerbRspec < Autotest
     # Any change to global_helpers will result in all view and controller
     # tests being run
     add_mapping %r%^app/helpers/global_helpers\.rb% do
-      files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$%
+      files_matching %r%^spec/(views|controllers|helpers|requests)/.*_spec\.rb$%
     end
 
     # Any change to a helper will cause its spec to be run
@@ -54,7 +54,7 @@ class Autotest::MerbRspec < Autotest
 
     # Changes to a view cause its spec to be run
     add_mapping %r%^app/views/(.*)/% do |_, m|
-      spec_for(m[1], 'view')
+      spec_for(m[1], 'request')
     end
 
     # Changes to a controller result in its corresponding spec being run. If
@@ -62,15 +62,15 @@ class Autotest::MerbRspec < Autotest
     # controller specs are run.
     add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
       if ["application", "exception"].include?(m[1])
-        files_matching %r%^spec/controllers/.*_spec\.rb$%
+        files_matching %r%^spec/requests/.*_spec\.rb$%
       else
-        spec_for(m[1], 'controller')
+        spec_for(m[1], 'request')
       end
     end
 
     # If a change is made to the router, run controller, view and helper specs
     add_mapping %r%^config/router.rb$% do
-      files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
+      files_matching %r%^spec/(views|controllers|helpers|requests)/.*_spec\.rb$%
     end
 
     # If any of the major files governing the environment are altered, run
@@ -157,9 +157,9 @@ private
   # String
   #
   # ==== Example
-  #   > spec_for('post', :view')
-  #   => "spec/views/post_spec.rb"
+  #   > spec_for('post', :model')
+  #   => "spec/models/post_spec.rb"
   def spec_for(match, kind)
-    File.join("spec", kind + 's', "#{match}_spec.rb")
+    files_matching %r%^spec/#{kind}s/#{match}(/.*)?_spec.rb$%
   end
 end

data/lib/generators/templates/application/merb_core/config/init.rb

@@ -1,9 +1,7 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
- 
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
 
-<%= "# " unless orm != :none %> use_orm :<%= orm %>
+# Specify your dependencies in the Gemfile
+<%= "use_orm :#{orm}" unless orm == :none %>
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>
  
@@ -22,4 +20,4 @@ end
  
 Merb::BootLoader.after_app_loads do
   # This will get executed after your app's classes have been loaded.
-end
+end

data/lib/generators/templates/application/merb_core/spec/spec.opts

@@ -1,2 +1,2 @@
 --format specdoc
---colour
+--colour

data/lib/generators/templates/application/merb_core/spec/spec_helper.rb

@@ -1,13 +1,15 @@
-require "rubygems"
-
-# Add the local gems dir if found within the app root; any dependencies loaded
-# hereafter will try to load from the local gems before loading system gems.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
 end
 
-require "merb-core"
 require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "merb-core"
 
 # this loads all plugins required in your init file so don't add them
 # here again, Merb will do it for you

data/lib/generators/templates/application/merb_core/test/test_helper.rb

@@ -1,9 +1,11 @@
-require "rubygems"
-
-# Add the local gems dir if found within the app root; any dependencies loaded
-# hereafter will try to load from the local gems before loading system gems.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
 end
 
 require "merb-core"
@@ -16,4 +18,4 @@ Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
 class Test::Unit::TestCase
   include Merb::Test::RequestHelper
   # Add more helper methods to be used by all tests here...
-end
+end

data/lib/generators/templates/application/merb_flat/application.rbt

@@ -1,5 +1,8 @@
 class <%= class_name %> < Merb::Controller
 
+  # Templates go in: views/index.html.<%= template_engine %>
+  # Layouts go in: views/layout.application.html.<%= template_engine %>
+  # Modify this method to use another location.
   def _template_location(action, type = nil, controller = controller_name)
     controller == "layout" ? "layout.#{action}.#{type}" : "#{action}.#{type}"
   end