completely 0.8.0.rc4 → 0.8.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da96ad6408e1fb83fe82d923c1e81e4361e980f26e3f0877b0861d7671b4ba02
-  data.tar.gz: e352accd9df02816b08ace6ab3416c9a1c82b64c8dde783772c3eaab6a96a397
+  metadata.gz: 9fdb300c1ddaaf4ab1cfa6ca3e0b1371f4fbf33f1a22f29357bae06da0a973fc
+  data.tar.gz: 3c812320dc20d2b9c13bf08e5cff2c596cd873880d8ec5b19b3a0bee68afd875
 SHA512:
-  metadata.gz: 034e76f8cf366655b8b6e33a38cb1042b13fca7d9c8ec5e3ea4de3df260c49d69dbc83c27db477061261cb027adb4f080ab45c9297dff3f28b3e9a610f920f5e
-  data.tar.gz: ebc3b3c4a6ce2e70b56c85cc83c0235e52a0d940c88179ee22147e240cb200a2cef7c6af1bccd2d51a36c5c62d0ec592035e483d35f14e844efb949d1490cdac
+  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,6 +137,12 @@ module Completely
       end
     end
 
+    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)
       source[:items].empty?
     end

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

@@ -16,6 +16,19 @@
   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
@@ -108,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.rc4'
+  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.rc4
+  version: 0.8.0.rc5
 platform: ruby
 authors:
 - Danny Ben Shitrit