bashly 1.4.0.rc2 → 2.0.0.rc1

data/lib/bashly/views/command/completion_script.gtx

@@ -0,0 +1,21 @@
+= view_marker
+
+completion_shells = Settings.completion_shells
+
+> send_completions() {
+>   local completion_shell="${1:-{{ completion_shells.first }}}"
+>
+>   case "$completion_shell" in
+completion_shells.each do |shell|
+  >     {{ shell }}) send_completions_{{ shell }} ;;
+end
+>     *)
+>       printf 'unsupported shell: %s\n' "$completion_shell" >&2
+>       return 1
+>       ;;
+>   esac
+> }
+>
+completion_shells.each do |shell|
+  = render :"completion_script_#{shell}"
+end

data/lib/bashly/views/command/completion_script_bash.gtx

@@ -0,0 +1,63 @@
+= view_marker
+
+> send_completions_bash() {
+>   echo $'_{{ name.to_underscore }}_completions() {'
+>   echo $'  local completion_command="${COMP_WORDS[0]}"'
+>   echo $'  local completion_current="${COMP_WORDS[COMP_CWORD]:-}"'
+>   echo $'  local completion_word_count=$((COMP_CWORD - 1))'
+>   echo $'  local -a completion_words=()'
+>   echo $'  local -a completion_response=()'
+>   echo $'  local -a completion_options=()'
+>   echo $'  local -A completion_seen=()'
+>   echo $''
+>   echo $'  if [[ $completion_word_count -gt 0 ]]; then'
+>   echo $'    completion_words=("${COMP_WORDS[@]:1:completion_word_count}")'
+>   echo $'  fi'
+>   echo $''
+>   echo $'  COMPREPLY=()'
+>   echo $'  while IFS= read -r completion_line; do'
+>   echo $'    completion_response+=("$completion_line")'
+>   echo $'  done < <("$completion_command" __complete "${completion_words[@]}" "$completion_current")'
+>   echo $''
+>   echo $'  local completion_directive="${completion_response[-1]:-}"'
+>   echo $'  if [[ $completion_directive == :options=* ]]; then'
+>   echo $'    unset "completion_response[-1]"'
+>   echo $'    IFS=, read -r -a completion_options <<< "${completion_directive#:options=}"'
+>   echo $'  fi'
+>   echo $''
+>   echo $'  COMPREPLY=("${completion_response[@]}")'
+>   echo $'  local completion_candidate'
+>   echo $'  for completion_candidate in "${COMPREPLY[@]}"; do'
+>   echo $'    completion_seen["$completion_candidate"]=1'
+>   echo $'  done'
+>   echo $''
+>   echo $'  local completion_option'
+>   echo $'  local completion_files=false'
+>   echo $'  local completion_directories=false'
+>   echo $'  for completion_option in "${completion_options[@]}"; do'
+>   echo $'    case "$completion_option" in'
+>   echo $'      files) completion_files=true ;;'
+>   echo $'      directories) completion_directories=true ;;'
+>   echo $'      no-space) compopt -o nospace ;;'
+>   echo $'    esac'
+>   echo $'  done'
+>   echo $''
+>   echo $'  if [[ $completion_files == true ]]; then'
+>   echo $'    while IFS= read -r completion_candidate; do'
+>   echo $'      if [[ -z "${completion_seen[$completion_candidate]:-}" ]]; then'
+>   echo $'        COMPREPLY+=("$completion_candidate")'
+>   echo $'        completion_seen["$completion_candidate"]=1'
+>   echo $'      fi'
+>   echo $'    done < <(compgen -f -- "$completion_current")'
+>   echo $'  elif [[ $completion_directories == true ]]; then'
+>   echo $'    while IFS= read -r completion_candidate; do'
+>   echo $'      if [[ -z "${completion_seen[$completion_candidate]:-}" ]]; then'
+>   echo $'        COMPREPLY+=("$completion_candidate")'
+>   echo $'        completion_seen["$completion_candidate"]=1'
+>   echo $'      fi'
+>   echo $'    done < <(compgen -d -- "$completion_current")'
+>   echo $'  fi'
+>   echo $'}'
+>   echo $''
+>   echo $'complete -F _{{ name.to_underscore }}_completions {{ name }}'
+> }

data/lib/bashly/views/command/completion_script_zsh.gtx

@@ -0,0 +1,52 @@
+= view_marker
+
+> send_completions_zsh() {
+>   echo $'#compdef {{ name }}'
+>   echo $''
+>   echo $'_{{ name.to_underscore }}_completions() {'
+>   echo $'  local completion_command="${words[1]}"'
+>   echo $'  local completion_current="${words[CURRENT]:-}"'
+>   echo $'  local completion_output'
+>   echo $'  local completion_directive'
+>   echo $'  local -a completion_words=()'
+>   echo $'  local -a completion_response=()'
+>   echo $'  local -a completion_options=()'
+>   echo $'  local -a completion_add_args=()'
+>   echo $''
+>   echo $'  if (( CURRENT > 2 )); then'
+>   echo $'    completion_words=("${words[2,$((CURRENT - 1))]}")'
+>   echo $'  fi'
+>   echo $''
+>   echo $'  completion_output="$("$completion_command" __complete "${completion_words[@]}" "$completion_current")"'
+>   echo $'  completion_response=("${(@f)completion_output}")'
+>   echo $''
+>   echo $'  completion_directive="${completion_response[-1]:-}"'
+>   echo $'  if [[ $completion_directive == :options=* ]]; then'
+>   echo $'    completion_response[-1]=()'
+>   echo $'    completion_options=("${(@s:,:)${completion_directive#:options=}}")'
+>   echo $'  fi'
+>   echo $''
+>   echo $'  local completion_option'
+>   echo $'  local completion_files=false'
+>   echo $'  local completion_directories=false'
+>   echo $'  for completion_option in "${completion_options[@]}"; do'
+>   echo $'    case "$completion_option" in'
+>   echo $'      files) completion_files=true ;;'
+>   echo $'      directories) completion_directories=true ;;'
+>   echo $'      no-space) completion_add_args=(-S "") ;;'
+>   echo $'    esac'
+>   echo $'  done'
+>   echo $''
+>   echo $'  if (( ${#completion_response[@]} > 0 )); then'
+>   echo $'    compadd "${completion_add_args[@]}" -- "${completion_response[@]}"'
+>   echo $'  fi'
+>   echo $''
+>   echo $'  if [[ $completion_files == true ]]; then'
+>   echo $'    _files "${completion_add_args[@]}"'
+>   echo $'  elif [[ $completion_directories == true ]]; then'
+>   echo $'    _files -/ "${completion_add_args[@]}"'
+>   echo $'  fi'
+>   echo $'}'
+>   echo $''
+>   echo $'compdef _{{ name.to_underscore }}_completions {{ name }}'
+> }

data/lib/bashly/views/command/completion_word_filter.gtx

@@ -0,0 +1,44 @@
+> while [[ $# -gt 0 ]]; do
+>   case "$1" in
+public_commands.each do |command|
+  >     {{ command.aliases.join ' | ' }})
+  >       shift
+  >       {{ command.function_name }}_completion "$completion_current" "$@"
+  >       return
+  >       ;;
+end
+if fixed_flags?
+  if short_flag_exist? '-h'
+    >     --help)
+  else
+    >     --help | -h)
+  end
+  >       completion_blocked_flags["--help"]=1
+  >       shift
+  >       ;;
+  if root_command?
+    if short_flag_exist? '-v'
+      >     --version)
+    else
+      >     --version | -v)
+    end
+    >       completion_blocked_flags["--version"]=1
+    >       shift
+    >       ;;
+  end
+end
+public_flags.each do |flag|
+  = flag.render(:completion_filter).indent 4
+end
+>     *)
+if args.any?
+  = render(:completion_argument_filter).indent 6
+elsif default_command
+  >       {{ default_command.function_name }}_completion "$completion_current" "$@"
+  >       return
+else
+  >       return
+end
+>       ;;
+>   esac
+> done

data/lib/bashly/views/command/completions.gtx

