neovim 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4fecc46a144d9fa3d537f9b0f9ed7da0a89e0c3
-  data.tar.gz: e8d246f7011bc118ba28706306065b823d18fb12
+  metadata.gz: 9fc40ef389b3a8f14b2f8c732553d9e4c02f0ce2
+  data.tar.gz: f99653d06b7373c3c05021d3f1d9db6e26a60185
 SHA512:
-  metadata.gz: a1367f6f99b864818ddc7b98f6ffd04b8e3795cc3f797deed986ba8c86f3bc880c5be66d5b1bd7b17a6c7877a7b554ef944bbee473af3d30345055ce41925a06
-  data.tar.gz: 6b67c6c0163aea888f5131e4cad4bc5c7bc3c7765462569a5fc37251b4d5d6482a77b01b9a06878b22a9c7c0523fe17bc0b04ca18daf64f7f6ca7dd8702381fd
+  metadata.gz: b2f8af36212e0abd4ad2663b4a288452072fd761e017d5e33c19b17dcac93befa562ac4439c69e7d5764fa59013fb5aab321db8836e4f9db4834b0150d1c3c96
+  data.tar.gz: 6ac9d1e4d97870f26dbd28cad4dde0c556d9cb301cec0c3a78775b36db585026d8249e852b71482c5fb65f81ecc2e6702580f776a6a8f8d24ca12f62bc8e8dde

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.3.3
+- Hotfix older nvim clients' inability to hook into DirChanged
+
 # 0.3.2
 - Fix directory tracking in legacy Ruby provider
 

data/lib/neovim/ruby_provider.rb

@@ -29,7 +29,7 @@ module Neovim
     def self.__define_ruby_execute(plug)
       plug.__send__(:rpc, :ruby_execute) do |nvim, ruby|
         __wrap_client(nvim) do
-          eval(ruby, TOPLEVEL_BINDING, __FILE__, __LINE__)
+          eval(ruby, TOPLEVEL_BINDING, "eval")
         end
       end
     end
@@ -63,7 +63,7 @@ module Neovim
           __update_lines_in_chunks(__buffer, __start, __stop, 5000) do |__lines|
             __lines.map do |__line|
               $_ = __line
-              eval(__ruby, binding, __FILE__, __LINE__)
+              eval(__ruby, binding, "eval")
               $_
             end
           end
@@ -74,8 +74,13 @@ module Neovim
 
     def self.__define_ruby_chdir(plug)
       plug.__send__(:setup) do |client|
-        cid = client.channel_id
-        client.command("au DirChanged * call rpcrequest(#{cid}, 'ruby_chdir', v:event)")
+        begin
+          cid = client.channel_id
+          client.command("au DirChanged * call rpcrequest(#{cid}, 'ruby_chdir', v:event)")
+        rescue ArgumentError
+          # Swallow this exception for now. This means the nvim installation is
+          # from before DirChanged was implemented.
+        end
       end
 
       plug.__send__(:rpc, :ruby_chdir) do |nvim, event|
@@ -88,10 +93,8 @@ module Neovim
       __with_globals(client) do
         __with_vim_constant(client) do
           __with_redirect_streams(client) do
-            begin
+            __with_exception_handling(client) do
               yield
-            rescue SyntaxError => e
-              client.err_write(e.message)
             end
           end
         end
@@ -126,7 +129,7 @@ module Neovim
         end
 
         $stderr.define_singleton_method(:write) do |string|
-          client.err_write(string)
+          client.report_error(string)
         end
 
         true
@@ -136,6 +139,15 @@ module Neovim
     end
     private_class_method :__with_redirect_streams
 
+    def self.__with_exception_handling(client)
+      begin
+        yield
+      rescue SyntaxError, StandardError => e
+        msg = [e.class, e.message].join(": ")
+        client.report_error(msg.lines.first.strip)
+      end
+    end
+
     def self.__update_lines_in_chunks(buffer, start, stop, size)
       (start..stop).each_slice(size) do |linenos|
         _start, _stop = linenos[0]-1, linenos[-1]

data/lib/neovim/version.rb

@@ -1,3 +1,3 @@
 module Neovim
-  VERSION = Gem::Version.new("0.3.2")
+  VERSION = Gem::Version.new("0.3.3")
 end

data/spec/acceptance/ruby_provider_spec.rb

@@ -72,13 +72,23 @@ RSpec.describe "ruby_provider" do
       }.from(Dir.pwd)
     end
 
-    it "handles malformed ruby" do
+    it "handles standard errors" do
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_execute', 'raise')")
+      }.to raise_error(ArgumentError)
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_execute', '12')")
+      }.not_to raise_error
+    end
+
+    it "handles syntax errors" do
       expect {
         nvim.eval("rpcrequest(host, 'ruby_execute', 'puts[')")
       }.to raise_error(ArgumentError)
 
       expect {
-        nvim.eval("rpcrequest(host, 'ruby_execute', 'puts \"12\"')")
+        nvim.eval("rpcrequest(host, 'ruby_execute', '12')")
       }.not_to raise_error
     end
   end
@@ -171,7 +181,21 @@ RSpec.describe "ruby_provider" do
       }.from(Dir.pwd)
     end
 
-    it "handles malformed ruby" do
+    it "handles standard errors" do
+      File.write(script_path, "raise")
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
+      }.to raise_error(ArgumentError)
+
+      File.write(script_path, "12")
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
+      }.not_to raise_error
+    end
+
+    it "handles syntax errors" do
       File.write(script_path, "puts[")
 
       expect {
@@ -205,7 +229,19 @@ RSpec.describe "ruby_provider" do
       }.to change { nvim.current.buffer.lines.to_a }.to(ys)
     end
 
-    it "handles malformed ruby" do
+    it "handles standard errors" do
+      nvim.current.buffer.lines = ["a", "b"]
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_do_range', 1, 1, 'raise')")
+      }.to raise_error(ArgumentError)
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_do_range', 1, 1, '12')")
+      }.not_to raise_error
+    end
+
+    it "handles syntax errors" do
       nvim.current.buffer.lines = ["a", "b"]
 
       expect {
@@ -213,7 +249,7 @@ RSpec.describe "ruby_provider" do
       }.to raise_error(ArgumentError)
 
       expect {
-        nvim.eval("rpcrequest(host, 'ruby_do_range', 1, 1, 'puts')")
+        nvim.eval("rpcrequest(host, 'ruby_do_range', 1, 1, '12')")
       }.not_to raise_error
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack