From d6c6e7cfe1d7d13ab5f47b59744da2558212160c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 27 Jul 2010 16:14:09 +0200 Subject: [PATCH] Fix generators bug. --- lib/generators/devise/install_generator.rb | 6 +++--- lib/generators/{devise => }/templates/README | 0 lib/generators/{devise => }/templates/devise.rb | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename lib/generators/{devise => }/templates/README (100%) rename lib/generators/{devise => }/templates/devise.rb (100%) diff --git a/lib/generators/devise/install_generator.rb b/lib/generators/devise/install_generator.rb index 0f954d53..6e9c2d99 100644 --- a/lib/generators/devise/install_generator.rb +++ b/lib/generators/devise/install_generator.rb @@ -3,7 +3,7 @@ require 'active_support/secure_random' module Devise module Generators class InstallGenerator < Rails::Generators::Base - source_root File.expand_path("../templates", __FILE__) + source_root File.expand_path("../../templates", __FILE__) desc "Creates a Devise initializer and copy locale files to your application." class_option :orm @@ -13,11 +13,11 @@ module Devise end def copy_locale - copy_file "../../../../config/locales/en.yml", "config/locales/devise.en.yml" + copy_file "../../../config/locales/en.yml", "config/locales/devise.en.yml" end def show_readme - readme "README" + readme "README" if behavior == :invoke end end end diff --git a/lib/generators/devise/templates/README b/lib/generators/templates/README similarity index 100% rename from lib/generators/devise/templates/README rename to lib/generators/templates/README diff --git a/lib/generators/devise/templates/devise.rb b/lib/generators/templates/devise.rb similarity index 100% rename from lib/generators/devise/templates/devise.rb rename to lib/generators/templates/devise.rb