merb-gen 1.0.15 → 1.1.0.pre

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

@@ -1,15 +1,10 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
-<%= "# " unless orm != :none %> use_orm :<%= orm %>
+<%= "use_orm :#{orm}" unless orm == :none %>
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>
 
-# If you need to use dependency immediately in this file you must add :immediate => true 
-# to dependency definition:
-# dependency "merb-slices", :immediate => true
-#
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
+# Specify your dependencies in the Gemfile
 
 Merb::BootLoader.before_app_loads do
   # This will get executed after dependencies have been loaded but before your app's classes have loaded.
@@ -29,16 +24,25 @@ end
 Merb::Config.use { |c|
   c[:environment]         = 'production',
   c[:framework]           = {},
-  c[:log_level]           = :debug,
-  c[:log_stream]          = STDOUT,
-  # or use file for logging:
-  # c[:log_file]          = Merb.root / "log" / "merb.log",
-  c[:use_mutex]           = false,
-  c[:session_store]       = 'cookie',
-  c[:session_id_key]      = '_<%= base_name  %>_session_id',
-  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>',
-  c[:exception_details]   = true,
-  c[:reload_classes]      = true,
-  c[:reload_templates]    = true,
-  c[:reload_time]         = 0.5
+  c[:use_mutex]           = false
+  c[:session_store]       = 'cookie'
+  c[:session_id_key]      = '_<%= base_name  %>_session_id'
+  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>'
+
+  if Merb.env?(:production)
+    # edit production settings
+    c[:log_level]         = :error
+    c[:log_file]          = Merb.root / "log" / "production.log"
+    c[:exception_details] = false
+    c[:reload_classes]    = false
+    c[:reload_templates]  = false
+  else
+    # edit development/test settings
+    c[:log_level]         = :debug
+    c[:log_stream]        = STDOUT
+    c[:exception_details] = true
+    c[:reload_classes]    = true
+    c[:reload_templates]  = true
+    c[:reload_time]       = 0.5
+  end
 }

data/lib/generators/templates/application/merb_flat/spec/spec_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 "spec"

data/lib/generators/templates/application/merb_flat/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_plugin/Rakefile

@@ -1,4 +1,12 @@
-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/gempackagetask'
 
 require 'merb-core'
@@ -17,13 +25,13 @@ spec = Gem::Specification.new do |s|
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
+  s.extra_rdoc_files = ["README", "LICENSE", "TODO"]
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= <%= Merb::VERSION %>')
+  s.add_dependency('merb-core', '>= <%= Merb::VERSION %>')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec<%= bin ? ',bin' : '' %>}/**/*")
   <% if bin %>
@@ -51,4 +59,27 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end
+
+begin
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_opts << '--color' << '--format' << 'specdoc'
+    begin
+      require 'rcov'
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/lib/generators/templates/application/merb_stack/Gemfile

@@ -0,0 +1,48 @@
+# Dependencies are generated using a strict version,
+# Don't forget to edit the dependency versions when upgrading.
+
+merb_gems_version = "<%= merb_gems_version %>"
+dm_gems_version   = "<%= dm_gems_version %>"
+do_gems_version   = "<%= do_gems_version %>"
+
+# If you did disable json for Merb, comment out this line.
+# Don't use json gem version lower than 1.1.7! Older version have a security bug
+
+gem "json_pure", ">= 1.1.7", :require => "json"
+
+# For more information about each component,
+# please read http://wiki.merbivore.com/faqs/merb_components
+
+gem "merb-core",                merb_gems_version
+gem "merb-action-args",         merb_gems_version
+gem "merb-assets",              merb_gems_version
+gem "merb-helpers",             merb_gems_version
+gem "merb-mailer",              merb_gems_version
+gem "merb-slices",              merb_gems_version
+gem "merb-auth-core",           merb_gems_version
+gem "merb-auth-more",           merb_gems_version
+gem "merb-auth-slice-password", merb_gems_version
+gem "merb-param-protection",    merb_gems_version
+gem "merb-exceptions",          merb_gems_version
+gem "merb-gen",                 merb_gems_version
+
+gem("merb-cache", merb_gems_version) do
+  Merb::Cache.setup do
+    register(Merb::Cache::FileStore) unless Merb.cache
+  end
+end
+
+gem "data_objects",             do_gems_version
+gem "do_sqlite3",               do_gems_version # If using another database, replace this
+gem "dm-core",                  dm_gems_version
+gem "dm-aggregates",            dm_gems_version
+gem "dm-migrations",            dm_gems_version
+gem "dm-timestamps",            dm_gems_version
+gem "dm-types",                 dm_gems_version
+gem "dm-validations",           dm_gems_version
+gem "dm-serializer",            dm_gems_version
+gem "dm-constraints",           dm_gems_version
+
+gem "merb_datamapper",          merb_gems_version
+<%= gems_for_template_engine(template_engine) %>
+<%= gems_for_testing_framework(testing_framework) %>

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

