ruby-zoom 4.5.5 → 4.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 141e398dfd381970365f9a7ac9d006d12fbb5e78
-  data.tar.gz: 6cfe24ba6b90cb368bd24eed6a58805be9ee5c1f
+  metadata.gz: 13309634343d322e2a7a1f337ca36ccdd9364a71
+  data.tar.gz: 7a92ddabed36807f0431c5b5038afd26c5448a3e
 SHA512:
-  metadata.gz: '099bd9cdefabd22a413ec96781aafd202b21e498a7c9cc8cac0024398a02590ce55cf0b2ea6425ed3e9a80ee5aa4cc53e4e8b16b46bd067f884cf8f56961d83e'
-  data.tar.gz: ad060d42f0f9d2e64010460cd17ce9b9cb938958e9227a6b8b21822d0f3cc9525daf6a4f0e362847853f42297dba9800c881a620e85ddfcf6b02478b19280b05
+  metadata.gz: 1ab81d532780f4d669ce66432d524244258f0a5700d2ed0c00a4e6ae4dae568683bfd8b92cb26c0b1fa8fa04813c3160850033ddc270fd9121c02ad319eaccbe
+  data.tar.gz: c172029ce54ab7be4faae52d4c37672060be79203a11fd17c1dde06ba99ad6fe9fdc01261d3bc61dc28bb46c536d26dd44b108aab2a805b4c2ab2c25b15c870e

data/lib/zoom.rb

@@ -30,14 +30,15 @@ class Zoom
 
     def repeat(shortcut = true)
         return if (@cache.empty?)
-        run(@cache.header, shortcut)
+        run(@cache.header, shortcut, true)
     end
 
-    def run(header, shortcut = true)
+    def run(header, shortcut = true, repeat = false)
         # Ensure header has no nil
-        ["args", "paths", "pattern", "profile_name"].each do |key|
+        ["args", "pattern", "profile_name"].each do |key|
             header[key] ||= ""
         end
+        header["paths"] ||= "."
         header["pwd"] = Dir.pwd
         header["translate"] ||= Array.new
 
@@ -52,21 +53,17 @@ class Zoom
         end
 
         profile = @config.get_profile(profile_name)
-        if (!profile.pattern.empty?)
-            header["pattern"] = profile.pattern
-        end
-
         begin
+            # This will translate and/or append args such that the
+            # output will be something Zoom can process
+            header = profile.preprocess(header) if (!repeat)
+
             # Clear cache
             @cache.clear
 
             # 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(header))
 

data/lib/zoom/cache.rb

@@ -62,6 +62,10 @@ class Zoom::Cache
         return nil if (header.nil? && empty?)
         return @header if (header.nil?)
 
+        # This causes the cache to be "empty" so don't do it! Leaving
+        # this here so I don't forget.
+        # @header = header
+
         File.open(@cache_file, "a") do |f|
             f.write("ZOOM_HEADER=#{JSON.generate(header)}\n")
         end

data/lib/zoom/profile.rb

@@ -53,7 +53,7 @@ class Zoom::Profile < Hash
                 @format_flags,
                 flags,
                 header["args"],
-                header["pattern"],
+                header["pattern"].shellescape,
                 header["paths"],
                 after
             ].join(" ").strip
@@ -165,18 +165,29 @@ class Zoom::Profile < Hash
 
     def preprocess(header)
         # Use hard-coded pattern if defined
-        pattern = header["pattern"]
-        if (@pattern && !@pattern.empty? && (pattern != @pattern))
-            header["args"] += " #{pattern}"
+        if (
+            @pattern &&
+            !@pattern.empty? &&
+            (header["pattern"] != @pattern)
+        )
+            header["args"] += " #{header["pattern"]}"
             header["pattern"] = @pattern
         end
 
         case operator.split("/")[-1]
         when /^ack(-grep)?$/, "ag", "grep", "pt"
-            header["pattern"] = header["pattern"].shellescape
+            paths = header["paths"].split(" ")
+            if (header["pattern"].empty? && !paths.empty?)
+                header["pattern"] = paths.delete_at(0)
+                header["paths"] = paths.join(" ").strip
+                header["paths"] = "." if (header["paths"].empty?)
+            end
+
+            # This isn't done here anymore as it'll break hilighting
+            # header["pattern"] = header["pattern"].shellescape
         when "find"
             # If additional args are passed, then assume pattern is
-            # actually and arg
+            # actually an arg
             if (header["args"] && !header["args"].empty?)
                 header["args"] += " #{header["pattern"]}"
                 header["pattern"] = ""

data/lib/zoom/profile/unsafe_java.rb

@@ -19,6 +19,7 @@ class Zoom::SecurityProfile::UnsafeJava < Zoom::SecurityProfile
             "|",
             "(",
             [
+                "\\.exec",
                 "\\.getRuntime",
                 "readObject",
                 "Runtime"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 4.5.5
+  version: 4.5.6
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest