ruby-zoom 4.3.2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69f08853e0d57951199bd5457687518398ed65eb
-  data.tar.gz: 05bc33a3d915ee9a1d4bc819f0943c8de682febc
+  metadata.gz: cae14a1830640da75b5ab95bc66e0039676601a2
+  data.tar.gz: a027b2d2e95ffc2a151bad4fe9d05ef9c4d2db13
 SHA512:
-  metadata.gz: 12dc726079299ef9971130305bfde110b7a96e4384f4718bcbb4a03a7f6bdafbcb13f5586197a77176e36d9778f5322b57f28ccde571f162df98756abfa288f9
-  data.tar.gz: 58515511ddba68d407730311e4330b500970fd3b47adcf0652cac6863db61f87a6a6d7e685a217cf91b147901c22bd59c397d99251e4ce93a4ee8ad387eba475
+  metadata.gz: ac0e4985295cb5d5b5cb44b75acee5b3ae174aebd916c2f939fa5b1979e80d355edaa5da51d871a2c51c7d7e46264e0575e85927160a375a1e71890bb6a14b1f
+  data.tar.gz: fb425a3f9d85016af48964168ed8e2afeb102a8f68841b8321357d667c36bffa9018af49673b570da119e0a356902d35d43a7164e174361f87976ee35f41f7f1

data/bin/z

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/bin/zc

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/bin/zf

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/bin/zg

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/bin/zl

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/bin/zr

@@ -20,6 +20,7 @@ def parse(args)
     options = Hash.new
     options["action"] = "exec"
     options["cache_file"] = nil
+    options["translate_flags"] = Hash.new
     options["use"] = nil
     options["verbose"] = false
 
@@ -83,6 +84,14 @@ def parse(args)
             exit ZoomExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore files/directories matching PATTERN"
+        ) do |pattern|
+            options["translate_flags"]["ignore"] = pattern
+        end
+
         opts.on("-l", "--list", "List profiles") do
             options["action"] = "list_profiles"
         end
@@ -95,7 +104,11 @@ def parse(args)
             options["use"] = name
         end
 
-        opts.on("-w", "--which", "Display current profile") do
+        opts.on("-w", "--word-regexp", "Only match whole words") do
+            options["translate_flags"]["word-regexp"] = ""
+        end
+
+        opts.on("--which", "Display current profile") do
             options["action"] = "which"
         end
 
@@ -221,7 +234,7 @@ def parse(args)
     end
 
     options["pattern"] = path
-    options["subargs"] = args.join(" ")
+    options["pass_args"] = args.join(" ")
 
     return options
 end
@@ -307,10 +320,11 @@ begin
     else
         # Search and cache results
         header = Hash.new
-        header["profile_name"] = options["use"]
-        header["args"] = options["subargs"]
-        header["pattern"] = options["pattern"]
+        header["args"] = options["pass_args"]
         header["paths"] = options["paths"]
+        header["pattern"] = options["pattern"]
+        header["profile_name"] = options["use"]
+        header["translate"] = options["translate_flags"]
         zoom.run(header)
     end
 rescue SystemExit

data/lib/zoom.rb

@@ -27,18 +27,21 @@ class Zoom
         profile.go(@config.editor, results)
     end
 
-    def repeat
+    def repeat(shortcut = true)
         return if (@cache.empty?)
-        run(@cache.header)
+        run(@cache.header, shortcut)
     end
 
-    def run(header)
-        profile_name = header["profile_name"]
-        args = header["args"]
-        pattern = header["pattern"]
-        paths = header["paths"]
+    def run(header, shortcut = true)
+        # Ensure header has no nil
+        ["args", "paths", "pattern", "profile_name"].each do |key|
+            header[key] ||= ""
+        end
+        header["pwd"] = Dir.pwd
+        header["translate"] ||= Array.new
 
-        if (profile_name.nil?)
+        profile_name = header["profile_name"]
+        if (profile_name.empty?)
             profile_name = @config.current_profile_name
             header["profile_name"] = profile_name
         end
@@ -48,10 +51,9 @@ class Zoom
         end
 
         profile = @config.get_profile(profile_name)
-        if (pattern.nil? || !profile.pattern.empty?)
+        if (!profile.pattern.empty?)
             header["pattern"] = profile.pattern
         end
-        header["pwd"] = Dir.pwd
 
         begin
             # Clear cache
@@ -60,11 +62,15 @@ class Zoom
             # Store needed details
             @cache.header(header)
 