@@ -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_stack/config/init.rb

@@ -1,7 +1,7 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
  
-require 'config/dependencies.rb'
- 
+# Specify your dependencies in the Gemfile
+
 use_orm :datamapper
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>

data/lib/generators/templates/application/merb_stack/config.ru

@@ -0,0 +1,23 @@
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
+require 'merb-core'
+
+Merb::Config.setup(
+  :merb_root   => File.expand_path(File.dirname(__FILE__)),
+  :environment => ENV['RACK_ENV']
+)
+
+Merb.environment = Merb::Config[:environment]
+Merb.root        = Merb::Config[:merb_root]
+
+Merb::BootLoader.run 
+
+run Merb::Rack::Application.new

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

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

data/lib/generators/templates/application/merb_stack/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_stack/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_very_flat/application.rbt

@@ -33,13 +33,6 @@
 <%= "# " unless template_engine == :erb %>use_template_engine :erb
 <%= "# " unless template_engine == :haml %>use_template_engine :haml
 
-# If you need to use dependency immediately in this file you must add :immediate => true 
-# to dependency definition:
-# dependency "merb-slices", :immediate => true
-#
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
-
 Merb::Config.use { |c|
   c[:framework]           = { :public => [Merb.root / "public", nil] }
   c[:session_store]       = 'none'
@@ -63,4 +56,4 @@ class <%= class_name %> < Merb::Controller
   def index
     "Hi, I am 'very flat' Merb application. I have everything in one single file and well suited for dynamic stub pages."
   end
-end
+end

data/lib/generators/templates/application/merb_very_flat/spec/spec_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 "spec"

data/lib/generators/templates/application/merb_very_flat/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/common → component/fcgi}/dothtaccess

@@ -13,5 +13,4 @@ RewriteRule ^([^.]+)$ $1.html [QSA]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^(.*)$ merb.fcgi [QSA,L]
 
-
-ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached"
+ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached"

data/lib/generators/templates/{application/merb_stack/public → component/fcgi}/merb.fcgi

@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
-                                                               
-require 'rubygems'
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require 'merb-core'
 
 # this is Merb.root, change this if you have some funky setup.
 merb_root = File.expand_path(File.dirname(__FILE__) / '../')
-        
+
 # If the fcgi process runs as apache, make sure
 # we have an inlinedir set for Rubyinline action-args to work
 unless ENV["INLINEDIR"] || ENV["HOME"]
@@ -19,4 +25,4 @@ end
 # start merb with the fcgi adapter, add options or change the log dir here
 Merb.start(:adapter => 'fcgi',
            :merb_root => merb_root,
-           :log_file => merb_root /'log'/'merb.log')
+           :log_file => merb_root / 'log' / 'merb.log')

data/lib/generators/templates/component/model/spec/models/%file_name%_spec.rb

@@ -1,6 +1,6 @@
 require File.join( File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "spec_helper" )
 
-describe <%= class_name %> do
+describe <%= full_class_name %> do
 
   it "should have specs"
 

data/lib/merb-gen/app_generator.rb

@@ -8,6 +8,64 @@ module Merb
         super
       end
 
+      # Helper to get Merb version
+      #
+      # ==== Returns
+      # String:: Merb version
+      def merb_gems_version
+        Merb::VERSION
+      end
+
+      # ORM gem dependencies
+      #
+      # Adds ORM plugin dependency 'merb_#{orm}' if we use any ORM.
+      #
+      # ==== Params
+      # orm<Symbol>:: ORM to use 
+      #
+      # ==== Returns
+      # String:: Gem dependencies
+      def gems_for_orm(orm)
+        orm.to_sym == :none ? '' : %Q{gem "merb_#{orm}"}
+      end
+
+      # Template enging gem dependencies
+      #
+      # When using something else than erb we add merb plugin 
+      # dependency for the template engine.
+      #
+      # ==== Params
+      # template_engine<Symbol>:: Template engine to use 
+      #
+      # ==== Returns
+      # String:: Gem dependencies
+      def gems_for_template_engine(template_engine)
+        gems = ''
+        if template_engine != :erb
+          if template_engine.in?(:haml, :builder)
+            template_engine_plugin = "merb-#{template_engine}"
+          else
+            template_engine_plugin = "merb_#{template_engine}"
+          end
+          gems = %Q{gem "#{template_engine_plugin}"}
+        end
+        gems
+      end
+
+      # Testing framework gem dependencies
+      #
+      # If we use any other test framework than RSpec we must add dependency 
+      # to the Gemfile. Merb depends on the RSpec so it's default dependency.
+      #
+      # ==== Params
+      # test_framework<Symbol>:: Testing framework to use 
+      #
+      # ==== Returns
+      # String:: Gem dependencies
+      def gems_for_testing_framework(testing_framework)
+        testing_framework == :rspec ? '' : %Q{gem "#{testing_framework}", :group => :test}  
+      end
+
     end
   end
 end

