Upgrade dependencies

rossmacarthur · rossmacarthur · commit 66ce1a702921 · 2025-05-22T15:29:02.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,7 +41,7 @@ indexmap = { version = "2.4.0", features = ["rayon", "serde"] }
 itertools = "0.14.0"
 maplit = "1.0.2"
 rayon = "1.10.0"
-regex-macro = "0.2.0"
+regex-macro = "0.3.0"
 serde = { version = "1.0.209", features = ["derive"] }
 thiserror = "2.0.11"
 toml = { version = "0.8.19", features = ["preserve_order"] }
diff --git a/README.md b/README.md
@@ -641,9 +641,9 @@ following.
 
 ```toml
 [templates]
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
diff --git a/completions/sheldon.bash b/completions/sheldon.bash
@@ -1,12 +1,16 @@
 _sheldon() {
     local i cur prev opts cmd
     COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+        cur="$2"
+    else
+        cur="${COMP_WORDS[COMP_CWORD]}"
+    fi
+    prev="$3"
     cmd=""
     opts=""
 
-    for i in ${COMP_WORDS[@]}
+    for i in "${COMP_WORDS[@]:0:COMP_CWORD}"
     do
         case "${cmd},${i}" in
             ",$1")
diff --git a/docs/src/Configuration.md b/docs/src/Configuration.md
@@ -248,9 +248,9 @@ following.
 
 ```toml
 [templates]
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
diff --git a/tests/testdata/directories_default/plugins.lock b/tests/testdata/directories_default/plugins.lock
@@ -24,6 +24,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/directories_xdg_from_env/plugins.lock b/tests/testdata/directories_xdg_from_env/plugins.lock
@@ -24,6 +24,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/github_bad_reinstall/plugins.lock b/tests/testdata/github_bad_reinstall/plugins.lock
@@ -16,6 +16,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/github_branch/plugins.lock b/tests/testdata/github_branch/plugins.lock
@@ -16,6 +16,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/github_https/plugins.lock b/tests/testdata/github_https/plugins.lock
@@ -16,6 +16,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/github_submodule/plugins.lock b/tests/testdata/github_submodule/plugins.lock
@@ -17,6 +17,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/github_tag/plugins.lock b/tests/testdata/github_tag/plugins.lock
@@ -16,6 +16,6 @@ apply = ["source"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/hooks/plugins.lock b/tests/testdata/hooks/plugins.lock
@@ -26,6 +26,6 @@ post = "post"
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/inline/plugins.lock b/tests/testdata/inline/plugins.lock
@@ -20,6 +20,6 @@ raw = "echo 'testing...'"
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
diff --git a/tests/testdata/profiles/plugins.p1.lock b/tests/testdata/profiles/plugins.p1.lock
@@ -22,6 +22,6 @@ profiles = ["p1", "p2"]
 PATH = 'export PATH="{{ dir }}:$PATH"'
 path = 'path=( "{{ dir }}" $path )'
 fpath = 'fpath=( "{{ dir }}" $fpath )'
-source = '''
+source = """
 {{ hooks?.pre | nl }}{% for file in files %}source "{{ file }}"
-{% endfor %}{{ hooks?.post | nl }}'''
+{% endfor %}{{ hooks?.post | nl }}"""
