completely 0.7.4 → 0.8.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e03a96457b69bced5091cb3a335f60da59ed7629d836f985f6bef54e89f8d827
-  data.tar.gz: fb9fdf6333328841bb45fd65a6428571934602f13d5c7f1b555bc6dc7120c224
+  metadata.gz: f63b147e4b4e7f96c823f6cced45b7a22a495a97318b04e105fd70ca6fe22358
+  data.tar.gz: d361744ab7255d15b6fed24fd662591a8b2fab91696a0e79490c988c18e0438d
 SHA512:
-  metadata.gz: b085523a2bb092c928fd6ff908baef5e5e1c0c68775688ea5e1a31ba77e19c09acfd17c19395f513a44eae88c9ab36cb28784e6ddae1afda46053d8de3f79981
-  data.tar.gz: '0835d18cf9bf62f98c794368d39173263890856fe15ee601455b272ac5944a311a7bfee3e9eb6b8aa9ea215c2cd4713b7b5eb5e9c2c8cfb89764149064b41273'
+  metadata.gz: ae9f53dc80b932438d14c2be2e430880e9ae0b326abb3db8fd2e9d20abb09cba18cc631a8f73cda1ccb6b070f0f23c2d5bddc436f3f4cd771f5a4fa278bc599b
+  data.tar.gz: 84966032ec9b12086c0722948e8da2070cdbc57a4d8aaba8f456581a0b88192a0ff7fba334631eae2c33d099ff23c48fbaa42bb141c9314d41083598d112d144

data/lib/completely/pattern.rb

@@ -1,5 +1,7 @@
 module Completely
   class Pattern
+    DYNAMIC_WORD_PREFIX = '__completely_dynamic__'
+
     attr_reader :text, :completions, :function_name
 
     def initialize(text, completions, function_name)
@@ -54,12 +56,24 @@ module Completely
     def compgen!
       result = []
       result << actions.join(' ').to_s if actions.any?
-      result << %[-W "$(#{function_name} #{quoted_words.join ' '})"] if words.any?
+      result << %[-W "$(#{function_name} #{serialized_words.join ' '})"] if words.any?
       result.any? ? result.join(' ') : nil
     end
 
-    def quoted_words
-      @quoted_words ||= words.map { |word| %("#{escape_for_double_quotes word}") }
+    def serialized_words
+      @serialized_words ||= words.map { |word| serialize_word(word) }
+    end
+
+    def serialize_word(word)
+      if dynamic_word?(word)
+        return %("#{DYNAMIC_WORD_PREFIX}#{escape_for_double_quotes word}")
+      end
+
+      %("#{escape_for_double_quotes word}")
+    end
+
+    def dynamic_word?(word)
+      word.match?(/\A\$\(.+\)\z/)
     end
 
     def escape_for_double_quotes(word)

data/lib/completely/templates/template.erb

@@ -9,6 +9,7 @@
   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=()
@@ -20,19 +21,29 @@
   # Completing a non-option: drop options and already-used words.
   [[ "${cur:0:1}" == "-" ]] && want_options=1
   for word in "${words[@]}"; do
-    if ((!want_options)); then
-      [[ "${word:0:1}" == "-" ]] && continue
-
-      for u in "${used[@]}"; do
-        if [[ "$u" == "$word" ]]; then
-          continue 2
-        fi
-      done
+    local candidates=("$word")
+    if [[ "$word" == "$dynamic_prefix"* ]]; then
+      word="${word#"$dynamic_prefix"}"
+      word="${word//$'\r'/ }"
+      word="${word//$'\n'/ }"
+      read -r -a candidates <<<"$word"
     fi
 
-    # compgen -W expects shell-escaped words in one space-delimited string.
-    printf -v word '%q' "$word"
-    result+=("$word")
+    for candidate in "${candidates[@]}"; do
+      if ((!want_options)); then
+        [[ "${candidate:0:1}" == "-" ]] && continue
+
+        for u in "${used[@]}"; do
+          if [[ "$u" == "$candidate" ]]; 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
   done
 
   echo "${result[*]}"

data/lib/completely/version.rb

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

metadata

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