completely 0.8.0.rc1 → 0.8.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63b147e4b4e7f96c823f6cced45b7a22a495a97318b04e105fd70ca6fe22358
-  data.tar.gz: d361744ab7255d15b6fed24fd662591a8b2fab91696a0e79490c988c18e0438d
+  metadata.gz: 6d0582777cb78d66e4490a8f7f941de869281ab50aef1ad4cb9a6a57461fb45b
+  data.tar.gz: dafc8bdb605da6cde23bf30a8a0fdea1b989509b44dce37a83a91c64376ed3ad
 SHA512:
-  metadata.gz: ae9f53dc80b932438d14c2be2e430880e9ae0b326abb3db8fd2e9d20abb09cba18cc631a8f73cda1ccb6b070f0f23c2d5bddc436f3f4cd771f5a4fa278bc599b
-  data.tar.gz: 84966032ec9b12086c0722948e8da2070cdbc57a4d8aaba8f456581a0b88192a0ff7fba334631eae2c33d099ff23c48fbaa42bb141c9314d41083598d112d144
+  metadata.gz: 72d2fe448ef4fd313da9ca850c1b6a71f60882d84023c724a85fff6f777b128c8e542db0c2e373a6423e65960aaec3977990ac845744244adef89b80bfd4bb23
+  data.tar.gz: '081b9173573eed04ce23afed2aa8fad0f94ab242f6975d07d15ad124afb21a1281d44bbae6ac161262177025bf8021975694699890384f8f975393c43fcd0796'

data/lib/completely/pattern.rb

@@ -1,7 +1,5 @@
 module Completely
   class Pattern
-    DYNAMIC_WORD_PREFIX = '__completely_dynamic__'
-
     attr_reader :text, :completions, :function_name
 
     def initialize(text, completions, function_name)
@@ -65,9 +63,7 @@ module Completely
     end
 
     def serialize_word(word)
-      if dynamic_word?(word)
-        return %("#{DYNAMIC_WORD_PREFIX}#{escape_for_double_quotes word}")
-      end
+      return word if dynamic_word?(word)
 
       %("#{escape_for_double_quotes word}")
     end

data/lib/completely/templates/template.erb

@@ -9,7 +9,6 @@
   local cur=${COMP_WORDS[COMP_CWORD]}
   local result=()
   local want_options=0
-  local dynamic_prefix="<%= Completely::Pattern::DYNAMIC_WORD_PREFIX %>"
 
   # words the user already typed (excluding the command itself)
   local used=()
@@ -21,29 +20,19 @@
   # Completing a non-option: drop options and already-used words.
   [[ "${cur:0:1}" == "-" ]] && want_options=1
   for word in "${words[@]}"; do
-    local candidates=("$word")
-    if [[ "$word" == "$dynamic_prefix"* ]]; then
-      word="${word#"$dynamic_prefix"}"
-      word="${word//$'\r'/ }"
-      word="${word//$'\n'/ }"
-      read -r -a candidates <<<"$word"
-    fi
-
-    for candidate in "${candidates[@]}"; do
-      if ((!want_options)); then
-        [[ "${candidate:0:1}" == "-" ]] && continue
+    if ((!want_options)); then
+      [[ "${word:0:1}" == "-" ]] && continue
 
-        for u in "${used[@]}"; do
-          if [[ "$u" == "$candidate" ]]; then
-            continue 2
-          fi
-        done
-      fi
+      for u in "${used[@]}"; do
+        if [[ "$u" == "$word" ]]; then
+          continue 2
+        fi
+      done
+    fi
 
-      # compgen -W expects shell-escaped words in one space-delimited string.
-      printf -v candidate '%q' "$candidate"
-      result+=("$candidate")
-    done
+    # compgen -W expects shell-escaped words in one space-delimited string.
+    printf -v word '%q' "$word"
+    result+=("$word")
   done
 
   echo "${result[*]}"
@@ -70,6 +59,7 @@
 % patterns.each do |pattern|
 % next if pattern.empty?
     <%= pattern.case_string %>)
+      # shellcheck disable=SC2046  # intentional splitting for dynamic $(...) completions
       while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen <%= pattern.compgen %> -- "$cur")
       ;;
 

data/lib/completely/version.rb

@@ -1,3 +1,3 @@
 module Completely
-  VERSION = '0.8.0.rc1'
+  VERSION = '0.8.0.rc2'
 end

metadata

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