diff options
Diffstat (limited to 'railties/lib/generators')
4 files changed, 13 insertions, 9 deletions
diff --git a/railties/lib/generators/actions.rb b/railties/lib/generators/actions.rb index 81db0b7c37..795d420229 100644 --- a/railties/lib/generators/actions.rb +++ b/railties/lib/generators/actions.rb @@ -16,13 +16,14 @@ module Rails # # apply "recipes/jquery.rb" # - def apply(path) - path = find_in_source_paths(path) unless path =~ /^http\:\/\// + def apply(path, options={}) + verbose = options.fetch(:verbose, true) + path = find_in_source_paths(path) unless path =~ /^http\:\/\// - log :apply, path - shell.padding += 1 + log :apply, path, verbose + shell.padding += 1 if verbose instance_eval(open(path).read) - shell.padding -= 1 + shell.padding -= 1 if verbose end # Install a plugin. You must provide either a Subversion url or Git url. diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index eaeb49903a..0c9bbeb847 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -66,7 +66,6 @@ module Rails::Generators empty_directory "config" inside "config" do - copy_file "boot.rb" copy_file "routes.rb" template "environment.rb" @@ -76,6 +75,10 @@ module Rails::Generators end end + def create_boot_file + copy_file "config/boot.rb" + end + def create_activerecord_files return if options[:skip_activerecord] template "config/databases/#{options[:database]}.yml", "config/database.yml" diff --git a/railties/lib/generators/rails/metal/metal_generator.rb b/railties/lib/generators/rails/metal/metal_generator.rb index d814b6c38b..fe4f945cad 100644 --- a/railties/lib/generators/rails/metal/metal_generator.rb +++ b/railties/lib/generators/rails/metal/metal_generator.rb @@ -3,7 +3,7 @@ module Rails class MetalGenerator < NamedBase check_class_collision - def create_file + def create_metal_file template "metal.rb", "app/metal/#{file_name}.rb" end end diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb index dcdc125867..ee785caf7d 100644 --- a/railties/lib/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/generators/rails/plugin/plugin_generator.rb @@ -21,13 +21,13 @@ module Rails end hook_for :generator do |instance, generator| - instance.inside_with_padding instance.send(:plugin_dir) do + instance.inside instance.send(:plugin_dir), :verbose => true do instance.invoke generator, [ instance.name ], :namespace => false end end hook_for :test_framework do |instance, test_framework| - instance.inside_with_padding instance.send(:plugin_dir) do + instance.inside instance.send(:plugin_dir), :verbose => true do instance.invoke test_framework end end |