merb-gen 0.9.9 → 0.9.10

data/Rakefile

@@ -40,7 +40,7 @@ spec = Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = %w( merb-gen )
 
-  s.add_dependency "merb-core", ">= 0.9.9"
+  s.add_dependency "merb-core", ">= #{Merb::VERSION}"
   s.add_dependency "templater", ">= 0.3.3"
 
   s.require_path = 'lib'

data/lib/generators/merb/merb_stack.rb

@@ -90,6 +90,14 @@ module Merb
       # ==== Layout specific things
       #
 
+      def merb_gems_version
+        "0.9.10"
+      end
+
+      def dm_gems_version
+        "0.9.6"
+      end
+      
       # empty array means all files are considered to be just
       # files, not templates
       glob! "app"

data/lib/generators/resource.rb

@@ -29,7 +29,7 @@ module Merb::Generators
     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 ")
+      STDOUT << message("resources :#{model_name.pluralize.snake_case} route added to config/router.rb")
     end
   end
   

data/lib/generators/resource_controller.rb

@@ -30,6 +30,8 @@ module Merb::Generators
     template :controller_none, :orm => :none do |template|
       template.source = "app/controllers/%file_name%.rb"
       template.destination = "app/controllers" / base_path / "#{file_name}.rb"
+      
+      self.add_resource_route(self.plural_model)
     end
   
     [:index, :show, :edit, :new].each do |view|
@@ -49,6 +51,16 @@ module Merb::Generators
       template.destination = "test/controllers" / base_path / "#{file_name}_test.rb"
     end
     
+    def add_resource_route(plural_resource)
+      router_path = Merb.root + "/config/router.rb"
+      sentinel = "Merb::Router.prepare do"
+      to_inject = "resources :#{plural_resource}"
+      if File.exist?(router_path)
+        content = File.read(router_path).gsub(/(#{Regexp.escape(sentinel)})/mi){|match| "#{match}\n  #{to_inject}"}
+        File.open(router_path, 'wb') { |file| file.write(content) }
+      end
+    end
+    
     def model_class_name
       class_name.singularize
     end

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

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'yaml'
 
 # Important - don't change this line or its position
-MERB_THOR_VERSION = '0.0.5'
+MERB_THOR_VERSION = '0.0.52'
 
 ##############################################################################
 
@@ -198,7 +198,7 @@ module GemManagement
       options[:version] = Gem::Requirement.new ["= #{options[:version]}"]
     end
     update_source_index(options[:install_dir]) if options[:install_dir]
-    Gem::Uninstaller.new(gem, options).uninstall
+    Gem::Uninstaller.new(gem, options).uninstall rescue nil
   end
 
   def clobber(source_dir)
@@ -260,7 +260,7 @@ module GemManagement
         gemspecs = ::Gem.source_index.search(dep)
         local = gemspecs.reverse.find { |s| s.loaded_from.index(gem_dir) == 0 }
         if local
-          local_specs  << local
+          local_specs << local
         elsif gemspecs.last
           system_specs << gemspecs.last
         else
@@ -268,6 +268,15 @@ module GemManagement
         end
       end
       ::Gem.clear_paths
+    else
+      dependencies.each do |dep|
+        gemspecs = ::Gem.source_index.search(dep)
+        if gemspecs.last
+          system_specs << gemspecs.last
+        else
+          missing_deps << dep
+        end
+      end
     end
     [system_specs, local_specs, missing_deps]
   end
@@ -316,9 +325,12 @@ end
 if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) ||
    File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems'))
   $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
+  if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last)
+    version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1]
+  end
 end
 
-version = "#{Gem::Requirement.default}"
+version ||= "#{Gem::Requirement.default}"
 
 if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
   version = $1
@@ -415,17 +427,12 @@ end
 
 module MerbThorHelper
   
-  attr_accessor :include_dependencies
+  attr_accessor :include_dependencies, :force_gem_dir
   
   def self.included(base)
     base.send(:include, ColorfulMessages)
     base.extend ColorfulMessages
   end
