rubber-ducky 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

ducky/ducky.py

@@ -15,6 +15,7 @@ from pathlib import Path
 from textwrap import dedent
 from typing import Any, Dict, List
 
+__version__ = "1.6.2"
 
 from .config import ConfigManager
 from .crumb import CrumbManager
@@ -1114,6 +1115,9 @@ async def interactive_session(
 
 async def ducky() -> None:
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--version", "-v", action="version", version=f"%(prog)s {__version__}"
+    )
     parser.add_argument(
         "--directory", "-d", help="The directory to be processed", default=None
     )
@@ -1247,23 +1251,36 @@ def substitute_placeholders(command: str, args: list[str]) -> str:
 
     Args:
         command: The command string with placeholders
-        args: List of arguments to substitute (first arg replaces first placeholder, etc.)
+        args: List of arguments to substitute. The first unique variable name
+              maps to args[0], the second unique name maps to args[1], etc.
 
     Returns:
-        Command with placeholders replaced, falling back to env vars for unreplaced placeholders
+        Command with placeholders replaced. Reused variable names get the
+        same argument value. Falls back to env vars for unreplaced placeholders.
     """
     result = command
-    arg_index = 0
     placeholder_pattern = re.compile(r'\$\{([^}]+)\}|\$(\w+)')
 
+    # First pass: collect unique variable names in order of appearance
+    unique_vars = []
+    seen_vars = set()
+    for match in placeholder_pattern.finditer(command):
+        var_name = match.group(1) or match.group(2)
+        if var_name not in seen_vars:
+            seen_vars.add(var_name)
+            unique_vars.append(var_name)
+
+    # Map unique variable names to arguments
+    var_map = {}
+    for i, var_name in enumerate(unique_vars):
+        if i < len(args):
+            var_map[var_name] = args[i]
+
+    # Second pass: replace all placeholders using the map
     def replace_placeholder(match: re.Match) -> str:
-        nonlocal arg_index
-        # Get the variable name from either ${VAR} or $var format
         var_name = match.group(1) or match.group(2)
-        if arg_index < len(args):
-            value = args[arg_index]
-            arg_index += 1
-            return value
+        if var_name in var_map:
+            return var_map[var_name]
         # Fallback to environment variable
         return os.environ.get(var_name, match.group(0))
 

{rubber_ducky-1.6.1.dist-info → rubber_ducky-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubber-ducky
-Version: 1.6.1
+Version: 1.6.2
 Summary: Quick CLI do-it-all tool. Use natural language to spit out bash commands
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{rubber_ducky-1.6.1.dist-info → rubber_ducky-1.6.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 ducky/__init__.py,sha256=2vLhJxOuJ3lnIeg5rmF6xUvybUT5Qhjej6AS0BeBASY,60
 ducky/config.py,sha256=Lh7xTUYh4i8Gxgrl0oTYadZB_72Wy2BKIqLCcDQduOA,2116
 ducky/crumb.py,sha256=7BlyjD81-cZptYxQM97y6gOGdVDBF2qzxW0xbPqbspE,2693
-ducky/ducky.py,sha256=LMAp1ZV7dR-NR6uoSiUpfcanHXU1eRA55Q0jB_ViMwo,47374
+ducky/ducky.py,sha256=J6UeoL07TUp6HODQmBHr_x-kSj6DZXnhm8RwRTwxNHs,48035
 examples/POLLING_USER_GUIDE.md,sha256=rMEAczZhpgyJ9BgwHkN-SKwSdyas8nlw_CjpV7SFOLA,10685
 examples/mock-logs/info.txt,sha256=apJqEO__UM1R2_2x9MlQOA7XmxvLvbhRvOy-FAwrINo,258
 examples/mock-logs/mock-logs.sh,sha256=zM2JSaCR1eCQLlMvXDWjFnpxZTqrMpnFRa_SgNLPmBk,1132
-rubber_ducky-1.6.1.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
-rubber_ducky-1.6.1.dist-info/METADATA,sha256=lZZ9iHVNunf7cJuyN7lLQK9vA1WUBVX3SGGWG4c7Mok,6638
-rubber_ducky-1.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubber_ducky-1.6.1.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
-rubber_ducky-1.6.1.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
-rubber_ducky-1.6.1.dist-info/RECORD,,
+rubber_ducky-1.6.2.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
+rubber_ducky-1.6.2.dist-info/METADATA,sha256=Z7Bck_ZmjiNnyGFxdgD_phsFMd_SK-SxUWPctCUuUp8,6638
+rubber_ducky-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubber_ducky-1.6.2.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
+rubber_ducky-1.6.2.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
+rubber_ducky-1.6.2.dist-info/RECORD,,