merb-core/lib/merb-core/core_ext/class.rb merb-gen/lib/generators/templates/application/common/merb_thor/app_script.rb merb-gen/lib/generators/templates/application/common/merb_thor/common.rb merb-gen/lib/generators/templates/application/common/merb_thor/gem_ext.rb merb-gen/lib/generators/templates/application/common/merb_thor/main.thor merb-gen/lib/generators/templates/application/common/merb_thor/ops.rb merb-gen/lib/generators/templates/application/common/merb_thor/utils.rb merb-gen/lib/generators/thor.rb merb-gen/lib/merb-gen/templater.rb @@ -31,7 +31,6 @@ merb_release = { ], "merb" => [ - "merb", "merb-action-args", "merb-assets", "merb-slices", @@ -42,9 +41,10 @@ merb_release = { "merb-haml", "merb-helpers", "merb-mailer", - "merb-more", "merb-param-protection", "merb_datamapper", + "merb", + "merb-more" ] } Rakefile @@ -32,27 +32,29 @@ module Merb::Template path.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_") end - # For a given path, get an IO object that responds to #path. - # - # This is so that plugins can override this if they provide - # mechanisms for specifying templates that are not just simple - # files. The plugin is responsible for ensuring that the fake - # path provided will work with #template_for, and thus the - # RenderMixin in general. - # - # ==== Parameters - # path<String>:: A full path to find a template for. This is the - # path that the RenderMixin assumes it should find the template - # in. - # - # ==== Returns - # IO#path:: An IO object that responds to path (File or VirtualFile). - # - # :api: plugin - # @overridable - def load_template_io(path) - file = Dir["#{path}.{#{template_extensions.join(',')}}"].first - File.open(file, "r") if file + chainable do + # For a given path, get an IO object that responds to #path. + # + # This is so that plugins can override this if they provide + # mechanisms for specifying templates that are not just simple + # files. The plugin is responsible for ensuring that the fake + # path provided will work with #template_for, and thus the + # RenderMixin in general. + # + # ==== Parameters + # path<String>:: A full path to find a template for. This is the + # path that the RenderMixin assumes it should find the template + # in. + # + # ==== Returns + # IO#path:: An IO object that responds to path (File or VirtualFile). + # + # :api: plugin + # @overridable + def load_template_io(path) + file = Dir["#{path}.{#{template_extensions.join(',')}}"].first + File.open(file, "r") if file + end end # Get the name of the template method for a particular path. merb-core/lib/merb-core/controller/template.rb @@ -7,3 +7,4 @@ end require File.dirname(__FILE__) / "core_ext" / "kernel" require File.dirname(__FILE__) / "core_ext" / "hash" +require File.dirname(__FILE__) / "core_ext" / "class" \ No newline at end of file merb-core/lib/merb-core/core_ext.rb @@ -45,11 +45,6 @@ module Merb # empty_directory :gems, 'gems' - file :thorfile do |file| - file.source = File.join(common_templates_dir, "merb.thor") - file.destination = "merb.thor" - end - template :rakefile do |template| template.source = File.join(common_templates_dir, "Rakefile") template.destination = "Rakefile" @@ -71,6 +66,11 @@ module Merb directory.source = File.join(source_root, dir) directory.destination = dir end + + directory :thor_file do |directory| + directory.source = File.join(common_templates_dir, "merb_thor") + directory.destination = File.join("tasks", "merb.thor") + end # # ==== Layout specific things merb-gen/lib/generators/merb/merb_core.rb @@ -45,11 +45,6 @@ module Merb # empty_directory :gems, 'gems' - file :thorfile do |file| - file.source = File.join(common_templates_dir, "merb.thor") - file.destination = "merb.thor" - end - template :rakefile do |template| template.source = File.join(common_templates_dir, "Rakefile") template.destination = "Rakefile" @@ -66,6 +61,11 @@ module Merb directory.source = File.join(source_root, dir) directory.destination = dir end + + directory :thor_file do |directory| + directory.source = File.join(common_templates_dir, "merb_thor") + directory.destination = File.join("tasks", "merb.thor") + end # # ==== Layout specific things merb-gen/lib/generators/merb/merb_flat.rb @@ -49,11 +49,6 @@ module Merb # empty_directory :gems, 'gems' - file :thorfile do |file| - file.source = File.join(common_templates_dir, "merb.thor") - file.destination = "tasks/merb.thor" - end - template :rakefile do |template| template.source = File.join(common_templates_dir, "Rakefile") template.destination = "Rakefile" @@ -79,6 +74,11 @@ module Merb file.destination = 'public/javascripts/jquery.js' end + directory :thor_file do |directory| + directory.source = File.join(common_templates_dir, "merb_thor") + directory.destination = File.join("tasks", "merb.thor") + end + directory :test_dir do |directory| dir = testing_framework == :rspec ? "spec" : "test" merb-gen/lib/generators/merb/merb_stack.rb @@ -49,16 +49,16 @@ module Merb directory.destination = dir end + directory :thor_file do |directory| + directory.source = File.join(common_templates_dir, "merb_thor") + directory.destination = File.join("tasks", "merb.thor") + end + template :rakefile do |template| template.source = File.join(common_templates_dir, "Rakefile") template.destination = "Rakefile" end - file :thorfile do |file| - file.source = File.join(common_templates_dir, "merb.thor") - file.destination = "merb.thor" - end - def class_name self.name.gsub("-", "_").camel_case end merb-gen/lib/generators/merb/merb_very_flat.rb @@ -15,4 +15,8 @@ schema/*.db src/* .hgignore .hg/* -.svn/* \ No newline at end of file +.svn/* +gems/gems/*/ +gems/specifications/* +!gems/gems/thor*/ +!gems/specifications/thor* \ No newline at end of file merb-gen/lib/generators/templates/application/common/dotgitignore @@ -6,6 +6,7 @@ require 'templater' path = File.join(File.dirname(__FILE__)) +require path / "merb-gen" / "templater" require path / "merb-gen" / "generator" require path / "merb-gen" / "named_generator" require path / "merb-gen" / "namespaced_generator" @@ -24,6 +25,7 @@ require path / "generators" / "model" require path / "generators" / "resource_controller" require path / "generators" / "resource" require path / "generators" / "layout" +require path / "generators" / "thor" Templater::Discovery.discover!("merb-gen") merb-gen/lib/merb-gen.rb merb-gen/lib/generators/templates/application/common/merb.thor 14e5d1d55b2709f19369d30cc5f8c720b1dce137 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/2435f86119ff923676d68d73fb47f4b1fb3df7e7 2435f86119ff923676d68d73fb47f4b1fb3df7e7 2008-12-15T17:45:37-08:00 2008-12-15T17:45:37-08:00 Updates merb-gen to supply the merb.thor directory and hack around some issues with templater 68b0eac3d46575b362e433d28cb257a8da0d0dbb Yehuda Katz wycats@gmail.com