cmdline-sub 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8333cc1f6aa8e4eb3b47299c6038d0c04d26b9b0b8e4b2292e54906fc9e766d
-  data.tar.gz: 2b6fa1a2ef48f3ff9fec5aa017c7e4ef94e977085f424e64a4c9378822dc0a4b
+  metadata.gz: c389766a40ec1f0894ff39ae9156d8ab1f737e32da5e6a83ac82e758fd420e06
+  data.tar.gz: cbe56894e3d43b63ec14da75db54b820c9347a197e32c9ae6a5cc649ddabdb1c
 SHA512:
-  metadata.gz: 3b162147e9a995230fdb3744963af0fa237ec96fe9f6088b561ce82de7a7a6d338096715dda296f2ad5c6060d2d3e826017aa346c283cb79662723884acd64c6
-  data.tar.gz: 2bb7d2a20e123d67ddb0ee09e8c2de7b7e0e46d6a39d31b3364df381b9f9481d15020df0096a0edc0b140b5a3d8ebae97926717f8cb2609fa5f7ea9861f40a41
+  metadata.gz: 71806a610d4b0a4e3e14e6ed75ab31f0dc4d1c34ac72767b3b8e063ed139322685f1c0585929f58f447a25e07f717171892d7ed35ace82f4a8d67ad9dd00b394
+  data.tar.gz: d08f7dd174f7546d4b451a5ee6a0639eea308ca894db10c861dbd3556efbe6965770c2529a822da2a64821de52a68444d3771fa253a9e6f46ba17923e65b77fb

data/README

@@ -1,7 +1,7 @@
 Sub
 ===
 
-sub v0.1.2
+sub v0.1.3
 Usage: sub COMMANDLINE -- (PATTERN/SUBSTITUTION[/SUB_FLAGS])+ (/GLOBAL_FLAGS)?
 
 sub substitutes the matching pattern in every word in the command line with the
@@ -53,8 +53,8 @@ Substitution flags:
   	  ex: sub cp here.txt there.txt -- CP/mv/i #=> mv here.txt there.txt
 -g:	General substitution: substitute all matches in the word, not just the first
   	  ex: sub cp here.txt there.txt -- ./_/g #=> __ ________ _________
--e:	Expand * in commandline after replacements are made
-  	  ex: sub ls mydir -- mydir/*/e #=> ls bin README
+-r:	Don't escape substituted value, allow shell to expand and split it
+  	  ex: sub ls mydir -- 'mydir/*/r' #=> ls bin README
 Global flags:
 -p:	Print the command instead of executing it (adds newline)
 -P:	Print the command instead of executing it (doesn't add newline)

data/bin/sub

@@ -5,8 +5,9 @@
 if ENV["TESTING_SUB_CMD"] == "1" && ENV["DEBUGGING_SUB_CMD"] == "1"
   require "debug"
 end
+require "shellwords"
 
-VERSION = "0.1.2"
+VERSION = "0.1.3"
 
 USAGE = <<EOF
 Usage: sub COMMANDLINE -- (PATTERN/SUBSTITUTION[/SUB_FLAGS])+ (/GLOBAL_FLAGS)?
@@ -89,8 +90,8 @@ SUB_FLAGS = [
   { flag: 'g', name: :general, desc: "General substitution: substitute all matches in the word, not just the first",
     example: "sub cp here.txt there.txt -- ./_/g #=> __ ________ _________",
   },
-  { flag: 'e', name: :expand_star, desc: "Expand * in commandline after replacements are made",
-    example: [ "sub ls mydir -- mydir/*/e #=> ls bin README" ]
+  { flag: 'r', name: :raw_mode, desc: "Don't escape substituted value, allow shell to expand and split it",
+    example: [ "sub ls mydir -- 'mydir/*/r' #=> ls bin README" ]
   },
 ]
 GLOBAL_FLAGS = [
@@ -234,11 +235,14 @@ def parse_sub_strs(sub_strs)
       flags_hash = {
         first_match: parse_simple_flag!(flags, flag_by_name(:first_match)),
         last_match: parse_simple_flag!(flags, flag_by_name(:last_match)),
-        expand_star: parse_simple_flag!(flags, flag_by_name(:expand_star)),
+        raw_mode: parse_simple_flag!(flags, flag_by_name(:raw_mode)),
         literal: parse_simple_flag!(flags, flag_by_name(:literal)),
         ignorecase: parse_simple_flag!(flags, flag_by_name(:ignorecase)),
         general: parse_simple_flag!(flags, flag_by_name(:general)),
       }
+      if flags_hash[:raw_mode]
+        flags_hash[:raw_mode] = 0 # bitfield
+      end
       pats << pat
       subs << sub
       match_flags << flags_hash
@@ -303,6 +307,9 @@ def argv_replace!(argv, regexps, subs, flags)
             scan_size = arg.scan(regexp).size
             scan_size = 1 if scan_size > 1
           end
+          if flags[i].fetch(:raw_mode)
+            flags[i][:raw_mode] |= i+1
+          end
           if new_arg != arg || new_arg == subs[i]
             num_replacements += scan_size
           end
@@ -359,7 +366,7 @@ def copy!(cmd_line, global_flags)
   end
 end
 
-def exec_cmd(argv, regexps, subs, raw_flags, num_replacements, global_flags)
+def exec_cmd(argv, regexps, subs, flags_hashes, raw_flags, global_flags, num_replacements)
   if global_flags.fetch(:debug)
     puts "Patterns: #{regexps.inspect}"
     puts "Substitutions: #{subs.inspect}"
@@ -382,7 +389,19 @@ def exec_cmd(argv, regexps, subs, raw_flags, num_replacements, global_flags)
   end
 
   cmd = argv.shift
-  cmd_line = "#{cmd} #{argv.join(' ')}"
+  argv_string = String.new
+  argv.each_with_index do |arg, i|
+    raw_mode = flags_hashes.any? { |flags_hash| flags_hash[:raw_mode] && (flags_hash[:raw_mode] & i+1) != 0 }
+    if raw_mode
+      argv_string << arg
+    else
+      argv_string << Shellwords.escape(arg)
+    end
+    unless argv[i+1].nil?
+      argv_string << " "
+    end
+  end
+  cmd_line = "#{cmd} #{argv_string}"
   action = global_flags.fetch(:copy_to_clipboard) ? "copy" : "execute"
   if global_flags.fetch(:interactive) && !global_flags.fetch(:print_only)
     $stdout.puts "Would you like to #{action} the following command? [y(es),n(o)]"
@@ -401,7 +420,7 @@ def exec_cmd(argv, regexps, subs, raw_flags, num_replacements, global_flags)
   copy!(cmd_line, global_flags) if global_flags.fetch(:copy_to_clipboard)
   exit 0 if global_flags.fetch(:print_only) || global_flags.fetch(:print_only_no_newline) || global_flags.fetch(:copy_to_clipboard)
   begin
-    exec cmd, *argv
+    exec cmd_line
   rescue SystemCallError => e
     if e.class == Errno::ENOENT
       # act like a shell
@@ -413,4 +432,4 @@ def exec_cmd(argv, regexps, subs, raw_flags, num_replacements, global_flags)
   end
 end
 
-exec_cmd(argv, regexps, subs, raw_flags, num_replacements, global_flags)
+exec_cmd(argv, regexps, subs, flags_hashes, raw_flags, global_flags, num_replacements)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdline-sub
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Luke Gruber
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug