completely 0.8.0.rc3 → 0.8.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08af2e45d441174aa7ba877f55ce3ab49ed37c066abba5b522f404226c4fb09
-  data.tar.gz: 4096cfb3dd365eece6ad5801cde77ca2127fe0500404839949d8e4b6a3c0ec85
+  metadata.gz: 9fdb300c1ddaaf4ab1cfa6ca3e0b1371f4fbf33f1a22f29357bae06da0a973fc
+  data.tar.gz: 3c812320dc20d2b9c13bf08e5cff2c596cd873880d8ec5b19b3a0bee68afd875
 SHA512:
-  metadata.gz: b8d65f92118b3700b77803005d936a3b1ddee313936207387496d7685bd6361ffcb3fbe6c28bd8c3b5b7fb7d4d1bd1b259e1e898da1b9739df07b99e17e89c1f
-  data.tar.gz: 398311bc0f57a4722a10d37776aad1a4e0651986a35832fc54a087618fcc3995543a21e35880deaa8ada9b88bfbc91183201c0a8bdf174ebb69ccd34e6233006
+  metadata.gz: 83f853427d2f54f0b86d736c1d54e526a74806b643c7d4dc12ea857eeacde38e18b8272374253845e697545168d0afcc9ec48d52fad7c00969d4be972c919b26
+  data.tar.gz: 8f463487ca5084e78b11875f3b1d591359c0252055cdd44bb9df06024076b0dc6627647e9d30cd8beaeab1d97ec8b06eb1d986b634513eb5bb8e63184514daad

data/README.md

@@ -352,7 +352,7 @@ input = {
     "status" => ["--verbose|-v", "--branch|-b <branch>"]
   },
   "tokens" => {
-    "directory" => "directory",
+    "directory" => "+directory",
     "branch" => "$(git branch --format='%(refname:short)' 2>/dev/null)"
   }
 }

data/lib/completely/completions.rb

@@ -137,8 +137,10 @@ module Completely
       end
     end
 
-    def pattern_options_with_values
-      config.model[:options].values.flatten.select { |option| option[:value] }
+    def pattern_has_unique_options?
+      pattern_routes.any? do |route|
+        pattern_route_options(route).any? { |option| !option[:repeatable] }
+      end
     end
 
     def pattern_source_empty?(source)

data/lib/completely/templates/pattern-config/template.erb

@@ -4,16 +4,53 @@
 # completely (https://github.com/bashly-framework/completely)
 # Modifying it manually is not recommended
 
-<%= function_name %>_flag_expects_value() {
-  case "$1" in
-% pattern_options_with_values.each do |option|
-    <%= option[:names].map { |name| bash_escape name }.join('|') %>) return 0 ;;
+<%= function_name %>_route_flag_expects_value() {
+  case "$1:$2" in
+% pattern_routes.each do |route|
+% pattern_route_options(route).select { |option| option[:value] }.each do |option|
+    <%= pattern_route_id route %>:<%= option[:names].map { |name| bash_escape name }.join("|#{pattern_route_id route}:") %>) return 0 ;;
+% end
 % end
   esac
 
   return 1
 }
 
+% if pattern_has_unique_options?
+<%= function_name %>_option_seen() {
+  local completed_option option_name
+  for completed_option in "${completed_options[@]}"; do
+    for option_name in "$@"; do
+      [[ "$completed_option" == "$option_name" ]] && return 0
+    done
+  done
+
+  return 1
+}
+
+% end
+<%= function_name %>_resolve_route() {
+  route_id=
+  route_word_count=-1
+  route_has_positionals=0
+  positional_index=0
+% pattern_routes.each do |route|
+% conditions = pattern_route_conditions(route)
+  if (( ${#non_options[@]} >= <%= pattern_route_word_count route %> )) &&
+    (( <%= pattern_route_word_count route %> > route_word_count ))<%= conditions.empty? ? '' : ' &&' %>
+% conditions.each_with_index do |condition, index|
+    [[ <%= condition %> ]]<%= index == conditions.size - 1 ? '' : ' &&' %>
+% end
+  then
+    route_id=<%= pattern_route_id route %>
+    route_word_count=<%= pattern_route_word_count route %>
+    route_has_positionals=<%= route[:positionals].empty? ? 0 : 1 %>
+    positional_index=$((${#non_options[@]} - <%= pattern_route_word_count route %>))
+  fi
+
+% end
+}
+
 <%= function_name %>() {
   local cur=${COMP_WORDS[COMP_CWORD]}
   local prev=
@@ -28,6 +65,12 @@
 
   local non_options=()
   local completed_options=()
+  local route_id=
+  local route_word_count=-1
+  local route_has_positionals=0
+  local positional_index=0
+  <%= function_name %>_resolve_route
+
   local skip_next=0
   for word in "${completed[@]}"; do
     if ((skip_next)); then
@@ -37,34 +80,16 @@
 
     if [[ "${word:0:1}" == "-" ]]; then
       completed_options+=("$word")
-      if <%= function_name %>_flag_expects_value "$word"; then
+      if <%= function_name %>_route_flag_expects_value "$route_id" "$word"; then
         skip_next=1
       fi
       continue
     fi
 
     non_options+=("$word")
+    <%= function_name %>_resolve_route
   done
 
-  local route_id=
-  local route_word_count=-1
-  local route_has_positionals=0
-  local positional_index=0
-% pattern_routes.each do |route|
-% conditions = pattern_route_conditions(route)
-  if (( ${#non_options[@]} >= <%= pattern_route_word_count route %> )) &&
-    (( <%= pattern_route_word_count route %> > route_word_count ))<%= conditions.empty? ? '' : ' &&' %>
-% conditions.each_with_index do |condition, index|
-    [[ <%= condition %> ]]<%= index == conditions.size - 1 ? '' : ' &&' %>
-% end
-  then
-    route_id=<%= pattern_route_id route %>
-    route_word_count=<%= pattern_route_word_count route %>
-    route_has_positionals=<%= route[:positionals].empty? ? 0 : 1 %>
-    positional_index=$((${#non_options[@]} - <%= pattern_route_word_count route %>))
-  fi
-
-% end
   COMPREPLY=()
 
   if [[ -z "$route_id" ]] || { (( route_word_count == 0 )) && (( !route_has_positionals )) && [[ "${cur:0:1}" != "-" ]]; }; then
@@ -96,15 +121,7 @@
 % if option[:repeatable]
         words+=(<%= option[:names].map { |name| %["#{bash_escape name}"] }.join(' ') %>)
 % else
-        local option_seen=0
-        for completed_option in "${completed_options[@]}"; do
-          case "$completed_option" in
-            <%= option[:names].map { |name| bash_escape name }.join('|') %>) option_seen=1 ;;
-          esac
-        done
-        if ((!option_seen)); then
-          words+=(<%= option[:names].map { |name| %["#{bash_escape name}"] }.join(' ') %>)
-        fi
+        <%= function_name %>_option_seen <%= option[:names].map { |name| %["#{bash_escape name}"] }.join(' ') %> || words+=(<%= option[:names].map { |name| %["#{bash_escape name}"] }.join(' ') %>)
 % end
 % end
         while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "${words[*]}" -- "$cur")

data/lib/completely/version.rb

@@ -1,3 +1,3 @@
 module Completely
-  VERSION = '0.8.0.rc3'
+  VERSION = '0.8.0.rc5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completely
 version: !ruby/object:Gem::Version
-  version: 0.8.0.rc3
+  version: 0.8.0.rc5
 platform: ruby
 authors:
 - Danny Ben Shitrit