ruby-zoom 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a560507624dc0d065fa2d47f4cd92faba20e621c
-  data.tar.gz: d51b7f2c8f8f0cacd09090eeb0d3552e6c78bafc
+  metadata.gz: 406a2c7c4be5d5beb4bb9475c35f0bbaede64de7
+  data.tar.gz: f696609ec371176906fd10c30b01da026fdfcf75
 SHA512:
-  metadata.gz: 1cca4796bfad739375b8266ff7e918cd52586b2cd306ab4c72c8b1989b210870b3d9d73fbd6b0a11c387ae14f475d3f80127c825fbe3cfef71a76540f0e3abe3
-  data.tar.gz: 8cfa676f9f2b4063d38f0c9992e60a23decaf03ea63896f57d9e4bc18da3bb8c48ef356d9f229f26c481b94250e762d9970997b75461b0cd63953fcd0339944f
+  metadata.gz: c30089b0a1e4530f08ab4b2a2d3a8d71357c7473d13414cd4fff8a1408e340584ac0da1bb3f059a3b8afa99647a20309116ae3d54963fc9b8639bf63c7ae73b1
+  data.tar.gz: dc8cc5d5e0f9bb2fbd6ae951894c0ad65e7bb2f1312269ce04cb1fa91109592495672c1f45ad22be1291602d85201039c6e100569d66640e0f24446c910c74fd

data/bin/z

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/bin/zc

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/bin/zf

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/bin/zg

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/bin/zl

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/bin/zr

@@ -40,8 +40,10 @@ def parse(args)
     parser = OptionParser.new do |opts|
         opts.summary_width = 25
 
-        opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
+        opts.banner = [
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]",
+            "[path1]...[pathN]"
+        ].join(" ")
 
         opts.on("", "DESCRIPTION")
 
@@ -193,12 +195,27 @@ def parse(args)
         options["action"] = "repeat"
     when "z"
         # Do nothing, this is the normal usage
+        # Add to this case if renaming
     else
         options["use"] = File.basename($0)
     end
 
-    options["pattern"] = args.delete_at(-1)
+    paths = Array.new
+    path = args.delete_at(-1)
+    while (path && Pathname.new(path).exist?)
+        paths.push(path)
+        path = args.delete_at(-1)
+    end
+
+    if (!paths.empty?)
+        options["paths"] = paths.reverse.join(" ")
+    else
+        options["paths"] = "."
+    end
+
+    options["pattern"] = path
     options["subargs"] = args.join(" ")
+
     return options
 end
 
@@ -209,7 +226,8 @@ begin
         FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
     end
 
-    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+    zoom = Zoom.new(options["cache_file"])
+    Zoom.hilight(!Hilighter.disable?)
 
     case options["action"]
     when "cache"
@@ -279,11 +297,12 @@ begin
         end
     else
         # Search and cache results
-        zoom.run(
-            options["use"],
-            options["subargs"],
-            options["pattern"]
-        )
+        header = Hash.new
+        header["profile_name"] = options["use"]
+        header["args"] = options["subargs"]
+        header["pattern"] = options["pattern"]
+        header["paths"] = options["paths"]
+        zoom.run(header)
     end
 rescue SystemExit
     # Quit from djinni

data/lib/zoom.rb

@@ -13,13 +13,10 @@ class Zoom
         return @@hilight
     end
 
-    def initialize(cache = nil, rc = nil, hilight = false)
-        @@hilight = hilight
+    def initialize(cache = nil, rc = nil)
         @cache = Zoom::Cache.new(cache)
         @config = Zoom::Config.new(rc)
-
-        # Prioritize false, so only reassign if true
-        @@hilight = @config.hilight if (hilight)
+        @@hilight = @config.hilight
     end
 
     def open(results)
@@ -32,38 +29,39 @@ class Zoom
 
     def repeat
         return if (@cache.empty?)
-
-        run(
-            @cache.profile_name,
-            @cache.args,
-            @cache.pattern
-        )
+        run(@cache.header)
     end
 
-    def run(prof_name, args, pattern)
-        prof_name = @config.current_profile_name if (prof_name.nil?)
+    def run(header)
+        profile_name = header["profile_name"]
+        args = header["args"]
+        pattern = header["pattern"]
+        paths = header["paths"]
+
+        if (profile_name.nil?)
+            profile_name = @config.current_profile_name
+            header["profile_name"] = profile_name
+        end
+
+        if (!@config.has_profile?(profile_name))
+            raise Zoom::Error::ProfileDoesNotExist.new(profile_name)
+        end
 