data/lib/merb-gen/generator.rb

@@ -58,7 +58,7 @@ module Merb
         modules.each_with_index do |mod, i|
           concat(("  " * (indent + i)) + "module #{mod}\n", block.binding)
         end
-        text = text.to_a.map{ |line| ("  " * modules.size) + line }.join
+        text = Array(text).map{ |line| ("  " * modules.size) + line }.join
         concat(text, block.binding)
         modules.reverse.each_with_index do |mod, i|
           concat(("  " * (indent + modules.size - i - 1)) + "end # #{mod}\n", block.binding)

data/lib/merb-gen/version.rb

@@ -0,0 +1,17 @@
+module Merb
+  module Generators
+
+    VERSION = '1.1.0.pre'.freeze
+
+    # Duplicated here (originally in merb_datamapper)
+    # This is currently the easiest way to get at the
+    # datamapper version requirements, and still seems
+    # better than specifying the datamapper version in
+    # merb-core itself.
+    DM_VERSION_REQUIREMENT = '~> 0.10'.freeze
+
+    # Necessary to supply builtin support for do_sqlite3
+    DO_VERSION_REQUIREMENT = '~> 0.10'.freeze
+
+  end
+end

data/lib/merb-gen.rb

@@ -1,34 +1,36 @@
-require 'rubygems'
 require 'merb-core'
+
 require 'digest/sha1'
-gem 'templater', '>= 0.3.2'
 require 'templater'
 
-path = File.join(File.dirname(__FILE__))
+require 'merb-gen/templater'
+require 'merb-gen/generator'
+require 'merb-gen/named_generator'
+require 'merb-gen/namespaced_generator'
+require 'merb-gen/app_generator'
+
+# TODO Look at how templater handles generators that don't reside
+# in the toplevel rubygems 'namespace'
 
-require path / "merb-gen"   / "templater"
-require path / "merb-gen"   / "generator"
-require path / "merb-gen"   / "named_generator"
-require path / "merb-gen"   / "namespaced_generator"
-require path / "merb-gen"   / "app_generator"
-require path / "generators" / "merb" / "merb_stack"
-require path / "generators" / "merb" / "merb_core"
-require path / "generators" / "merb" / "merb_flat"
-require path / "generators" / "merb" / "merb_very_flat"
-require path / "generators" / "merb_plugin"
-require path / "generators" / "controller"
-require path / "generators" / "helper"
-require path / "generators" / "part_controller"
-require path / "generators" / "migration"
-require path / "generators" / "session_migration"
-require path / "generators" / "model"
-require path / "generators" / "resource_controller"
-require path / "generators" / "resource"
-require path / "generators" / "layout"
-require path / "generators" / "thor"
+require File.expand_path('../generators/merb/merb_stack',     __FILE__)
+require File.expand_path('../generators/merb/merb_core',      __FILE__)
+require File.expand_path('../generators/merb/merb_flat',      __FILE__)
+require File.expand_path('../generators/merb/merb_very_flat', __FILE__)
+require File.expand_path('../generators/merb_plugin',         __FILE__)
+require File.expand_path('../generators/controller',          __FILE__)
+require File.expand_path('../generators/helper',              __FILE__)
+require File.expand_path('../generators/part_controller',     __FILE__)
+require File.expand_path('../generators/migration',           __FILE__)
+require File.expand_path('../generators/session_migration',   __FILE__)
+require File.expand_path('../generators/model',               __FILE__)
+require File.expand_path('../generators/resource_controller', __FILE__)
+require File.expand_path('../generators/resource',            __FILE__)
+require File.expand_path('../generators/layout',              __FILE__)
+require File.expand_path('../generators/passenger',           __FILE__)
+require File.expand_path('../generators/fcgi',                __FILE__)
 
-Templater::Discovery.discover!("merb-gen")
+Templater::Discovery.discover!('merb-gen')
 
 Merb.generators.each do |file|
   require file
-end
+end

data/spec/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::ControllerGenerator do
 

data/spec/fcgi_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Merb::Generators::FcgiGenerator do
+  
+  describe "templates" do
+    before(:each) do
+      @generator = Merb::Generators::FcgiGenerator.new('/tmp', {})
+    end
+
+    it "should create a .htaccess file within public/" do
+      @generator.should create('/tmp/public/.htaccess')
+    end
+
+    it "should create a merb.fcgi file within public/" do
+      @generator.should create('/tmp/public/.htaccess')
+    end
+    
+    it "should render templates successfully" do
+      lambda { @generator.render! }.should_not raise_error
+    end
+    
+  end
+  
+end

data/spec/generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::Generator do
   

data/spec/layout_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::LayoutGenerator do