Merge pull request #385 from spastorino/accept_tt_at_end

Accept .tt as for templates

Author: sferik

lib/thor/actions.rb

@@ -131,11 +131,14 @@ def source_paths
     # Receives a file or directory and search for it in the source paths.
     #
     def find_in_source_paths(file)
+      possible_files = [file, file + TEMPLATE_EXTNAME]
       relative_root = relative_to_original_destination_root(destination_root, false)
 
       source_paths.each do |source|
-        source_file = File.expand_path(file, File.join(source, relative_root))
-        return source_file if File.exist?(source_file)
+        possible_files.each do |f|
+          source_file = File.expand_path(f, File.join(source, relative_root))
+          return source_file if File.exist?(source_file)
+        end
       end
 
       message = "Could not find #{file.inspect} in any of your source paths. "

lib/thor/actions/directory.rb

@@ -88,10 +88,10 @@ def execute!
               dirname = File.dirname(file_destination).gsub(/\/\.$/, '')
               next if dirname == given_destination
               base.empty_directory(dirname, config)
-            when /\.tt$/
-              destination = base.template(file_source, file_destination[0..-4], config, &@block)
+            when /#{TEMPLATE_EXTNAME}$/
+              base.template(file_source, file_destination[0..-4], config, &@block)
             else
-              destination = base.copy_file(file_source, file_destination, config, &@block)
+              base.copy_file(file_source, file_destination, config, &@block)
             end
           end
         end

lib/thor/actions/file_manipulation.rb

@@ -108,7 +108,7 @@ def get(source, *args, &block)
     #
     def template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
-      destination = args.first || source.sub(/\.tt$/, '')
+      destination = args.first || source.sub(/#{TEMPLATE_EXTNAME}$/, '')
 
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')

lib/thor/base.rb

@@ -19,6 +19,8 @@ class Thor
   THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root
                            action add_file create_file in_root inside run run_ruby_script)
 
+  TEMPLATE_EXTNAME = '.tt'
+
   module Base
     attr_accessor :options, :parent_options, :args
 

spec/actions/file_manipulation_spec.rb

@@ -184,6 +184,13 @@ def file
       expect(File.exists?(file)).to be true
     end
 
+    it "accepts filename without .tt for template method" do
+      expect(runner).to receive(:file_name).and_return("rdoc")
+      action :template, "doc/%file_name%.rb"
+      file = File.join(destination_root, "doc/rdoc.rb")
+      expect(File.exists?(file)).to be true
+    end
+
     it "logs status" do
       expect(capture(:stdout) { runner.template("doc/config.rb") }).to eq("      create  doc/config.rb\n")
     end