Change to extract empty directory mapping to the templater

piotrmurach · Aug 22, 2020 · 72447ec · 72447ec
1 parent 7bb47fe
commit 72447ec
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/tty/commands/add.rb b/lib/tty/commands/add.rb
@@ -80,7 +80,7 @@ def execute(input: $stdin, output: $stdout)
           @templater.add_mapping("#{test_dir}/unit/command_#{test_dir}.rb.tt",
             "#{test_dir}/unit/#{cmd_name_path}_#{test_dir}.rb")
           @templater.add_mapping("command.rb.tt", cmd_file)
-          @templater.add_mapping("gitkeep.tt", "#{cmd_template_path}/.gitkeep")
+          @templater.add_empty_directory_mapping(cmd_template_path)
           @templater.generate(template_context, file_options)
 
           if !cmd_exists?(cli_content)
@@ -114,7 +114,7 @@ def execute(input: $stdin, output: $stdout)
             @templater.add_mapping("namespace.rb.tt", cmd_file)
           end
           @templater.add_mapping("command.rb.tt", subcmd_file)
-          @templater.add_mapping("gitkeep.tt", "#{subcmd_template_path}/.gitkeep")
+          @templater.add_empty_directory_mapping(subcmd_template_path)
           @templater.generate(template_context, file_options)
 
           if !subcmd_registered?(cli_content)

diff --git a/lib/tty/commands/new.rb b/lib/tty/commands/new.rb
@@ -187,11 +187,11 @@ def test_dir
       end
 
       def add_empty_directories
-        @templater.add_mapping("gitkeep.tt", "lib/#{namespaced_path}/commands/.gitkeep")
-        @templater.add_mapping("gitkeep.tt", "lib/#{namespaced_path}/templates/.gitkeep")
-        @templater.add_mapping("gitkeep.tt", "#{test_dir}/integration/.gitkeep")
-        @templater.add_mapping("gitkeep.tt", "#{test_dir}/support/.gitkeep")
-        @templater.add_mapping("gitkeep.tt", "#{test_dir}/unit/.gitkeep")
+        @templater.add_empty_directory_mapping("lib/#{namespaced_path}/commands")
+        @templater.add_empty_directory_mapping("lib/#{namespaced_path}/templates")
+        @templater.add_empty_directory_mapping("#{test_dir}/integration")
+        @templater.add_empty_directory_mapping("#{test_dir}/support")
+        @templater.add_empty_directory_mapping("#{test_dir}/unit")
       end
 
       # Add license definition to gemspec

diff --git a/lib/tty/templater.rb b/lib/tty/templater.rb
@@ -35,6 +35,16 @@ def add_mapping(source, target)
       @templates << [source, target]
     end
 
+    # Add empty directory with gitkeep file mapping
+    #
+    # @param [String] target
+    #   the target location
+    #
+    # @api public
+    def add_empty_directory_mapping(target)
+      @templates << ["gitkeep.tt", ::File.join(target, ".gitkeep")]
+    end
+
     # Process templates by injecting vars and moving to location
     #
     # @api private