ruby-zoom 4.6.7 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3332a6169e32c19e41053bae8c029e6166c0953d
-  data.tar.gz: dc92280462aee28f417b54aca921dcbcaacab40a
+  metadata.gz: efbedbe98f1dae228a6ea4aa0cbf388515bf9a98
+  data.tar.gz: a79e0cf5f183e9f69202b0c4f246d3e6d7478e15
 SHA512:
-  metadata.gz: c5e8348b6c907b93567b9ee7b7c230428abf20576400734b6fa4c9fb80011ca7fd912ec2301b6175350be658c44b73aa5025363ff9e4fa10bd090b6baba953e2
-  data.tar.gz: 35f1115514f57da40d91fa8240ec224cf32bfc05c0e5e79d0f1dca205d83de92108215ef1df54631e3917c03e0e22e566ccff9f5996e93e71200d89a58f43c75
+  metadata.gz: 8d47b792e8475366dd2e652c55c550ddc8cfb2508a16145affd20f0041ccfbde357af51e85b98a62e1ee2cde52419ccd01ca77fc937627f860c83b1100a5ebcb
+  data.tar.gz: e8061d000c8be150d0b9a0ce4bd6d86df275610a96deee7a1bec04492d77a669c04c6923bb9d10fcdd74bb7fbd17cbc7dfd8c24e0bb9cde306341476e5f9cfa8

data/lib/zoom/cache.rb

@@ -189,6 +189,14 @@ class Zoom::Cache
                     )
                 ].join(" ")
             else
+                if (result.filename)
+                    if (result.filename != curr_filename)
+                        puts if (curr_filename)
+                        puts config.hilight_filename(result.filename)
+                        curr_filename = result.filename
+                    end
+                end
+
                 tag = result.tag
                 line = result.contents
                 puts [config.hilight_tag("[#{tag}]"), line].join(" ")

data/lib/zoom/cache/result.rb

@@ -11,23 +11,32 @@ class Zoom::Cache::Result
 
     def initialize(tag, contents, cache)
         @cache = cache
-        @contents = contents
+        @contents = contents.unpack("C*").pack("U*").gsub(
+            /([\u0080-\u00ff]+)/,
+            "\\1".dump[1..-2]
+        )
         @filename = nil
         @grep_like = false
         @lineno = nil
         @match = nil
         @tag = tag
 
-        @contents.unpack("C*").pack("U*").gsub(
-            /([\u0080-\u00ff]+)/,
-            "\\1".dump[1..-2]
-        ).match(/^([^:]+):(\d+)[:-](.*)/) do |m|
-            next if (m.nil?)
+        case @contents
+        when /^Binary file (.+) matches\.$/
+            @contents.match(/^Binary file (.+) matches\.$/) do |m|
+                next if (m.nil?)
+                @filename = "Binary file"
+                @contents = m[1]
+            end
+        when /^([^:]+):(\d+)[:-](.*)$/
+            @contents.match(/^([^:]+):(\d+)[:-](.*)$/) do |m|
+                next if (m.nil?)
 
-            @grep_like = true
-            @filename = m[1]
-            @lineno = m[2]
-            @match = m[3]
+                @grep_like = true
+                @filename = m[1]
+                @lineno = m[2]
+                @match = m[3]
+            end
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 4.6.7
+  version: 4.7.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest