sprout 1.1.4.pre → 1.1.5.pre

data/VERSION

@@ -1 +1 @@
-1.1.4.pre
+1.1.5.pre

data/lib/sprout/generator.rb

@@ -209,8 +209,6 @@ module Sprout
         create_search_paths.select { |path| File.directory?(path) }
       end
 
-      private
-
       def create_search_paths
         paths = [
                   File.join('config', 'generators'),
@@ -221,6 +219,8 @@ module Sprout
         paths
       end
 
+      private
+
       ##
       # I know this seems weird - but we can't instantiate the classes
       # during registration because they register before they've been fully

data/lib/sprout/generator/base.rb

@@ -30,6 +30,11 @@ module Sprout
       # status to standard output.
       add_param :quiet, Boolean
 
+      ##
+      # Display the paths this generator will use to look
+      # for templates on this system and exit.
+      add_param :show_template_paths, Boolean
+
       ##
       # A collection of paths to look in for named templates.
       add_param :templates, Paths
@@ -72,10 +77,16 @@ module Sprout
       ##
       # Record the actions and trigger them
       def execute
+        return do_show_template_paths if show_template_paths
         return prepare_command.unexecute if destroy
         prepare_command.execute
       end
 
+      def validate
+        return true if show_template_paths
+        super
+      end
+
       ##
       # Rollback the generator
       def unexecute
@@ -105,12 +116,32 @@ module Sprout
       # Sprout::Generator.search_paths + 'templates' folders.
       #
       def template_paths
-        templates << Sprout::Generator::template_folder_for(self)
-        templates.concat default_search_paths
+        create_template_paths
+      end
+
+      def create_template_paths
+        paths = templates.dup
+        paths = paths.concat Sprout::Generator.search_paths
+        paths << Sprout::Generator::template_folder_for(self)
       end
 
       protected
 
+      def do_show_template_paths
+        @logger ||= $stdout
+        message = "The following paths will be checked for templates:\n"
+        
+        paths = ["--templates+=[value]"]
+        paths = paths.concat Sprout::Generator.create_search_paths
+        paths << "ENV['SPROUT_GENERATORS']"
+        paths << Sprout::Generator::template_folder_for(self)
+
+        message << "  * "
+        message << paths.join("\n  * ")
+        say message
+        message
+      end
+
       def default_search_paths
         Sprout::Generator.search_paths.collect { |path| File.join(path, 'templates') }
       end

data/test/unit/generator_test.rb

@@ -58,6 +58,13 @@ class GeneratorTest < Test::Unit::TestCase
         end
       end
 
+      should "show template paths and nothing else" do
+        @generator.parse! ['--show-template-paths']
+        output = @generator.execute
+
+        assert_equal 7, output.split("\n").size
+      end
+
       should "not clobber existing files" do
         dir = File.join(@fixture, 'some_project', 'src')
         FileUtils.mkdir_p dir
@@ -149,7 +156,7 @@ class GeneratorTest < Test::Unit::TestCase
       end
 
       should "not update superclass parameter collection" do
-        assert_equal 6, Sprout::Generator::Base.static_parameter_collection.size
+        assert_equal 7, Sprout::Generator::Base.static_parameter_collection.size
         assert_equal 1, Sprout::Generator::Base.static_default_value_collection.size
       end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
+  - 5
   - pre
-  version: 1.1.4.pre
+  version: 1.1.5.pre
 platform: ruby
 authors: 
 - Luke Bayes