-        if (!@config.has_profile?(prof_name))
-            raise Zoom::Error::ProfileDoesNotExist.new(prof_name)
+        profile = @config.get_profile(profile_name)
+        if (pattern.nil? || !profile.pattern.empty?)
+            header["pattern"] = profile.pattern
         end
+        header["pwd"] = Dir.pwd
 
-        profile = @config.get_profile(prof_name)
         begin
+            # Clear cache
             @cache.clear
 
             # Store needed details
-            if (pattern && profile.pattern.empty?)
-                @cache.args(args)
-                @cache.pattern(pattern)
-            else
-                @cache.args("")
-                @cache.pattern(profile.pattern)
-            end
-            @cache.profile_name(prof_name)
-            @cache.pwd(Dir.pwd)
+            @cache.header(header)
 
             # Execute profile
-            @cache.write(profile.exe(args, pattern))
+            @cache.write(profile.exe(args, pattern, paths))
 
             # Display results from cache
             @cache.shortcut(@config)

data/lib/zoom/cache.rb

@@ -1,21 +1,13 @@
 require "io/wait"
+require "json"
 require "pathname"
 
 class Zoom::Cache
-    attr_reader :zoom_args
-    attr_reader :zoom_pattern
-    attr_reader :zoom_profile_name
-    attr_reader :zoom_pwd
-
-    def args(a = nil)
-        if (a.nil?)
-            return nil if (empty?)
-            return @zoom_args
-        end
+    attr_reader :header
 
-        File.open(@cache_file, "a") do |f|
-            f.write("ZOOM_ARGS=#{a}\n")
-        end
+    def args
+        return nil if (@header.nil?)
+        return @header["args"]
     end
 
     def available_tags
@@ -27,34 +19,16 @@ class Zoom::Cache
         @results = nil
         @thread.kill if (@thread)
         @thread = nil
-        @zoom_args = nil
-        @zoom_pattern = nil
-        @zoom_profile_name = nil
-        @zoom_pwd = nil
+        @header = nil
     end
 
     def empty?
         read if (@thread.nil?)
         return true if (@thread.nil?)
-
-        while (
-            @thread.alive? &&
-            (
-                @zoom_args.nil? ||
-                @zoom_pattern.nil? ||
-                @zoom_profile_name.nil? ||
-                @zoom_pwd.nil?
-            )
-        )
+        while (@thread.alive? && (@header.nil? || @header.empty?))
             sleep 0.1
         end
-
-        return (
-            @zoom_args.nil? ||
-            @zoom_pattern.nil? ||
-            @zoom_profile_name.nil? ||
-            @zoom_pwd.nil?
-        )
+        return @header.empty?
     end
 
     def get_results(tags = nil)
@@ -86,16 +60,22 @@ class Zoom::Cache
         return results
     end
 
+    def header(header = nil)
+        return nil if (header.nil? && empty?)
+        return @header if (header.nil?)
+
+        File.open(@cache_file, "a") do |f|
+            f.write("ZOOM_HEADER=#{JSON.generate(header)}\n")
+        end
+    end
+
     def initialize(file = nil)
         file = "~/.cache/zoom/cache" if (file.nil?)
 
         @cache_file = Pathname.new(file).expand_path
         @results = nil
         @thread = nil
-        @zoom_args = nil
-        @zoom_pattern = nil
-        @zoom_profile_name = nil
-        @zoom_pwd = nil
+        @header = Hash.new
 
         FileUtils.mkdir_p(@cache_file.dirname)
         read
@@ -122,37 +102,24 @@ class Zoom::Cache
     end
     private :parse_tags
 
-    def pattern(p = nil)
-        if (p.nil?)
-            return nil if (empty?)
-            return @zoom_pattern
-        end
-
-        File.open(@cache_file, "a") do |f|
-            f.write("ZOOM_PATTERN=#{p}\n")
-        end
+    def paths
+        return nil if (@header.nil?)
+        return @header["paths"]
     end
 
-    def profile_name(name = nil)
-        if (name.nil?)
-            return nil if (empty?)
-            return @zoom_profile_name
-        end
-
-        File.open(@cache_file, "a") do |f|
-            f.write("ZOOM_PROFILE_NAME=#{name}\n")
-        end
+    def pattern
+        return nil if (@header.nil?)
+        return @header["pattern"]
     end
 
-    def pwd(p = nil)
-        if (p.nil?)
-            return nil if (empty?)
-            return @zoom_pwd
-        end
+    def profile_name
+        return nil if (@header.nil?)
+        return @header["profile_name"]
+    end
 
