Merge pull request #630 from vladriabtsev/master

avoid conflict with run() function with another bash frameworks

Author: DannyBen

lib/bashly/libraries/settings/settings.yml

@@ -126,3 +126,8 @@ var_aliases:
   other_args: ~
   deps: ~
   env_var_names: ~
+
+# Choose different names for some of the internal functions.
+function_names:
+  run: ~
+  initialize: ~

lib/bashly/settings.rb

@@ -15,6 +15,7 @@ class << self
         :enable_inspect_args,
         :enable_sourcing,
         :enable_view_markers,
+        :function_names,
         :lib_dir,
         :partials_extension,
         :private_reveal_key,
@@ -89,6 +90,14 @@ def full_lib_dir
         "#{source_dir}/#{lib_dir}"
       end
 
+      def function_name(key)
+        function_names[key.to_s] || key.to_s
+      end
+
+      def function_names
+        @function_names ||= get :function_names
+      end
+
       def lib_dir
         @lib_dir ||= get :lib_dir
       end

lib/bashly/views/command/initialize.gtx

@@ -1,6 +1,6 @@
 = view_marker
 
-> initialize() {
+> {{ Settings.function_name :initialize }}() {
 >   declare -g version="<%= version %>"
 >   {{ Settings.strict_string }}
 

lib/bashly/views/command/master_script.gtx

@@ -15,11 +15,11 @@
 > 
 if Settings.enabled? :sourcing
   > if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-  >   initialize
-  >   run "$@"
+  >   {{ Settings.function_name :initialize }}
+  >   {{ Settings.function_name :run }} "$@"
   > fi
 else
-  > initialize
-  > run "$@"
+  > {{ Settings.function_name :initialize }}
+  > {{ Settings.function_name :run }} "$@"
 end
 > 

lib/bashly/views/command/run.gtx

@@ -1,6 +1,6 @@
 = view_marker
 
-> run() {
+> {{ Settings.function_name :run }}() {
 = render(:globals).indent(2)
 >
 >   normalize_input "$@"