ruby-zoom 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 142f012f19627bbd7fd91f9177af11aa8bef1e4f7c4a06f269775ee64c9d9c85
-  data.tar.gz: a558e2fb27f3b7dd5a6054ba75eb869b979f9225db56b2ec955ecaafbed5f8d2
+  metadata.gz: d301bb2829817c9b24659d6d0cbc3fed7a52b4935fee6dad807535e5644d5d5a
+  data.tar.gz: 8d239791a5c6c86e374227f91637ddf266bc6b38f3f386d5af03a3de0fe05be4
 SHA512:
-  metadata.gz: d609b04d7b73b15909642f2542b4178e8339d6ff2570270973bfffc02cbf8456e1449b15a6d18fe19ecb46668c48e81f8ee5ae6ccff55121cbd945a3382c68b9
-  data.tar.gz: df9abdb6910f1543cce1a03e9756ded0e668a38872a9946a436718ab3dc8306a214dd13a438cb09c7b783d70b349ce194bf06543e2de5b54178794ceefb5ee13
+  metadata.gz: 1e44a8a5f10f3b319ae0f4c610819781fea1cdfaa6c7dfebaebab266bdeb189335a8640892715c743d82e4f1cb5fd8301c21a48ae3cb92682bc2c6080086ec1b
+  data.tar.gz: a939ba6fa4bb8593758ffde341d0591a8896ee24de27a5a71216ccd369c81d817ee93a7c80333513be3c96c5153e17eca38b11e0aac39668bf914570a666e45d

data/bin/z

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/bin/zc

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/bin/zf

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/bin/zg

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/bin/zl

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/bin/zr

@@ -320,7 +320,7 @@ options = parse(ARGV)
 
 begin
     if (options["action"] == "rc")
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
     end
 
     Zoom::ProfileManager.force_tool(options["tool"])

data/lib/zoom/editor.rb

@@ -49,13 +49,26 @@ class Zoom::Editor
             @editor= "vi" if (ScoobyDoo.where_are_you(@editor).nil?)
             @flags = ""
         end
+
+        # In case of vim server functionality
+        @vimserver = ""
+        @flags.match(/--servername\s+["']?([^"' ]+)/) do |m|
+            @vimserver = m[1]
+        end
+
+        # In case of vim remote functionality
+        if (!@vimserver.empty?)
+            @flags.match(/(--remote(-tab)?(-wait)?(-silent)?)/) do |m|
+                @flags.gsub!(/#{m[1]}/, "")
+            end
+        end
     end
 
     def open(results)
         return if (results.nil? || results.empty?)
 
         case @editor
-        when /vim?$/
+        when /vim$/
             vim(results)
         else
             default(results)
@@ -83,6 +96,8 @@ class Zoom::Editor
     private :open_result
 
     def vim(results)
+        already_started = vim_remote_started?
+
         quickfix = Pathname.new("~/.cache/zoom/quickfix").expand_path
         source = Pathname.new("~/.cache/zoom/source").expand_path
         FileUtils.mkdir_p(quickfix.dirname)
@@ -101,7 +116,7 @@ class Zoom::Editor
             "nnoremap zp :cp<cr>",
             ""
         ].join("\n")
-        zs.write(vimscript)
+        zs.write(vimscript) if (!already_started)
 
         files = Array.new
         results.each do |result|
@@ -124,6 +139,7 @@ class Zoom::Editor
 
             if (!files.include?(filename))
                 files.push(filename)
+                zs.write("edit! #{filename}\n")
                 zs.write("#{lineno}\nbnext\n") if (result.grep_like?)
             end
 
@@ -131,16 +147,42 @@ class Zoom::Editor
                 zq.write("#{filename}:#{lineno}: #{match}\n")
             end
         end
-        zs.write("silent cfile #{quickfix}\n")
+
+        if (!already_started)
+            zs.write("silent cfile #{quickfix}\n")
+        else
+            results.each do |result|
+                zs.write("bprev\n") if (result.grep_like?)
+            end
+            zs.write("silent caddf #{quickfix}\n")
+        end
 
         zq.close
         zs.close
 
-        system(
-            "#{@editor} #{@flags} -S #{source} '#{files.join("' '")}'"
-        )
+        if (!already_started)
+            system("#{@editor} -c \"source #{source}\" #{@flags}")
+            FileUtils.rm_f(quickfix)
+            FileUtils.rm_f(source)
+        else
+            system(
+                [
+                    @editor,
+                    @flags,
+                    "--remote-send \":source #{source}\n\""
+                ].join(" ")
+            )
+        end
+    end
 
-        FileUtils.rm_f(quickfix)
-        FileUtils.rm_f(source)
+    def vim_remote_started?
+        return false if (@vimserver.empty?)
+        %x(#{@editor} --serverlist).downcase.match(
+            /^#{@vimserver}$/
+        ) do
+            return true
+        end
+        return false
     end
+    private :vim_remote_started?
 end

data/lib/zoom/wish/reset_wish.rb

@@ -15,7 +15,7 @@ class ResetWish < Djinni::Wish
             return
         end
 
-        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+        FileUtils.rm_f(Pathname.new("~/.config/zoom/rc").expand_path)
         config = djinni_env["config"]
         config.default
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest