merb-gen 0.9.2 → 0.9.3

data/README

@@ -1,10 +1,21 @@
 ==== merb-gen
 
-merb-gen is a part of the Merb More package. It provides application and plugin generators for Merb.
+merb-gen is a part of the Merb More package. It provides application, plugin, and component
+generators for Merb.
 
 ==== Usage
 
-To generate a new merb app, run merb-gen &lt;path&gt;. For instance, <tt>merb-gen foo</tt> would create
-a new merb app inside of the foo directory.
+To generate directory structure for a new merb app, run merb-gen app &lt;app-name&gt;.
+For instance, <tt>merb-gen app foo</tt> would create a new foo merb app inside of the foo directory.
 
-To generate a new merb plugin, run merb-gen plugin &lt;path&gt;.
+Use <tt>--flat</tt> to generate a flattened application (very simple directory structure)
+and <tt>--very-flat</tt> to generate a single file application.
+
+To generate a new merb plugin, run merb-gen plugin &lt;plugin_name&gt;.
+
+To see what generators are available, run merb-gen generators.
+
+==== Custom generators
+
+If you want to create your custom generators to use with Merb, and don't want to create a gem,
+you should put them in ~/.rubigen/merb_generators/.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake/gempackagetask'
 
 GEM = "merb-gen"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://www.merbivore.com"
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.executables = %w( merb-gen )
     
   # Uncomment this to add a dependency
-  s.add_dependency "merb-core", ">= 0.9.2"
+  s.add_dependency "merb-core", ">= 0.9.3"
   s.add_dependency "rubigen", ">= 1.2.4"
   
   s.require_path = 'lib'
@@ -36,12 +36,14 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
+
 namespace :jruby do
   task :install do
-    sh %{sudo jruby -S gem install pkg/#{GEM}-#{VERSION} --no-update-sources}
+    sh %{sudo jruby -S gem install #{install_home} pkg/#{GEM}-#{VERSION} --no-update-sources}
   end
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{VERSION} --no-update-sources}
+  sh %{sudo gem install #{install_home} pkg/#{GEM}-#{VERSION} --no-update-sources}
 end

data/TODO

@@ -1,4 +0,0 @@
-TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/<%= name %>.rb

data/app_generators/merb/merb_generator.rb

@@ -33,4 +33,8 @@ class MerbGenerator < Merb::GeneratorBase
 
   def display_framework_selections
   end
+  
+  def create_dirs
+    m.directory 'log'
+  end
 end

data/app_generators/merb/templates/Rakefile

@@ -32,95 +32,3 @@ desc "Add new files to subversion"
 task :svn_add do
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
 end
-
-
-class Freezer
-  
-  class << self
-
-    def components
-      {
-        "core" => "git://github.com/wycats/merb-core.git",
-        "more" => "git://github.com/wycats/merb-more.git",
-        "plugins" => "git://github.com/wycats/merb-plugins.git"
-      }
-    end
-
-    def framework_dir
-      # Should allow customization of this directory's location?
-      File.join(File.dirname(__FILE__), "framework")
-    end
-
-    def gitmodules
-      File.join(File.dirname(__FILE__), ".gitmodules")    
-    end
-
-    def freeze(component, update = false)
-      new(component, update).freeze
-    end
-
-  end
-
-  def initialize(component, update)
-    @component = "merb-" + component
-    @update    = update
-  end
-  
-  def freeze
-    # Ensure that required git commands are available
-    %w(git-pull git-submodule).each do |bin|
-      next if in_path?(bin)
-      $stderr.puts "ERROR: #{bin} must be avaible in PATH"
-      exit 1
-    end
-
-    unless File.directory?(framework_dir)
-      puts "Creating framework directory ..."
-      FileUtils.mkdir_p(framework_dir)
-    end
-
-    if managed?
-      puts "#{@component} seems to be already managed by git-submodule."
-      if @update
-        puts "Trying to update #{@component} ..."
-        sh "cd #{framework_dir}/#{@component} && git-pull"
-      end
-    else
-      puts "Creating submodule for #{@component} ..."
-      sh "git-submodule --quiet add #{components[@component.gsub("merb-", '')]} #{File.basename(framework_dir)}/#{@component}" 
-      if $?.success?
-        sh("git-submodule init")
-      else
-        # Should this instead be a raise?
-        $stderr.puts("ERROR: unable to create submodule for #{@component}")
-      end
-    end
-  end
-
-  protected
-
-  def in_submodule?
-    return false unless File.exists?(gitmodules)
-    File.read(gitmodules) =~ %r![submodule "#{framework_dir}/#{@component}"]!
-  end
-
-  def managed?
-    File.directory?(File.join(framework_dir, @component)) || in_submodule?
-  end
-
-  def in_path?(bin)
-    `which #{bin}`
-    !$?.nil? && $?.success?
-  end
-
-end
-
-task :freeze => Freezer.components.keys.map { |component| "freeze:#{component}" }
-namespace :freeze do
-  Freezer.components.each do |component, git_repository|
-    desc "Freeze #{component} from #{git_repository}"
-    task component do
-      Freezer.freeze(component, ENV["UPDATE"])
-    end
-  end
-end

data/app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb

@@ -38,11 +38,19 @@
 
     <h3>Where can I find help?</h3>
     <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
-      feel free to come chat at irc.freenode.net, channel #merb.</p>
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
 
     <h3>How do I edit this page?</h3>
-    <p>You can change what people see when this happens byy editing <tt>app/views/exceptions/not_found.html.erb</tt>.</p> 
+    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
 
   </div>
 

data/app_generators/merb/templates/app/views/exceptions/not_found.html.erb

@@ -17,8 +17,16 @@
     
     <h3>Where can I find help?</h3>
     <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
-      feel free to come chat at irc.freenode.net, channel #merb.</p>
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
 
     <h3>How do I edit this page?</h3>
     <p>You're seeing this page because you need to edit the following files:

data/app_generators/merb/templates/autotest/merb_rspec.rb

@@ -1,86 +1,88 @@
-# Adapted from Autotest::Rails
+# Adapted from Autotest::Rails, RSpec's autotest class, as well as merb-core's.
 require 'autotest'
 
+class RspecCommandError < StandardError; end
+
 class Autotest::MerbRspec < Autotest
-  
+
   # +model_tests_dir+::      the directory to find model-centric tests
   # +controller_tests_dir+:: the directory to find controller-centric tests
   # +view_tests_dir+::       the directory to find view-centric tests
   # +fixtures_dir+::         the directory to find fixtures in
   attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
-  
+
   def initialize # :nodoc:
     super
-    
+
     initialize_test_layout
-    
+
     # Ignore any happenings in these directories
     add_exception %r%^\./(?:doc|log|public|tmp)%
-    
+
     # Ignore any mappings that Autotest may have already set up
     clear_mappings
-    
-    # Any changes to a file in the root of the 'lib' directory will run any 
+
+    # Any changes to a file in the root of the 'lib' directory will run any
     # model test with a corresponding name.
     add_mapping %r%^lib\/.*\.rb% do |filename, _|
-      files_matching Regexp.new("^#{model_test_for(filename)}$")
+      files_matching %r%#{model_test_for(filename)}$%
     end
-    
+
     add_mapping %r%^spec/(spec_helper|shared/.*)\.rb$% do
       files_matching %r%^spec/.*_spec\.rb$%
     end
-    
-    # Any changes to a fixture will run corresponding view, controller and 
+
+    # Any changes to a fixture will run corresponding view, controller and
     # model tests
     add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m|
       [
-        model_test_for(m[1]), 
-        controller_test_for(m[1]), 
+        model_test_for(m[1]),
+        controller_test_for(m[1]),
         view_test_for(m[1])
       ]
     end
-    
+
     # Any change to a test or spec will cause it to be run
     add_mapping %r%^spec/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
       filename
     end
-    
+
     # Any change to a model will cause it's corresponding test to be run
     add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
       model_test_for(m[1])
     end
-    
-    # Any change to the global helper will result in all view and controller 
+
+    # Any change to the global helper will result in all view and controller
     # tests being run
     add_mapping %r%^app/helpers/global_helpers.rb% do
       files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
     end
-    
-    # Any change to a helper will run it's corresponding view and controller 
-    # tests, unless the helper is the global helper. Changes to the global 
+
+    # Any change to a helper will run it's corresponding view and controller
+    # tests, unless the helper is the global helper. Changes to the global
     # helper run all view and controller tests.
     add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m|
       if m[1] == "global" then
         files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
       else
         [
-          view_test_for(m[1]), 
+          view_test_for(m[1]),
           controller_test_for(m[1])
         ]
       end
     end
-    
-    # Changes to views result in their corresponding view and controller test 
+
+    # Changes to views result in their corresponding view and controller test
     # being run
     add_mapping %r%^app/views/(.*)/% do |_, m|
       [
-        view_test_for(m[1]), 
+        view_test_for(m[1]),
         controller_test_for(m[1])
       ]
     end
-    
-    # Changes to a controller result in its corresponding test being run. If 
-    # the controller is the exception or application controller, all 
+
+    # Changes to a controller result in its corresponding test being run. If
+    # the controller is the exception or application controller, all
     # controller tests are run.
     add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
       if ["application", "exception"].include?(m[1])
@@ -95,36 +97,58 @@ class Autotest::MerbRspec < Autotest
       files_matching %r%^spec/(controllers|views|functional)/.*_spec\.rb$%
     end
 
-    # If any of the major files governing the environment are altered, run 
+    # If any of the major files governing the environment are altered, run
     # everything
     add_mapping %r%^spec/spec_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX
       files_matching %r%^spec/(unit|models|controllers|views|functional)/.*_spec\.rb$%
     end
   end
-  
-  ##
-  # Methods below this point are adapted from Auotest::Rspec
-  
+
+  def failed_results(results)
+    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+  end
+
+  def handle_results(results)
+    @failures = failed_results(results)
+    @files_to_test = consolidate_failures @failures
+    unless $TESTING
+      if @files_to_test.empty?
+        hook :green
+      else
+        hook :red
+      end
+    end
+    @tainted = true unless @files_to_test.empty?
+  end
+
   def consolidate_failures(failed)
     filters = Hash.new { |h,k| h[k] = [] }
     failed.each do |spec, failed_trace|
-      if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
-        filters[f] << spec
-        break
+      find_files.keys.select { |f| f =~ /spec\// }.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
       end
     end
-    return filters
+    filters
   end
 
   def make_test_cmd(files_to_test)
-    return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
+    [
+      ruby,
+      "-S",
+      spec_command,
+      add_options_if_present,
+      files_to_test.keys.flatten.join(' ')
+    ].join(" ")
   end
-  
+
   def add_options_if_present
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end
 
-  # Finds the proper spec command to use.  Precendence is set in the
+  # Finds the proper spec command to use. Precendence is set in the
   # lazily-evaluated method spec_commands.  Alias + Override that in
   # ~/.autotest to provide a different spec command then the default
   # paths provided.
@@ -134,7 +158,7 @@ class Autotest::MerbRspec < Autotest
 
       raise RspecCommandError, "No spec command could be found!" unless @spec_command
 
-      @spec_command.gsub! File::SEPARATOR, separator if separator
+      @spec_command.gsub!(File::SEPARATOR, separator) if separator
     end
     @spec_command
   end
@@ -142,18 +166,15 @@ class Autotest::MerbRspec < Autotest
   # Autotest will look for spec commands in the following
   # locations, in this order:
   #
-  #   * bin/spec
   #   * default spec bin/loader installed in Rubygems
+  #   * any spec command found in PATH
   def spec_commands
-    [
-      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')),
-      File.join(Config::CONFIG['bindir'], 'spec')
-    ]
+    [ File.join(Config::CONFIG['bindir'], 'spec'), 'spec' ]
   end
-  
+
 private
 
-  # Determines the paths we can expect tests or specs to reside, as well as 
+  # Determines the paths we can expect tests or specs to reside, as well as
   # corresponding fixtures.
   def initialize_test_layout
     self.model_tests_dir      = "spec/models"
@@ -161,19 +182,19 @@ private
     self.view_tests_dir       = "spec/views"
     self.fixtures_dir         = "spec/fixtures"
   end
-  
-  # Given a filename and the test type, this method will return the 
+
+  # Given a filename and the test type, this method will return the
   # corresponding test's or spec's name.
-  # 
+  #
   # ==== Arguments
   # +filename+<String>:: the file name of the model, view, or controller
   # +kind_of_test+<Symbol>:: the type of test we that we should run
-  # 
+  #
   # ==== Returns
   # String:: the name of the corresponding test or spec
-  # 
+  #
   # ==== Example
-  # 
+  #
   #   > test_for("user", :model)
   #   => "user_test.rb"
   #   > test_for("login", :controller)
@@ -182,21 +203,21 @@ private
   #   => "form_view_spec.rb" # If you're running a RSpec-like suite
   def test_for(filename, kind_of_test) # :nodoc:
     name  = [filename]
-    name << kind_of_test.to_s unless if == :view
+    name << kind_of_test.to_s if kind_of_test == :view
     name << "spec"
     return name.join("_") + ".rb"
   end
-  
+
   def model_test_for(filename)
     [model_tests_dir, test_for(filename, :model)].join("/")
   end
-  
+
   def controller_test_for(filename)
     [controller_tests_dir, test_for(filename, :controller)].join("/")
   end
-  
+
   def view_test_for(filename)
     [view_tests_dir, test_for(filename, :view)].join("/")
   end
-  
-end
+
+end

data/app_generators/merb/templates/config/environments/development.rb

@@ -3,4 +3,5 @@ Merb::Config.use { |c|
   c[:exception_details] = true
   c[:reload_classes] = true
   c[:reload_time] = 0.5
+  c[:log_auto_flush ] = true
 }

data/app_generators/merb/templates/config/environments/production.rb

@@ -2,4 +2,6 @@ Merb.logger.info("Loaded PRODUCTION Environment...")
 Merb::Config.use { |c|
   c[:exception_details] = false
   c[:reload_classes] = false
+  c[:log_level] = :error
+  c[:log_file] = Merb.log_path + "/production.log"
 }

data/app_generators/merb/templates/config/environments/test.rb

@@ -2,4 +2,5 @@ Merb.logger.info("Loaded TEST Environment...")
 Merb::Config.use { |c|
   c[:testing] = true
   c[:exception_details] = true
+  c[:log_auto_flush ] = true
 }

data/app_generators/merb/templates/config/init.rb

@@ -1,58 +1,153 @@
-# Make the app's "gems" directory a place where gems are loaded from
+#
+# ==== 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
+#
+
+# Make the app's "gems" directory a place where gems are loaded from.
+# Note that gems directory must have a 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 ~/dev/merbapp/gems activesupport-post-2.0.2gem activerecord-post-2.0.2.gem
+#
+# Since RubyGems will search merb_app_root/gems for dependencies, order
+# in 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.
 Gem.clear_paths
 Gem.path.unshift(Merb.root / "gems")
 
-# Make the app's "lib" directory a place where ruby files get "require"d from
-$LOAD_PATH.unshift(Merb.root / "lib")
+# 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.
 
 <% require 'sha1' %>
-Merb::Config.use do |c|
-  
-  ### Sets up a custom session id key, if you want to piggyback sessions of other applications
-  ### with the cookie session store. If not specified, defaults to '_session_id'.
-  # c[:session_id_key] = '_session_id'
-  
-  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'
-  c[:session_store] = 'cookie'
-end  
 
-### 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
+# ==== Dependencies
+
+# These are some examples of how you might specify dependencies.
+# Dependencies load is delayed to one of later Merb app
+# boot stages. It may be important when
+# later part of your configuration relies on libraries specified
+# here.
+#
+# dependencies "RedCloth", "merb_helpers"
+# OR
+# dependency "RedCloth", "> 3.0"
+# OR
+# dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
+Merb::BootLoader.after_app_loads do
+  # Add dependencies here that must load after the application loads:
+
+  # dependency "magic_admin" # this gem uses the app's model classes
+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 default_orm?(:datamapper) %>use_orm :datamapper
 
-### Uncomment for ActiveRecord ORM
+# Uncomment for ActiveRecord ORM
 <%= "# " unless default_orm?(:activerecord) %>use_orm :activerecord
 
-### Uncomment for Sequel ORM
+# Uncomment for Sequel ORM
 <%= "# " unless default_orm?(:sequel) %>use_orm :sequel
 
 
-### This defines which test framework the generators will use
-### rspec is turned on by default
-###
-### Note that you need to install the merb_rspec if you want to ue
-### rspec and merb_test_unit if you want to use test_unit. 
-### merb_rspec is installed by default if you did gem install
-### merb.
-###
+#
+# ==== Pick what you test with
+#
+
+# This defines which test framework the generators will use
+# rspec is turned on by default
+#
+# Note that you need to install the merb_rspec if you want to ue
+# rspec and merb_test_unit if you want to use test_unit.
+# merb_rspec is installed by default if you did gem install
+# merb.
+#
 <%= "# " unless default_test_suite?(:test) %>use_test :test_unit
 <%= "# " unless default_test_suite?(:spec) %>use_test :rspec
 
-### Add your other dependencies here
 
-# These are some examples of how you might specify dependencies.
-# 
-# dependencies "RedCloth", "merb_helpers"
-# OR
-# dependency "RedCloth", "> 3.0"
-# OR
-# dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
+#
+# ==== Set up your basic configuration
+#
+Merb::Config.use do |c|
 
-Merb::BootLoader.after_app_loads do
-  ### Add dependencies here that must load after the application loads:
+  # Sets up a custom session id key, if you want to piggyback sessions of other applications
+  # with the cookie session store. If not specified, defaults to '_session_id'.
+  # c[:session_id_key] = '_session_id'
 
-  # dependency "magic_admin" # this gem uses the app's model classes
+  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'
+  c[:session_store] = 'cookie'
 end
+
+
+# ==== Tune your inflector
+
+# To fine tune your inflector use word, singular_word and plural_word
+# methods of Language::English::Inflector module metaclass.
+#
+# Here we define erratum/errata exception case:
+#
+# Language::English::Inflector.word "erratum", "errata"
+#
+# In case singular and plural forms are the same omit
+# second argument on call:
+#
+# Language::English::Inflector.word 'information'
+#
+# You can also define general, singularization and pluralization
+# rules:
+#
+# Once the following rule is defined:
+# Language::English::Inflector.rule 'y', 'ies'
+#
+# You can see the following results:
+# irb> "fly".plural
+# => flies
+# irb> "cry".plural
+# => cries
+#
+# Example for singularization rule:
+#
+# Language::English::Inflector.singular_rule 'o', 'oes'
+#
+# Works like this:
+# irb> "heroes".singular
+# => hero
+#
+# Example of pluralization rule:
+# Language::English::Inflector.singular_rule 'fe', 'ves'
+#
+# And the result is:
+# irb> "wife".plural
+# => wives

data/app_generators/merb_plugin/templates/Rakefile

@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('merb', '>= 0.4.0')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -31,7 +31,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do

data/bin/merb-gen

@@ -27,7 +27,6 @@ app_help = <<-EOF
   merb-gen app app_name             (for a standard application)
   merb-gen app app_name --flat      (for a flattened application)
   merb-gen app app_name --very-flat (for a single file application)
-  merb-gen frozen-merb          (script to run from frozen gems/framework)
   merb-gen plugin plugin_name   (creates a plugin gem skeleton)
 
   Other Generators:
@@ -76,10 +75,6 @@ elsif ARGV[0] && ARGV[0] == "app" && ARGV[1] && ARGV[1] !~ /^-/
 elsif ARGV[0] && ARGV[0] == "plugin"
   Merb::ApplicationGenerator.run ARGV[1], ARGV[2..-1], "merb_plugin", command || "generate"
 
-# merb-gen frozen-merb
-elsif ARGV[0] && ARGV[0] == "frozen-merb"
-  Merb::ComponentGenerator.run "frozen-merb", ["frozen-merb"], "freezer", command || "generate"
-
 # merb-gen controller foo
 # merb-gen resource foo --test
 elsif ARGV[1] && ARGV[1] !~ /^-/

data/lib/merb-gen/base.rb

@@ -29,10 +29,11 @@ class Merb::GeneratorBase < RubiGen::Base
       # Set the assigns that should be used for path-interpolation and building templates
       @assigns = {:base_name => File.basename(@name), :test_type => options["spec"] ? "rspec" : "test_unit"}
       
-      FileUtils.mkdir_p @name 
+      FileUtils.mkdir_p @name
+      create_dirs
       copy_dirs
       copy_files
-
+      
       display_framework_selections
     end
   end
@@ -55,8 +56,11 @@ class Merb::GeneratorBase < RubiGen::Base
     puts
     puts "Your app will use the #{@assigns[:test_type]} test framework."
     if Gem.cache.search("merb_#{@assigns[:test_type]}").size == 0
-      puts "You need to install the merb_#{@assigns[:test_type]} gem."
+      puts "You need to install the merb_#{@assigns[:test_type]} gem." unless @assigns[:test_type] == 'rspec'
     end
     puts
   end
+  
+  def create_dirs
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: merb-gen
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
@@ -159,12 +159,6 @@ files:
 - merb_generators/controller/templates/app/views/%controller_file_name%
 - merb_generators/controller/templates/app/views/%controller_file_name%/index.html.erb
 - merb_generators/controller/USAGE
-- merb_generators/freezer
-- merb_generators/freezer/freezer_generator.rb
-- merb_generators/freezer/templates
-- merb_generators/freezer/templates/script
-- merb_generators/freezer/templates/script/frozen-merb
-- merb_generators/freezer/USAGE
 - merb_generators/part_controller
 - merb_generators/part_controller/part_controller_generator.rb
 - merb_generators/part_controller/templates

data/merb_generators/freezer/freezer_generator.rb

@@ -1,25 +0,0 @@
-class FreezerGenerator < Merb::GeneratorBase
-  
-  def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    super
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-      @assigns = {}
-      copy_dirs
-      m.file "script/frozen-merb", "script/frozen-merb", :chmod => 0755, :shebang => DEFAULT_SHEBANG
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates a frozen-merb script that runs merb from framework/ or gems/
-
-      USAGE: #{spec.name} frozen-merb
-    EOS
-  end
-end

data/merb_generators/freezer/templates/script/frozen-merb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-
-__DIR__ = File.join(File.dirname(__FILE__),"..")
-
-framework = File.join(__DIR__,"framework")
-
-if File.directory?(framework)
-  puts "Running from frozen framework"
-  core = File.join(framework,"merb-core")
-  if File.directory?(core)
-    $:.push File.join(core,"lib")
-  end
-  more = File.join(framework,"merb-more")
-  if File.directory?(more)
-    Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
-      $:.push File.join(more,d,'lib')
-    end
-  end
-  plugins = File.join(framework,"merb-plugins")
-  if File.directory?(plugins)
-    Dir.new(plugins).select {|d| d =~ /merb_/}.each do |d|
-      $:.push File.join(plugins,d,'lib')
-    end
-  end
-  require "merb-core/core_ext/kernel"
-  require "merb-core/core_ext/rubygems"
-else
-  gem = Dir.glob(__DIR__ + "/gems/gems/merb-core-*").last
-  raise "Can't run frozen without framework/ or local gem" unless gem
-  require gem + "/lib/merb-core/core_ext/kernel"
-  require gem + "/lib/merb-core/core_ext/rubygems"
-  
-  Gem.clear_paths
-  Gem.path.unshift(__DIR__+"/gems")
-end
-
-require 'merb-core'
-unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a mongrel]
-end
-  
-Merb.frozen!
-Merb.start