-
-  def install_dependency(dependency, opts = {})
-    opts[:version] ||= dependency.version_requirements.to_s
-    Merb::Gem.install(dependency.name, default_install_options.merge(opts))
-  end
   
   def source_manager
     @_source_manager ||= SourceManager.new(source_dir)
@@ -467,6 +474,11 @@ module MerbThorHelper
       end
     end
   end
+  
+  def install_dependency(dependency, opts = {})
+    opts[:version] ||= dependency.version_requirements.to_s
+    Merb::Gem.install(dependency.name, default_install_options.merge(opts))
+  end
 
   def install_dependency_from_source(dependency, opts = {})
     matches = Dir[File.join(source_dir, "**", dependency.name, "{Rakefile,Thorfile}")]
@@ -506,7 +518,7 @@ module MerbThorHelper
         note 'Uninstalling existing local gems:'
         local.each { |gemspec| note "Uninstalled #{gemspec.name}" }
       else
-        message 'Uninstalling existing local gems:' 
+        message 'Uninstalling existing local gems:' if local.size > 1
         local.each do |gemspec|
           Merb::Gem.uninstall(gemspec.name, default_uninstall_options)
         end
@@ -571,6 +583,7 @@ module MerbThorHelper
     
   # If a local ./gems dir is found, return it.
   def gem_dir
+    return force_gem_dir if force_gem_dir
     if File.directory?(dir = default_gem_dir)
       dir
     end
@@ -605,7 +618,7 @@ module MerbThorHelper
     ENV['THOR_SUDO'] ||= "sudo"
     sudo = Gem.win_platform? ? "" : ENV['THOR_SUDO']
   end
-  
+    
   def local_gemspecs(directory = gem_dir)
     if File.directory?(specs_dir = File.join(directory, 'specifications'))
       Dir[File.join(specs_dir, '*.gemspec')].map do |gemspec_path|
@@ -893,10 +906,10 @@ module Merb
       if method = strategy?(strategy)
         # Clobber existing local dependencies
         clobber_dependencies!
-    
+        
         # Run the chosen strategy - collect files installed from stable gems
         installed_from_stable = send(method, deps).map { |d| d.name }
-      
+
         # Sleep a bit otherwise the following steps won't see the new files
         sleep(deps.length) if deps.length > 0
       
@@ -910,16 +923,10 @@ module Merb
           end           
         end
         
-        # Ask for system installation of minigem - needs sudo...
-        if deps.find { |d| d.name == 'minigems' }
-          info "Installing minigems.rb on your system..."
-          `#{sudo} minigem install`
-        end
-          
         # Add local binaries for the installed framework dependencies
         comps = Merb::Stack.all_components & deps.map { |d| d.name }
         comps << { :no_minigems => 'merb-gen' }
-        ensure_bin_wrapper_for(*comps)
+        ensure_bin_wrapper_for(*comps)          
         return true
       end
       false
@@ -1087,9 +1094,6 @@ module Merb
     rescue => e
       error "Couldn't extract dependencies from application!"
       error e.message
-      
-      p e.backtrace
-      
       puts  "Make sure you're executing the task from your app (--merb-root), or"
       puts  "specify a config option (--config or --config-file=YAML_FILE)"
       return []
@@ -1119,6 +1123,7 @@ module Merb
     # regardless of actual application dependency settings.
     
     DM_STACK = %w[
+      extlib
       dm-core
       dm-aggregates
       dm-migrations
@@ -1127,9 +1132,8 @@ module Merb
       dm-validations
     ]
     
