- Improve friendly error on bash 3

Author: DannyBen

lib/bashly/models/script.rb

@@ -29,10 +29,16 @@ def header!
         if File.exist? custom_header_path
           File.read custom_header_path
         else
-          render('header')
+          default_header
         end
       end
 
+      def default_header
+        result = render('header')
+        result += render('bash3_bouncer') unless function_name
+        result
+      end
+
       def body
         @body ||= command.render('master_script')
       end

lib/bashly/views/script/bash3_bouncer.erb

@@ -0,0 +1,5 @@
+# :script.bash3_bouncer
+if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
+  printf "<%= strings[:unsupported_bash_version] -%>\n"
+  exit 1
+fi

lib/bashly/views/script/header.erb

@@ -2,7 +2,3 @@
 # This script was generated by bashly (https://github.com/DannyBen/bashly)
 # Modifying it manually is not recommended
 
-if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
-  printf "<%= strings[:unsupported_bash_version] -%>\n"
-  exit 1
-fi

spec/approvals/cli/generate/wrap-script

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# This script was generated by bashly (https://github.com/DannyBen/bashly)
+# Modifying it manually is not recommended
+
+# :script.wrapper
+function() {
+
+  # :command.version_command
+  version_command() {
+    echo "$version"
+  }

spec/approvals/models/script/code

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# This script was generated by bashly (https://github.com/DannyBen/bashly)
+# Modifying it manually is not recommended
+
+# :script.bash3_bouncer
+if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
+  printf "bash version 4 or higher is required\n"
+  exit 1
+fi
+
+# :command.root_command
+root_command() {
+  # :spec/tmp/src/root_command.sh

spec/approvals/models/script/code-wrapped

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# This script was generated by bashly (https://github.com/DannyBen/bashly)
+# Modifying it manually is not recommended
+
+# :script.wrapper
+my_super_function() {
+  # :command.root_command
+  root_command() {
+    # :spec/tmp/src/root_command.sh
+    echo "error: cannot load file"
+  }
+
+  # :command.version_command

spec/bashly/commands/generate_spec.rb

@@ -75,11 +75,11 @@
       expect(success).to be true
     end
 
-    it "generates the cli script wrapped in a function" do
+    it "generates the cli script wrapped in a function without bash3 bouncer" do
       expect { subject.run %w[generate -w function] }.to output_approval('cli/generate/wrap-function')
       expect(File).to exist(cli_script)
       lines = File.readlines cli_script
-      expect(lines[10]).to eq "function() {\n"
+      expect(lines[0..10].join).to match_approval('cli/generate/wrap-script')
     end
   end
 

spec/bashly/models/script_spec.rb

@@ -10,22 +10,17 @@
     context "without function name" do
       it "returns the complete script" do
         lines = subject.code.split "\n"
-        expect(lines[0]).to eq '#!/usr/bin/env bash'
-        expect(lines[1]).to start_with '# This script was generated by'
-        expect(lines[10]).to eq 'root_command() {'
+        expect(lines[0..12].join("\n")).to match_approval('models/script/code')
         expect(lines[-1]).to eq 'run "$@"'
       end
     end
 
     context "with function name" do
       subject { described_class.new command, 'my_super_function' }
 
-      it "returns the complete script wrapped in a function" do
+      it "returns the complete script wrapped in a function without a bash3 bouncer" do
         lines = subject.code.split "\n"
-        expect(lines[0]).to eq '#!/usr/bin/env bash'
-        expect(lines[1]).to start_with '# This script was generated by'
-        expect(lines[10]).to eq 'my_super_function() {'
-        expect(lines[11]).to eq '  # :command.root_command'
+        expect(lines[0..12].join("\n")).to match_approval('models/script/code-wrapped')
         expect(lines[-1]).to eq '(return 0 2>/dev/null) || my_super_function "$@"'
       end
     end

spec/fixtures/workspaces/flag-args-with-dash/argflag

@@ -2,6 +2,7 @@
 # This script was generated by bashly (https://github.com/DannyBen/bashly)
 # Modifying it manually is not recommended
 
+# :script.bash3_bouncer
 if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
   printf "bash version 4 or higher is required\n"
   exit 1