+            # This will translate and/or append args such that the
+            # output will be something Zoom can process
+            header = profile.preprocess(header)
+
             # Execute profile
-            @cache.write(profile.exe(args, pattern, paths))
+            @cache.write(profile.exe(header))
 
             # Display results from cache
-            @cache.shortcut(@config)
+            @cache.shortcut(@config) if (shortcut)
         rescue Interrupt
             # ^C
         end

data/lib/zoom/cache.rb

@@ -82,7 +82,9 @@ class Zoom::Cache
     end
 
     def parse_tags(input)
-        raise Zoom::Error::InvalidTag.new if (input.nil? || input.empty?)
+        if (input.nil? || input.empty?)
+            raise Zoom::Error::InvalidTag.new
+        end
 
         tags = Array.new
         input.split(",").each do |num|

data/lib/zoom/cache/result.rb

@@ -5,10 +5,6 @@ class Zoom::Cache::Result
     attr_reader :match
     attr_reader :tag
 
-    def args
-        return @cache.args
-    end
-
     def grep_like?
         return @grep_like
     end
@@ -35,14 +31,6 @@ class Zoom::Cache::Result
         end
     end
 
-    def paths
-        return @cache.paths
-    end
-
-    def pattern
-        return @cache.pattern
-    end
-
     def profile_name
         return @cache.profile_name
     end

data/lib/zoom/profile.rb

@@ -3,16 +3,19 @@ require "scoobydoo"
 require "shellwords"
 
 class Zoom::Profile < Hash
+    attr_reader :format_flags
     attr_reader :pattern
     attr_reader :taggable
 
     def after(a = nil)
         self["after"] = a.strip if (a)
+        self["after"] ||= ""
         return self["after"]
     end
 
     def before(b = nil)
         self["before"] = b.strip if (b)
+        self["before"] ||= ""
         return self["before"]
     end
 
@@ -20,86 +23,28 @@ class Zoom::Profile < Hash
         return self["class"]
     end
 
-    def exe(args, pattern, paths)
-        # Use hard-coded pattern if defined
-        if (@pattern && !@pattern.empty? && (pattern != @pattern))
-            args += " #{pattern}"
-            pattern = @pattern
-        end
-
-        # If not pattern and no after, then return nothing
-        if (pattern.nil? || pattern.empty?)
-            return "" if (after.nil? || after.empty?)
-        end
-
+    def exe(header)
         # Emulate grep
         case operator.split("/")[-1]
-        when "ack", "ack-grep"
-            cmd = [
-                before,
-                operator,
-                "-H --nobreak --nocolor --noheading -s",
-                flags,
-                args,
-                pattern.shellescape,
-                paths,
-                after
-            ].join(" ").strip
-        when "ag"
-            cmd = [
-                before,
-                operator,
-                "--filename --nobreak --nocolor --noheading --silent",
-                flags,
-                args,
-                pattern.shellescape,
-                paths,
-                after
-            ].join(" ").strip
         when "find"
             cmd = [
                 before,
                 operator,
-                paths,
-                flags,
-                args,
-                "\"#{pattern}\"",
-                after
-            ].join(" ").strip
-        when "grep"
-            cmd = [
-                before,
-                operator,
-                "--color=never -EHInRs",
-                flags,
-                args,
-                "--exclude-dir=.bzr",
-                "--exclude-dir=.git",
-                "--exclude-dir=.git-crypt",
-                "--exclude-dir=.svn",
-                pattern.shellescape,
-                paths,
-                after
-            ].join(" ").strip
-        when "pt"
-            cmd = [
-                before,
-                operator,
-                "-e --nocolor --nogroup",
+                header["paths"],
                 flags,
-                args,
-                pattern.shellescape,
-                paths,
+                header["args"],
+                header["pattern"],
                 after
             ].join(" ").strip
         else
             cmd = [
                 before,
                 operator,
+                @format_flags,
                 flags,
-                args,
-                pattern,
-                paths,
+                header["args"],
+                header["pattern"],
+                header["paths"],
                 after
             ].join(" ").strip
         end
@@ -108,6 +53,7 @@ class Zoom::Profile < Hash
 
     def flags(f = nil)
         self["flags"] = f.strip if (f)
+        self["flags"] ||= ""
         return self["flags"]
     end
 
@@ -187,6 +133,7 @@ class Zoom::Profile < Hash
 
     def name(n = nil)
         self["name"] = n.strip if (n)
+        self["name"] ||= ""
         return self["name"]
     end
 