@@ -0,0 +1,81 @@
+= view_marker
+
+> completion_run() {
+>   local -a completion_words=("$@")
+>   local -A completion_blocked_flags=()
+>   local -A completion_emitted=()
+>   local -a completion_options=()
+>   local -A completion_options_seen=()
+>   local completion_count=${#completion_words[@]}
+>   local completion_current=""
+>
+>   if [[ $completion_count -gt 0 ]]; then
+>     completion_current="${completion_words[$((completion_count - 1))]}"
+>     unset 'completion_words[completion_count - 1]'
+>   fi
+>
+>   {{ function_name }}_completion "$completion_current" "${completion_words[@]}"
+>
+>   local completion_options_string=""
+>   if [[ ${#completion_options[@]} -gt 0 ]]; then
+>     completion_options_string="$(
+>       IFS=,
+>       printf '%s' "${completion_options[*]}"
+>     )"
+>   fi
+>   printf ':options=%s\n' "$completion_options_string"
+> }
+>
+> completion_candidates() {
+>   local completion_current="$1"
+>   shift
+>
+>   local completion_candidate
+>   for completion_candidate in "$@"; do
+>     if [[ $completion_candidate == "$completion_current"* ]] &&
+>       [[ -z "${completion_emitted[$completion_candidate]:-}" ]]; then
+>       printf '%s\n' "$completion_candidate"
+>       completion_emitted["$completion_candidate"]=1
+>     fi
+>   done
+> }
+>
+> completion_flag_candidates() {
+>   local completion_flag="$1"
+>   local completion_current="$2"
+>   shift 2
+>
+>   if [[ -z "${completion_blocked_flags[$completion_flag]:-}" ]]; then
+>     completion_candidates "$completion_current" "$@"
+>   fi
+> }
+>
+> completion_add_options() {
+>   local completion_option
+>   for completion_option in "$@"; do
+>     if [[ -z "${completion_options_seen[$completion_option]:-}" ]]; then
+>       completion_options+=("$completion_option")
+>       completion_options_seen["$completion_option"]=1
+>     fi
+>   done
+> }
+>
+> completion_dynamic_candidates() {
+>   local completion_current="$1"
+>   local completion_output="$2"
+>
+>   [[ -n $completion_output ]] || return
+>
+>   local completion_candidate
+>   while IFS= read -r completion_candidate; do
+>     if [[ -n $completion_candidate ]]; then
+>       completion_candidates "$completion_current" "$completion_candidate"
+>     fi
+>   done <<<"$completion_output"
+> }
+>
+= render :completion_script if Settings.completion_shells.any?
+= render :completion_function
+deep_commands.each do |command|
+  = command.render :completion_function
+end

data/lib/bashly/views/command/inspect_args.gtx

@@ -4,7 +4,7 @@
 >   local k
 >
 >   if ((${#args[@]})); then
->     readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | sort)
+>     readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | LC_ALL=C sort)
 >     echo args:
 >     for k in "${sorted_keys[@]}"; do
 >       echo "- \${args[$k]} = ${args[$k]}"
@@ -28,7 +28,7 @@ end
 
 if Settings.enabled? :deps_array
   >   if ((${#deps[@]})); then
-  >     readarray -t sorted_keys < <(printf '%s\n' "${!deps[@]}" | sort)
+  >     readarray -t sorted_keys < <(printf '%s\n' "${!deps[@]}" | LC_ALL=C sort)
   >     echo
   >     echo deps:
   >     for k in "${sorted_keys[@]}"; do
@@ -40,7 +40,7 @@ end
 
 if Settings.enabled? :env_var_names_array
   >   if ((${#env_var_names[@]})); then
-  >     readarray -t sorted_names < <(printf '%s\n' "${env_var_names[@]}" | sort)
+  >     readarray -t sorted_names < <(printf '%s\n' "${env_var_names[@]}" | LC_ALL=C sort)
   >     echo
   >     echo "environment variables:"
   >     for k in "${sorted_names[@]}"; do

data/lib/bashly/views/command/master_script.gtx

@@ -8,6 +8,7 @@
 = render :user_lib if user_lib.any?
 = render :command_functions
 = render :parse_requirements
+= render :completions if Settings.completions?
 = render :user_hooks
 = render :initialize
 = render :run

data/lib/bashly/views/command/start.gtx

@@ -1,5 +1,14 @@
 = view_marker
 
 > command_line_args=("$@")
+if Settings.completions?
+> if [[ "${command_line_args[0]:-}" == "__complete" ]]; then
+>   completion_run "${command_line_args[@]:1}"
+> else
+>   {{ Settings.function_name :initialize }}
+>   {{ Settings.function_name :run }} "${command_line_args[@]}"
+> fi
+else
 > {{ Settings.function_name :initialize }}
 > {{ Settings.function_name :run }} "${command_line_args[@]}"
+end

data/lib/bashly/views/flag/argfile_case.gtx

@@ -1,6 +1,13 @@
 = view_marker
 
-> {{ aliases.join " | " }})
+> {{ positive_aliases.join " | " }})
 = render(arg ? :argfile_case_arg : :argfile_case_no_arg).indent 2
 >   ;;
 >
+
+if negatable
+  > {{ negated_long }})
+  >   unset "args[{{ name }}]"
+  >   ;;
+  >
+end

data/lib/bashly/views/flag/case.gtx

@@ -1,6 +1,14 @@
 = view_marker
 
-> {{ aliases.join " | " }})
+> {{ positive_aliases.join " | " }})
 = render(:conflicts).indent 2
 = render(arg ? :case_arg : :case_no_arg).indent 2
 >
+
+if negatable
+  > {{ negated_long }})
+  >   unset "args[{{ name }}]"
+  >   shift
+  >   ;;
+  >
+end

data/lib/bashly/views/flag/completion.gtx

@@ -0,0 +1 @@
+> completion_flag_candidates {{ name }} "$completion_current" {{ aliases.join ' ' }}

data/lib/bashly/views/flag/completion_filter.gtx

@@ -0,0 +1,7 @@
+> {{ aliases.join ' | ' }})
+if arg
+  = render(:completion_filter_arg).indent 2
+else
+  = render(:completion_filter_no_arg).indent 2
+end
+>   ;;

data/lib/bashly/views/flag/completion_filter_arg.gtx

@@ -0,0 +1,10 @@
+> shift
+> if [[ $# -eq 0 ]]; then
+= render(:completion_value_candidates).indent 2
+>   return
+> fi
+if unique
+  > completion_used_flag_values["{{ name }}:$1"]=1
+end
+> shift
+= render :completion_filter_block

data/lib/bashly/views/flag/completion_filter_block.gtx

@@ -0,0 +1,8 @@
+unless repeatable
+  > completion_blocked_flags["{{ name }}"]=1
+end
+if conflicts
+  conflicts.each do |conflict|
+    > completion_blocked_flags["{{ conflict }}"]=1
+  end
+end

data/lib/bashly/views/flag/completion_filter_no_arg.gtx

@@ -0,0 +1,2 @@
+= render :completion_filter_block
+> shift

data/lib/bashly/views/flag/completion_value_candidates.gtx

@@ -0,0 +1,31 @@
+if allowed
+  > local -a completion_values=(
+  allowed.each do |value|
+    >   "{{ value }}"
+  end
+  > )
+  if unique
+    > local completion_value
+    > for completion_value in "${completion_values[@]}"; do
+    >   if [[ -z "${completion_used_flag_values["{{ name }}:$completion_value"]:-}" ]]; then
+    >     completion_candidates "$completion_current" "$completion_value"
+    >   fi
+    > done
+  else
+    > completion_candidates "$completion_current" "${completion_values[@]}"
+  end
+end
+
+if completion_static.any?
+  > completion_candidates "$completion_current" {{ completion_static.map { |value| Shellwords.shellescape value }.join ' ' }}
+end
+
+completion_dynamic.each do |command|
+  > if completion_output="$({ {{ command }}; } 2>/dev/null)"; then
+  >   completion_dynamic_candidates "$completion_current" "$completion_output"
+  > fi
+end
+
+if completion_options.any?
+  > completion_add_options {{ completion_options.join ' ' }}
+end

data/lib/bashly.rb

@@ -6,13 +6,13 @@ module Bashly
   autoloads 'bashly/refinements', %i[ComposeRefinements]
 
   autoloads 'bashly', %i[
-    CLI CompletionBuilder Config ConfigValidator Library LibrarySource
+    CLI Config ConfigValidator Library LibrarySource
     LibrarySourceConfig MessageStrings RenderContext RenderSource Settings
     VERSION Watch
   ]
 
   autoloads 'bashly/concerns', %i[
-    AssetHelper Completions Renderable ValidationHelpers
+    AssetHelper Renderable ValidationHelpers
   ]
 
   module Script
@@ -37,9 +37,6 @@ module Bashly
 
   module Libraries
     autoload :Base, 'bashly/libraries/base'
-    autoload :CompletionsFunction, 'bashly/libraries/completions/completions_function'
-    autoload :CompletionsScript, 'bashly/libraries/completions/completions_script'
-    autoload :CompletionsYAML, 'bashly/libraries/completions/completions_yaml'
     autoload :Help, 'bashly/libraries/help/help'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: completely
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0.rc4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0.rc4
 - !ruby/object:Gem::Dependency
   name: gtx
   requirement: !ruby/object:Gem::Requirement
@@ -121,20 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 description: Generate bash command line tools using YAML configuration
 email: db@dannyben.com
 executables:
@@ -156,13 +128,11 @@ files:
 - lib/bashly/commands/render.rb
 - lib/bashly/commands/shell.rb
 - lib/bashly/commands/validate.rb
-- lib/bashly/completion_builder.rb
 - lib/bashly/completions/README.md
 - lib/bashly/completions/bashly-completions.bash
 - lib/bashly/completions/completely.yaml
 - lib/bashly/completions/completely.yaml.gtx
 - lib/bashly/concerns/asset_helper.rb
-- lib/bashly/concerns/completions.rb
 - lib/bashly/concerns/indentation_helper.rb
 - lib/bashly/concerns/renderable.rb
 - lib/bashly/concerns/validation_helpers.rb
@@ -180,9 +150,6 @@ files:
 - lib/bashly/extensions/yaml.rb
 - lib/bashly/libraries/base.rb
 - lib/bashly/libraries/colors/colors.sh
-- lib/bashly/libraries/completions/completions_function.rb
-- lib/bashly/libraries/completions/completions_script.rb
-- lib/bashly/libraries/completions/completions_yaml.rb
 - lib/bashly/libraries/config/config.sh
 - lib/bashly/libraries/help/help.rb
 - lib/bashly/libraries/help/help_command.sh
@@ -245,6 +212,8 @@ files:
 - lib/bashly/views/README.md
 - lib/bashly/views/argument/case.gtx
 - lib/bashly/views/argument/case_repeatable.gtx
+- lib/bashly/views/argument/completion.gtx
+- lib/bashly/views/argument/completion_filter.gtx
 - lib/bashly/views/argument/usage.gtx
 - lib/bashly/views/argument/validations.gtx
 - lib/bashly/views/command/argfile_filter.gtx
@@ -252,6 +221,16 @@ files:
 - lib/bashly/views/command/command_fallback.gtx
 - lib/bashly/views/command/command_filter.gtx
 - lib/bashly/views/command/command_functions.gtx
+- lib/bashly/views/command/completion_argument_candidates.gtx
+- lib/bashly/views/command/completion_argument_filter.gtx
+- lib/bashly/views/command/completion_command_candidates.gtx
+- lib/bashly/views/command/completion_flag_candidates.gtx
+- lib/bashly/views/command/completion_function.gtx
+- lib/bashly/views/command/completion_script.gtx
+- lib/bashly/views/command/completion_script_bash.gtx
+- lib/bashly/views/command/completion_script_zsh.gtx
+- lib/bashly/views/command/completion_word_filter.gtx
+- lib/bashly/views/command/completions.gtx
 - lib/bashly/views/command/default_assignments.gtx
 - lib/bashly/views/command/default_script.gtx
 - lib/bashly/views/command/dependencies_filter.gtx
@@ -305,12 +284,18 @@ files:
 - lib/bashly/views/flag/case.gtx
 - lib/bashly/views/flag/case_arg.gtx
 - lib/bashly/views/flag/case_no_arg.gtx
+- lib/bashly/views/flag/completion.gtx
+- lib/bashly/views/flag/completion_filter.gtx
+- lib/bashly/views/flag/completion_filter_arg.gtx
+- lib/bashly/views/flag/completion_filter_block.gtx
+- lib/bashly/views/flag/completion_filter_no_arg.gtx
+- lib/bashly/views/flag/completion_value_candidates.gtx
 - lib/bashly/views/flag/conflicts.gtx
 - lib/bashly/views/flag/needs.gtx
 - lib/bashly/views/flag/usage.gtx
 - lib/bashly/views/flag/validations.gtx
 - lib/bashly/views/variable/definition.gtx
-- lib/bashly/views/wrapper/bash3_bouncer.gtx
+- lib/bashly/views/wrapper/bash_version_bouncer.gtx
 - lib/bashly/views/wrapper/header.gtx
 - lib/bashly/views/wrapper/wrapper.gtx
 - lib/bashly/watch.rb
@@ -330,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Bash Command Line Tool Generator
 test_files: []