-    MERB_STACK = %w[
-      minigems
-      
+    MERB_STACK = %w[      
+      extlib
       merb-core
       merb-action-args
       merb-assets
@@ -1140,9 +1144,8 @@ module Merb
       merb-auth
     ] + DM_STACK
     
-    MERB_BASICS = %w[
-      minigems
-      
+    MERB_BASICS = %w[      
+      extlib
       merb-core
       merb-action-args
       merb-assets
@@ -1281,6 +1284,7 @@ module Merb
     # See also: Merb::Dependencies#uninstall
     #
     # Examples:
+    #
     # merb:stack:uninstall                                      # uninstall the default merb stack
     # merb:stack:uninstall merb-more                            # uninstall merb-more
     # merb:stack:uninstall merb-core thor merb-slices           # uninstall the specified gems
@@ -1294,6 +1298,48 @@ module Merb
       clobber_dependencies!
     end
     
+    # Install or uninstall minigems from the system.
+    #
+    # Due to the specific nature of MiniGems it can only be installed system-wide.
+    #
+    # Examples:
+    #
+    # merb:stack:minigems install                               # install minigems
+    # merb:stack:minigems uninstall                             # uninstall minigems
+    
+    desc 'minigems (install|uninstall)', 'Install or uninstall minigems (needs sudo privileges)'
+    def minigems(action)
+      case action
+      when 'install'
+        Kernel.system "#{sudo} thor merb:stack:install_minigems"
+      when 'uninstall'
+        Kernel.system "#{sudo} thor merb:stack:uninstall_minigems"
+      else
+        error "Invalid command: merb:stack:minigems #{action}"
+      end
+    end    
+    
+    # hidden minigems install task
+    def install_minigems
+      message "Installing MiniGems"
+      mngr = self.dependency_manager
+      deps = gather_dependencies('minigems')
+      mngr.system, mngr.local, mngr.missing = Merb::Gem.partition_dependencies(deps, gem_dir)
+      mngr.force_gem_dir = ::Gem.dir
+      mngr.install_dependencies(strategy, deps)
+      Kernel.system "#{sudo} minigem install"
+    end
+    
+    # hidden minigems uninstall task
+    def uninstall_minigems
+      message "Uninstalling MiniGems"
+      Kernel.system "#{sudo} minigem uninstall"
+      deps = gather_dependencies('minigems')
+      self.system, self.local, self.missing = Merb::Gem.partition_dependencies(deps, gem_dir)
+      # Clobber existing local dependencies - based on self.local
+      clobber_dependencies!      
+    end
+    
     protected
     
     def gather_dependencies(comps = [])
@@ -1900,8 +1946,7 @@ module Merb
         'sequel'        => "git://github.com/wayneeseguin/sequel.git",
         'do'            => "git://github.com/sam/do.git",
         'thor'          => "git://github.com/wycats/thor.git",
-        'rake'          => "git://github.com/jimweirich/rake.git",
-        'minigems'      => "git://github.com/fabien/minigems.git"
+        'rake'          => "git://github.com/jimweirich/rake.git"
       }
     end
        

data/lib/generators/templates/application/merb_core/app/controllers/exceptions.rb

@@ -1,4 +1,4 @@
-class Exceptions < Application
+class Exceptions < Merb::Controller
   
   # handle NotFound exceptions (404)
   def not_found

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

@@ -1,189 +1,25 @@
-#
-# ==== Structure of Merb initializer
-#
-# 1. Load paths.
-# 2. Dependencies configuration.
-# 3. Libraries (ORM, testing tool, etc) you use.
-# 4. Application-specific configuration.
-
-#
-# ==== Set up load paths
-#
-
-# Add the app's "gems" directory to the gem load path.
-# Note that the gems directory must mirror the structure RubyGems uses for
-# directories under which gems are kept.
-#
-# To conveniently set it up, use gem install -i <merb_app_root/gems>
-# when installing gems. This will set up the structure under /gems
-# automagically.
-#
-# An example:
-#
-# You want to bundle ActiveRecord and ActiveSupport with your Merb
-# application to be deployment environment independent. To do so,
-# install gems into merb_app_root/gems directory like this:
-#
-# gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem
-#
-# Since RubyGems will search merb_app_root/gems for dependencies, order
-# in the statement above is important: we need to install ActiveSupport which
-# ActiveRecord depends on first.
-#
-# Remember that bundling of dependencies as gems with your application
-# makes it independent of the environment it runs in and is a very
-# good, encouraged practice to follow.
-
-# If you want modules and classes from libraries organized like
-# merbapp/lib/magicwand/lib/magicwand.rb to autoload,
-# uncomment this.
-# Merb.push_path(:lib, Merb.root / "lib") # uses **/*.rb as path glob.
-
-# ==== Dependencies
-
-# These are a few, but not all, of the standard merb-more dependencies:
-#
-# dependency "merb-action-args"   # Provides support for querystring arguments to be passed in to controller actions
-# dependency "merb-assets"        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
-# dependency "merb-helpers"       # Provides the form, date/time, and other helpers
-# dependency "merb-cache"         # Provides your application with caching functions 
-# dependency "merb-haml"          # Adds rake tasks and the haml generators to your merb app
-# dependency "merb-jquery"        # Provides a #jquery method to insert jQuery code in to a content block
-# dependency "merb-mailer"        # Integrates mail support via Merb Mailer
-
-# These are a few, but not all, of the merb-plugin dependencies:
-#
-# dependency "merb_param_protection"  # Lets you have better control over your query string params and param logging
-# dependency "merb_stories"           # Provides rspec helper methods for your application
-
-# Miscellaneous dependencies:
-#
-# Specify more than one dependency at a time with the #dependencies method:
-# dependencies "RedCloth", "BlueCloth"
-
+# Go to http://wiki.merbivore.com/pages/init-rb
+ 
 # Specify a specific version of a dependency
 # dependency "RedCloth", "> 3.0"
 
-# Specify more than one dependency at a time as well as the version:
-# dependencies "RedCloth" => "> 3.0", "BlueCloth" => "= 1.0.0"
-
-# You can also add in dependencies after your application loads.
-Merb::BootLoader.after_app_loads do
-  # For example, the magic_admin gem uses the app's model classes. This requires that the models be 
-  # loaded already. So, we can put the magic_admin dependency here:
-  # dependency "magic_admin"
-end
-
-#
-# ==== Set up your ORM of choice
-#
-
-# Merb doesn't come with database support by default.  You need
-# an ORM plugin.  Install one, and uncomment one of the following lines,
-# if you need a database.
-
-# Uncomment for DataMapper ORM
-<%= "# " unless orm == :datamapper %>use_orm :datamapper
-
-# Uncomment for ActiveRecord ORM
-<%= "# " unless orm == :activerecord %>use_orm :activerecord
-
-# Uncomment for Sequel ORM
-<%= "# " unless orm == :sequel %>use_orm :sequel
-
-
-#
-# ==== Pick what you test with
-#
-
-# This defines which test framework the generators will use.
-# RSpec is turned on by default.
-#
-# To use Test::Unit, you need to install the merb_test_unit gem.
-# To use RSpec, you don't have to install any additional gems, since
-# merb-core provides support for RSpec.
-#
-<%= "# " unless testing_framework == :test_unit %>use_test :test_unit
-<%= "# " unless testing_framework == :rspec %>use_test :rspec
-
-
-#
-# ==== Choose which template engine to use by default
-#
-
-# Merb can generate views for different template engines, choose your favourite as the default.
-
-<%= "# " unless template_engine == :erb %>use_template_engine :erb
-<%= "# " unless template_engine == :haml %>use_template_engine :haml
-
-
-#
-# ==== Set up your basic configuration
-#
-
-# IMPORTANT:
-#
-# early on Merb boot init file is not yet loaded.
-# Thus setting PORT, PID FILE and ADAPTER using init file does not
-# make sense and only can lead to confusion because default settings
-# will be used instead.
-#
-# Please use command line options for them.
-# See http://wiki.merbivore.com/pages/merb-core-boot-process
-# if you want to know more.
+<%= "# " unless orm != :none %> use_orm :<%= orm %>
+use_test :<%= testing_framework %>
+use_template_engine :<%= template_engine %>
+ 
 Merb::Config.use do |c|
-  # Sets up a custom session id key which is used for the session persistence
-  # cookie name.  If not specified, defaults to '_session_id'.
-  # c[:session_id_key] = '_session_id'
+  c[:use_mutex] = false
+  c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
   
-  # The session_secret_key is only required for the cookie session store.
-  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'
-  
-  # There are various options here, by default Merb comes with 'cookie', 
-  # 'memory', 'memcache' or 'container'.  
-  # You can of course use your favorite ORM instead: 
-  # 'datamapper', 'sequel' or 'activerecord'.
-  c[:session_store] = 'cookie'
+  # cookie session store configuration
+  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'  # required for cookie session store
+  # c[:session_id_key] = '_session_id' # cookie session id key, defaults to "_session_id"
 end
-
-
-# ==== Tune your inflector
-
-# To fine tune your inflector use the word, singular_word and plural_word
-# methods of Extlib::Inflection module metaclass.
-#
-# Here we define erratum/errata exception case:
-#
-# Extlib::Inflection.word "erratum", "errata"
-#
-# In case singular and plural forms are the same omit
-# second argument on call:
-#
-# Extlib::Inflection.word 'information'
-#
-# You can also define general, singularization and pluralization
-# rules:
-#
-# Once the following rule is defined:
-# Extlib::Inflection.rule 'y', 'ies'
-#
-# You can see the following results:
-# irb> "fly".plural
-# => flies
-# irb> "cry".plural
-# => cries
-#
-# Example for singularization rule:
-#
-# Extlib::Inflection.singular_rule 'o', 'oes'
-#
-# Works like this:
-# irb> "heroes".singular
-# => hero
-#
-# Example of pluralization rule:
-# Extlib::Inflection.singular_rule 'fe', 'ves'
-#
-# And the result is:
-# irb> "wife".plural
-# => wives
+ 
+Merb::BootLoader.before_app_loads do
+  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
+end
+ 
+Merb::BootLoader.after_app_loads do
+  # This will get executed after your app's classes have been loaded.
+end

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

@@ -1,122 +1,20 @@
-#
-# ==== Structure of Merb initializer
-#
-# 1. Load paths.
-# 2. Dependencies configuration.
-# 3. Libraries (ORM, testing tool, etc) you use.
-# 4. Application-specific configuration.
+# Go to http://wiki.merbivore.com/pages/init-rb
 
-#
-# ==== Set up load paths
-#
-
-# Add the app's "gems" directory to the gem load path.
-# Note that the gems directory must mirror the structure RubyGems uses for
-# directories under which gems are kept.
-#
-# To conveniently set it up, use gem install -i <merb_app_root/gems>
-# when installing gems. This will set up the structure under /gems
-# automagically.
-#
-# An example:
-#
-# You want to bundle ActiveRecord and ActiveSupport with your Merb
-# application to be deployment environment independent. To do so,
-# install gems into merb_app_root/gems directory like this:
-#
-# gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem
-#
-# Since RubyGems will search merb_app_root/gems for dependencies, order
-# in the statement above is important: we need to install ActiveSupport which
-# ActiveRecord depends on first.
-#
-# Remember that bundling of dependencies as gems with your application
-# makes it independent of the environment it runs in and is a very
-# good, encouraged practice to follow.
-
-# If you want modules and classes from libraries organized like
-# merbapp/lib/magicwand/lib/magicwand.rb to autoload,
-# uncomment this.
-# Merb.push_path(:lib, Merb.root / "lib") # uses **/*.rb as path glob.
-
-# ==== Dependencies
-
-# These are a few, but not all, of the standard merb-more dependencies:
-#
-# dependency "merb-action-args"   # Provides support for querystring arguments to be passed in to controller actions
-# dependency "merb-assets"        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
-# dependency "merb-helpers"       # Provides the form, date/time, and other helpers
-# dependency "merb-cache"         # Provides your application with caching functions 
-# dependency "merb-haml"          # Adds rake tasks and the haml generators to your merb app
-# dependency "merb-jquery"        # Provides a #jquery method to insert jQuery code in to a content block
-# dependency "merb-mailer"        # Integrates mail support via Merb Mailer
-
-# These are a few, but not all, of the merb-plugin dependencies:
-#
-# dependency "merb_param_protection"  # Lets you have better control over your query string params and param logging
-# dependency "merb_stories"           # Provides rspec helper methods for your application
-
-# Miscellaneous dependencies:
-#
-# Specify more than one dependency at a time with the #dependencies method:
-# dependencies "RedCloth", "BlueCloth"
+<%= "# " unless orm != :none %> use_orm :<%= orm %>
+use_test :<%= testing_framework %>
+use_template_engine :<%= template_engine %>
 
 # Specify a specific version of a dependency
 # dependency "RedCloth", "> 3.0"
 
-# Specify more than one dependency at a time as well as the version:
-# dependencies "RedCloth" => "> 3.0", "BlueCloth" => "= 1.0.0"
-
-# You can also add in dependencies after your application loads.
+Merb::BootLoader.before_app_loads do
+  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
+end
+ 
 Merb::BootLoader.after_app_loads do
-  # For example, the magic_admin gem uses the app's model classes. This requires that the models be 
-  # loaded already. So, we can put the magic_admin dependency here:
-  # dependency "magic_admin"
+  # This will get executed after your app's classes have been loaded.
 end
 
-#
-# ==== Set up your ORM of choice
-#
-
-# Merb doesn't come with database support by default.  You need
-# an ORM plugin.  Install one, and uncomment one of the following lines,
-# if you need a database.
-
-# Uncomment for DataMapper ORM
-<%= "# " unless orm == :datamapper %>use_orm :datamapper
-
-# Uncomment for ActiveRecord ORM
-<%= "# " unless orm == :activerecord %>use_orm :activerecord
-
-# Uncomment for Sequel ORM
-<%= "# " unless orm == :sequel %>use_orm :sequel
-
-
-#
-# ==== Pick what you test with
-#
-
-# This defines which test framework the generators will use.
-# RSpec is turned on by default.
-#
-# To use Test::Unit, you need to install the merb_test_unit gem.
-# To use RSpec, you don't have to install any additional gems, since
-# merb-core provides support for RSpec.
-#
-<%= "# " unless testing_framework == :test_unit %>use_test :test_unit
-<%= "# " unless testing_framework == :rspec %>use_test :rspec
-
-
-#
-# ==== Choose which template engine to use by default
-#
-
-# Merb can generate views for different template engines, choose your favourite as the default.
-
-<%= "# " unless template_engine == :erb %>use_template_engine :erb
-<%= "# " unless template_engine == :haml %>use_template_engine :haml
-
-
 # Move this to application.rb if you want it to be reloadable in dev mode.
 Merb::Router.prepare do
   match('/').to(:controller => "<%= self.name.gsub("-", "_") %>", :action =>'index')
@@ -129,7 +27,7 @@ Merb::Config.use { |c|
   c[:framework]           = {},
   c[:log_level]           = :debug,
   c[:log_stream]          = STDOUT,
-  # or use file for loggine:
+  # or use file for logging:
   # c[:log_file]          = Merb.root / "log" / "merb.log",
   c[:use_mutex]           = false,
   c[:session_store]       = 'cookie',

data/lib/generators/templates/application/merb_plugin/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) <%= Time.now.year %> Engine Yard
+Copyright (c) <%= Time.now.year %> YOUR NAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/generators/templates/application/merb_stack/app/controllers/exceptions.rb

@@ -1,4 +1,4 @@
-class Exceptions < Application
+class Exceptions < Merb::Controller
   
   # handle NotFound exceptions (404)
   def not_found