Merge pull request #361 from DannyBen/fix/initialize-bash

Fix initialize.bash not being injected

Author: DannyBen

lib/bashly/concerns/renderable.rb

@@ -18,7 +18,7 @@ def view_marker(id = nil)
     # Reads a file from the userspace (Settings.source_dir) and returns
     # its contents. If the file is not found, returns a string with a hint.
     def load_user_file(file, placeholder: true)
-      path = "#{Settings.source_dir}/#{file}"
+      path = user_file_path file
 
       content = if File.exist? path
         File.read(path).remove_front_matter
@@ -31,6 +31,14 @@ def load_user_file(file, placeholder: true)
       Settings.production? ? content : "#{view_marker path}\n#{content}"
     end
 
+    def user_file_path(file)
+      path = "#{Settings.source_dir}/#{file}"
+      ext = ".#{Settings.partials_extension}"
+      return path if path.end_with? ext
+
+      "#{path}#{ext}"
+    end
+
   private
 
     def view_path(view)

lib/bashly/views/command/initialize.gtx

@@ -10,7 +10,7 @@ if root_command?
   = render(:environment_variables_default).indent 2
 end
 
-= load_user_file("initialize.sh", placeholder: false).indent 2
+= load_user_file("initialize", placeholder: false).indent 2
 
 > }
 >

spec/approvals/fixtures/initialize

@@ -0,0 +1,9 @@
++ bundle exec bashly generate
+creating user files in src
+skipped src/initialize.bash (exists)
+skipped src/root_command.bash (exists)
+created ./initialize
+run ./initialize --help to test your bash script
++ ./initialize
+initialize called
+root_command called

spec/bashly/script/command_spec.rb

@@ -332,6 +332,27 @@
     end
   end
 
+  describe '#user_file_path' do
+    it 'returns the path to the user file' do
+      expect(subject.user_file_path 'test.sh').to eq 'spec/tmp/src/test.sh'
+    end
+
+    context 'when the file argument does not end with .sh extension' do
+      it 'returns the path with .sh appended' do
+        expect(subject.user_file_path 'test').to eq 'spec/tmp/src/test.sh'
+      end
+    end
+
+    context 'when partials_extension is set and the argument does not end with the selected extension' do
+      before { Settings.partials_extension = 'bash' }
+      after  { Settings.partials_extension = 'sh' }
+
+      it 'returns the path with the selected extension appended' do
+        expect(subject.user_file_path 'test').to eq 'spec/tmp/src/test.bash'
+      end
+    end
+  end
+
   describe '#required_args' do
     it 'returns an array of only the required Argument objects' do
       expect(subject.required_args.size).to eq 1

spec/fixtures/workspaces/initialize/.gitignore

@@ -0,0 +1 @@
+initialize

spec/fixtures/workspaces/initialize/README.md

@@ -0,0 +1,3 @@
+This fixture tests that the initialize file is included when using a custom 
+partials_extension setting.
+ref: https://github.com/DannyBen/bashly/issues/360

spec/fixtures/workspaces/initialize/settings.yml

@@ -0,0 +1 @@
+partials_extension: bash

spec/fixtures/workspaces/initialize/src/bashly.yml

@@ -0,0 +1,3 @@
+name: initialize
+help: Test that initialize is included when using bash extension
+version: 0.1.0

spec/fixtures/workspaces/initialize/src/initialize.bash

@@ -0,0 +1 @@
+echo "initialize called"

spec/fixtures/workspaces/initialize/src/root_command.bash

@@ -0,0 +1 @@
+echo "root_command called"