@@ -200,6 +147,38 @@ class Zoom::Profile < Hash
         return self["operator"]
     end
 
+    def preprocess(header)
+        # Use hard-coded pattern if defined
+        pattern = header["pattern"]
+        if (@pattern && !@pattern.empty? && (pattern != @pattern))
+            header["args"] += " #{pattern}"
+            header["pattern"] = @pattern
+        end
+
+        case operator.split("/")[-1]
+        when /^ack(-grep)?$/, "ag", "grep", "pt"
+            header["pattern"] = header["pattern"].shellescape
+        when "find"
+            # If additional args are passed, then assume pattern is
+            # actually and arg
+            if (header["args"] && !header["args"].empty?)
+                header["args"] += " #{header["pattern"]}"
+                header["pattern"] = ""
+            end
+
+            # If pattern was provided then assume it's an iname search
+            if (header["pattern"] && !header["pattern"].empty?)
+                header["pattern"] = "-iname \"#{header["pattern"]}\""
+            end
+        end
+
+        # Translate any needed flags
+        header["args"] += " #{translate(header["translate"])}"
+        header["args"].strip!
+
+        return header
+    end
+
     def self.profile_by_name(clas)
         clas.split("::").inject(Object) do |mod, class_name|
             mod.const_get(class_name)
@@ -236,6 +215,10 @@ class Zoom::Profile < Hash
         ret.push(hilight_after(after)) if (!after.empty?)
         return ret.join(" ").strip
     end
+
+    def translate(from)
+        return ""
+    end
 end
 
 require "zoom/profile/ack"

data/lib/zoom/profile/ack.rb

@@ -6,6 +6,27 @@ class Zoom::Profile::Ack < Zoom::Profile
         end
 
         super(n, o, f, b, a)
+        @format_flags = [
+            "-H",
+            "--follow",
+            "--nobreak",
+            "--nocolor",
+            "--noheading",
+            "-s"
+        ].join(" ")
         @taggable = true
     end
+
+    def translate(from)
+        to = Array.new
+        from.each do |flag, value|
+            case flag
+            when "ignore"
+                to.push("--type-set=zoom:match:/#{value}/ --zoom")
+            when "word-regexp"
+                to.push("-w")
+            end
+        end
+        return to.join(" ")
+    end
 end

data/lib/zoom/profile/ag.rb

@@ -1,6 +1,26 @@
 class Zoom::Profile::Ag < Zoom::Profile
     def initialize(n, o = "ag", f = "-S", b = "", a = "")
         super(n, o, f, b, a)
+        @format_flags = [
+            "--filename",
+            "--nobreak",
+            "--nocolor",
+            "--noheading",
+            "--silent"
+        ].join(" ")
         @taggable = true
     end
+
+    def translate(from)
+        to = Array.new
+        from.each do |flag, value|
+            case flag
+            when "ignore"
+                to.push("--ignore=#{value}")
+            when "word-regexp"
+                to.push("-w")
+            end
+        end
+        return to.join(" ")
+    end
 end

data/lib/zoom/profile/find.rb

@@ -1,5 +1,5 @@
 class Zoom::Profile::Find < Zoom::Profile
-    def initialize(n, o = "find", f = "-name", b = "", a = "")
+    def initialize(n, o = "find", f = "", b = "", a = "")
         super(n, o, f, b, a)
         @taggable = true
     end

data/lib/zoom/profile/grep.rb

@@ -1,6 +1,27 @@
 class Zoom::Profile::Grep < Zoom::Profile
     def initialize(n, o = "grep", f = "-i", b = "", a = "")
         super(n, o, f, b, a)
+        @format_flags = [
+            "--color=never",
+            "-EHInRs",
+            "--exclude-dir=.bzr",
+            "--exclude-dir=.git",
+            "--exclude-dir=.git-crypt",
+            "--exclude-dir=.svn"
+        ].join(" ")
         @taggable = true
     end
+
+    def translate(from)
+        to = Array.new
+        from.each do |flag, value|
+            case flag
+            when "ignore"
+                to.push("--exclude=#{value}")
+            when "word-regexp"
+                to.push("-w")
+            end
+        end
+        return to.join(" ")
+    end
 end

data/lib/zoom/profile/passwords.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::Passwords < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -20,8 +17,8 @@ class Zoom::Profile::Passwords < superclass
             flags = "-ai"
         end
 
-        super(n, op, flags, "", after)
-        @pattern = "(key|pass(word|wd)?)[^:=,>]? *[:=,>]"
+        super(n, op, flags)
+        @pattern = "(key|pass(wd|word)?)[^:=,>]? *[:=,>]"
         @taggable = true
     end
 end

data/lib/zoom/profile/pt.rb

@@ -1,6 +1,20 @@
 class Zoom::Profile::Pt < Zoom::Profile
     def initialize(n, o = "pt", f = "-S", b = "", a = "")
         super(n, o, f, b, a)
+        @format_flags = "-e --nocolor --nogroup"
         @taggable = true
     end
+
+    def translate(from)
+        to = Array.new
+        from.each do |flag, value|
+            case flag
+            when "ignore"
+                to.push("--ignore=#{value}")
+            when "word-regexp"
+                to.push("-w")
+            end
+        end
+        return to.join(" ")
+    end
 end

data/lib/zoom/profile/unsafe_c.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::UnsafeC < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -20,7 +17,7 @@ class Zoom::Profile::UnsafeC < superclass
             flags = "-i --include=\"*.[ch]\" --include=\"*.[ch]pp\""
         end
 
-        super(n, op, flags, "", after)
+        super(n, op, flags)
         @pattern = [
             "(",
             [

data/lib/zoom/profile/unsafe_java.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::UnsafeJava < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -24,8 +21,8 @@ class Zoom::Profile::UnsafeJava < superclass
             ].join(" ")
         end
 
-        super(n, op, flags, "", after)
-        @pattern = "(sun\\.misc\\.)?Unsafe|readObject\\(\\)"
+        super(n, op, flags)
+        @pattern = "(sun\\.misc\\.)?Unsafe|readObject\\("
         @taggable = true
     end
 end

data/lib/zoom/profile/unsafe_js.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::UnsafeJs < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -20,8 +17,8 @@ class Zoom::Profile::UnsafeJs < superclass
             flags = "-i --include=\"*.js\""
         end
 
-        super(n, op, flags, "", after)
-        @pattern = "\\.((eval|html)\\(|innerHTML)"
+        super(n, op, flags)
+        @pattern = "\\.((append|eval|html)\\(|innerHTML)"
         @taggable = true
     end
 end

data/lib/zoom/profile/unsafe_php.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::UnsafePhp < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -25,12 +22,13 @@ class Zoom::Profile::UnsafePhp < superclass
             ].join(" ")
         end
 
-        super(n, op, flags, "", after)
+        super(n, op, flags)
         # From here: https://www.eukhost.com/blog/webhosting/dangerous-php-functions-must-be-disabled/
         # OMG is anything safe?!
         @pattern = [
             "\\`|",
             "\\$_GET\\[|",
+            "(include|require)(_once)?|",
             "(",
             [
                 "apache_(child_terminate|setenv)",
@@ -42,7 +40,6 @@ class Zoom::Profile::UnsafePhp < superclass
                 "fp(ut)?",
                 "ftp_(connect|exec|get|login|(nb_f)?put|raw(list)?)",
                 "highlight_file",
-                "include(_once)?",
                 "ini_(alter|get_all|restore)",
                 "inject_code",
                 "mysql_pconnect",
@@ -52,10 +49,9 @@ class Zoom::Profile::UnsafePhp < superclass
                 "php_uname",
                 "phpAds_(remoteInfo|XmlRpc|xmlrpc(De|En)code)",
                 "popen",
-                "posix_(getpwuid|kill|mkfifo|set(pg|s|u)id|_uname)",
+                "posix_(getpwuid|kill|mkfifo|set(pg|s|u)id|uname)",
                 "preg_replace",
                 "proc_(close|get_status|nice|open|terminate)",
-                "require(_once)?",
                 "(shell_)?exec",
                 "sys(log|tem)",
                 "xmlrpc_entity_decode"

data/lib/zoom/profile/unsafe_python.rb

@@ -4,10 +4,7 @@ clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::Profile::UnsafePython < superclass
     def initialize(n, o = nil, f = "", b = "", a = "")
-        # I don't care about test code
-        after = "| \\grep -v \"^[^:]*test[^:]*:[0-9]+:\""
         flags = ""
-
         op = Zoom::ProfileManager.default_profile
         case op
         when /^ack(-grep)?$/
@@ -20,7 +17,7 @@ class Zoom::Profile::UnsafePython < superclass
             flags = "-i --include=\"*.py\""
         end
 
-        super(n, op, flags, "", after)
+        super(n, op, flags)
         @pattern = [
             "(",
             [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.0
 platform: ruby
 authors:
 - Miles Whittaker