-        File.open(@cache_file, "a") do |f|
-            f.write("ZOOM_PWD=#{p}\n")
-        end
+    def pwd
+        return nil if (@header.nil?)
+        return @header["pwd"]
     end
 
     def read
@@ -166,22 +133,11 @@ class Zoom::Cache
             File.open(@cache_file) do |cache|
                 cache.each do |line|
                     line.chomp!
-                    if (line.start_with?("ZOOM_ARGS="))
-                        @zoom_args = line.gsub("ZOOM_ARGS=", "")
-                    elsif (line.start_with?("ZOOM_PATTERN="))
-                        @zoom_pattern = line.gsub("ZOOM_PATTERN=", "")
-                    elsif (line.start_with?("ZOOM_PROFILE_NAME="))
-                        @zoom_profile_name = line.gsub(
-                            "ZOOM_PROFILE_NAME=",
-                            ""
+                    if (line.start_with?("ZOOM_HEADER="))
+                        @header = JSON.parse(
+                            line.gsub("ZOOM_HEADER=", "")
                         )
-                    elsif (line.start_with?("ZOOM_PWD="))
-                        @zoom_pwd = line.gsub("ZOOM_PWD=", "")
-                    elsif (
-                        (line == "-") ||
-                        (line == "--") ||
-                        line.empty?
-                    )
+                    elsif (line.match(/^-?-?$/))
                         # Ignore dividers when searching with context
                         # and empty lines
                     else
@@ -199,8 +155,11 @@ class Zoom::Cache
         return if (empty?)
 
         config.validate_colors
-        profile = config.get_profile(profile_name)
+        if (!config.has_profile?(profile_name))
+            raise Zoom::Error::ProfileDoesNotExists.new(profile_name)
+        end
 
+        profile = config.get_profile(profile_name)
         if (!profile.taggable)
             get_results.each do |result|
                 puts result.contents

data/lib/zoom/cache/result.rb

@@ -6,7 +6,7 @@ class Zoom::Cache::Result
     attr_reader :tag
 
     def args
-        return @cache.zoom_args
+        return @cache.args
     end
 
     def grep_like?
@@ -35,15 +35,19 @@ class Zoom::Cache::Result
         end
     end
 
+    def paths
+        return @cache.paths
+    end
+
     def pattern
-        return @cache.zoom_pattern
+        return @cache.pattern
     end
 
     def profile_name
-        return @cache.zoom_profile_name
+        return @cache.profile_name
     end
 
     def pwd
-        return @cache.zoom_pwd
+        return @cache.pwd
     end
 end

data/lib/zoom/profile.rb

@@ -7,20 +7,20 @@ class Zoom::Profile < Hash
     attr_reader :taggable
 
     def after(a = nil)
-        self["after"] = a if (a)
-        return self["after"].strip
+        self["after"] = a.strip if (a)
+        return self["after"]
     end
 
     def before(b = nil)
-        self["before"] = b if (b)
-        return self["before"].strip
+        self["before"] = b.strip if (b)
+        return self["before"]
     end
 
     def class_name
         return self["class"]
     end
 
-    def exe(args, pattern)
+    def exe(args, pattern, paths)
         # Use hard-coded pattern if defined
         pattern = @pattern if (@pattern && !@pattern.empty?)
 
@@ -29,55 +29,88 @@ class Zoom::Profile < Hash
             return "" if (after.nil? || after.empty? || after == ".")
         end
 
+        # If paths are specified then remove "." for profiles like
+        # grep
+        after.gsub!(/^\.\s+/, "") if (!paths.empty?)
+
         # Emulate grep
         case operator.split("/")[-1]
         when "ack", "ack-grep"
-            str = [
+            cmd = [
                 before,
                 operator,
                 "-H --nobreak --nocolor --noheading -s",
-                flags
+                flags,
+                args,
+                pattern.shellescape,
+                paths,
+                after
             ].join(" ").strip
-            return %x(#{str} #{args} #{pattern.shellescape} #{after})
         when "ag"
-            str = [
+            cmd = [
                 before,
                 operator,
                 "--filename --nobreak --nocolor --noheading --silent",
-                flags
+                flags,
+                args,
+                pattern.shellescape,
+                paths,
+                after
             ].join(" ").strip
-            return %x(#{str} #{args} #{pattern.shellescape} #{after})
         when "find"
-            str = [before, operator, flags].join(" ").strip
-            return %x(#{str} #{args} \"#{pattern}\" #{after})
+            flags.gsub!(/^\.\s+/, "") if (!paths.empty?)
+            cmd = [
+                before,
+                operator,
+                paths,
+                flags,
+                args,
+                "\"#{pattern}\"",
+                after
+            ].join(" ").strip
         when "grep"
-            str = [
+            cmd = [
                 before,
                 operator,
-                "--color=never -EHnRs",
+                "--color=never -EHInRs",
                 "--exclude-dir=.bzr",
                 "--exclude-dir=.git",
+                "--exclude-dir=.git-crypt",
                 "--exclude-dir=.svn",
-                flags
+                flags,
+                args,
+                pattern.shellescape,
+                paths,
+                after
             ].join(" ").strip
-            return %x(#{str} #{args} #{pattern.shellescape} #{after})
         when "pt"
-            str = [
+            cmd = [
                 before,
                 operator,
                 "-e --nocolor --nogroup",
-                flags
+                flags,
+                args,
+                pattern.shellescape,
+                paths,
+                after
             ].join(" ").strip
-            return %x(#{str} #{args} #{pattern.shellescape} #{after})
         else
-            str = [before, operator, flags].join(" ").strip
-            return %x(#{str} #{args} #{pattern} #{after})
+            cmd = [
+                before,
+                operator,
+                flags,
+                args,
+                pattern,
+                paths,
+                after
+            ].join(" ").strip
         end
+        return %x(#{cmd})
     end
 
     def flags(f = nil)
-        self["flags"] = f if (f)
-        return self["flags"].strip
+        self["flags"] = f.strip if (f)
+        return self["flags"]
     end
 
     def self.from_json(json)
@@ -146,7 +179,7 @@ class Zoom::Profile < Hash
         self["class"] = self.class.to_s
         after(a)
         before(b)
-        flags(f.split(" ").uniq.join(" "))
+        flags(f)
         name(n)
         operator(o)
 
@@ -155,17 +188,18 @@ class Zoom::Profile < Hash
     end
 
     def name(n = nil)
-        self["name"] = n if (n)
-        return self["name"].strip
+        self["name"] = n.strip if (n)
+        return self["name"]
     end
 
     def operator(o = nil)
         if (o)
+            o.strip!
             op = ScoobyDoo.where_are_you(o)
             raise Zoom::Error::ExecutableNotFound.new(o) if (op.nil?)
             self["operator"] = o
         end
-        return self["operator"].strip
+        return self["operator"]
     end
 
     def self.profile_by_name(clas)

data/lib/zoom/profile/grep.rb

@@ -1,5 +1,5 @@
 class Zoom::Profile::Grep < Zoom::Profile
-    def initialize(n, o = "grep", f = "-Ii", b = "", a = ".")
+    def initialize(n, o = "grep", f = "-i", b = "", a = ".")
         super(n, o, f, b, a)
         @taggable = true
     end

data/lib/zoom/profile/passwords.rb

@@ -2,17 +2,15 @@ require "zoom/profile_manager"
 
 case Zoom::ProfileManager.default_profile
 when /^ack(-grep)?$/
-    class Zoom::Profile::Passwords < Zoom::Profile::Ack
-    end
+    class Zoom::Profile::Passwords < Zoom::Profile::Ack; end
 when "ag"
-    class Zoom::Profile::Passwords < Zoom::Profile::Ag
-    end
+    class Zoom::Profile::Passwords < Zoom::Profile::Ag; end
 when "pt"
-    class Zoom::Profile::Passwords < Zoom::Profile::Pt
-    end
+    class Zoom::Profile::Passwords < Zoom::Profile::Pt; end
+when "grep"
+    class Zoom::Profile::Passwords < Zoom::Profile::Grep; end
 else
-    class Zoom::Profile::Passwords < Zoom::Profile::Grep
-    end
+    # Shouldn't happen
 end
 
 class Zoom::Profile::Passwords
@@ -22,13 +20,15 @@ class Zoom::Profile::Passwords
 
         case op
         when /^ack(-grep)?$/
-            super(n, op, "--smart-case", "", after)
+            super(n, op, "--smart-case #{f}", "", after)
         when "ag"
-            super(n, op, "-Su", "", after)
+            super(n, op, "-Su #{f}", "", after)
         when "pt"
-            super(n, op, "-SU --hidden", "", after)
+            super(n, op, "-SU --hidden #{f}", "", after)
+        when "grep"
+            super(n, op, "-ai #{f}", "", after)
         else
-            super(n, op, "-ai", "", after)
+            # Shouldn't happen
         end
 
         @pattern = "(key|pass(word|wd)?)[^:=,>]? *[:=,>]"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Quickly open CLI search results in your favorite editor!