nvim 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0d28da100b26fcaca45acb51d863eb7683978b06dab4345f265d8c75d5b28a
-  data.tar.gz: c086178c5dcfd31520dfc13142a2827ae5b36edd5340f3037baf1246c6e3af03
+  metadata.gz: 769e2a668a793cc62f7683c1e6a40bb0ab703a65c1538a82afe6ef08326d023b
+  data.tar.gz: aa69006de05ddf6eba0635b6ce35478b8ef074fa3fcd73be300b2d78089436a4
 SHA512:
-  metadata.gz: a1d1de3dd0b50f63ba7f62335e6d6e0d1f061c9771e59848ca1d231049f4e668212a3f2fdc4b7b26ec4be0d78041b3142b0d8d4ba14bbd4ab06d8325f7c841f7
-  data.tar.gz: 17d86d71201706daeb1fca9691bdfea2ac4b064bdeafc2deeef0f394559acc405072f04699cb01363984d14d5238f794d14218be2c6be15240df0502d10ddacc
+  metadata.gz: b3ddad1a7f7719f17e17c1767d3bdf394b5703c24fc700840c2b0e39c332c9290225fc94d5b4abc5d391d979e64a796b11b82bca1c44ef77c0ab4ad7cfbae401
+  data.tar.gz: 934aff104babc3f80f3265d6f26881cb02b85ad3d8b8cbe53fe3a716e12dc3d5d7c157e1d68a819fc7011fb05f5999562fb08b0bee6bf5cc22c7dbd4268093df

data/INFO.yaml

@@ -3,7 +3,7 @@
 #
 
 nvim:
-  version: 1.7.0
+  version: 1.9.0
   license: BSD-2-Clause+
   authors:
     - Bertram Scharpf

data/README.md

@@ -69,14 +69,8 @@ echo Sum(13,7)
 The `:ruby...` commands and the `rubyeval()` function behave as descibed
 in `:h ruby`.
 
-Files mentioned in the global variable `g:ruby_require` will be loaded before
-the first Ruby code will be run.
-
-Additionally you can directly execute the buffers contents:
-
-```vim
-set number
-```
+Additionally you can directly execute the buffers contents (here, I did
+`:set number`):
 
 ```
  1 class C
@@ -203,10 +197,57 @@ the RPC communication.
 :%ruby |
 ```
 
-Yet, you should avoid to use `fork` and `exec`, except when
+Yet, I suggest not to use `fork` and `exec`, except when
 you're absolutely sure what you're doing.
 
 
+#### Exception handling
+
+If you prefer, you may return an error as a value, too.
+
+```
+ 1 $rescue = true
+ 2 z = 0
+ 3 q = 1 / z
+~
+~
+:set ft=ruby|1,3ruby |
+```
+
+Then:
+
+```
+ 1 $rescue = true
+ 2 z = 0
+ 3 q = 1 / z
+ 4 #=> #<ZeroDivisionError: divided by 0>
+ 5 puts "=begin", _.backtrace, "=end"
+~
+~
+:5ruby |
+```
+
+Even non-standard errors wil be caught.
+
+```
+ 1 def f ; f ; end
+ 2 f
+~
+~
+:1,2ruby |
+```
+
+```
+ 1 $$
+ 2 #=> 49042
+ 3 sleep 1000
+~
+~
+:3ruby |
+```
+Then say 'kill 49042' somewhere else.
+
+
 #### Global variables
 
 The global variable `$vim` will be set to the client.

data/examples/passwords

@@ -49,9 +49,9 @@ class Passwords
         client.echo [ [ key]], true, {}
         xsel key
       rescue
-        client.err_writeln "No OTP under cursor?"
+        client.message_err "No OTP under cursor?"
       rescue ScriptError
-        client.err_writeln $!.message
+        client.message_err $!.message
       end
     end
   end

data/lib/neovim/client.rb

@@ -12,6 +12,9 @@ module Neovim
   class Client
 
     @strict = true
+    ENV[ "NVIM_RUBY_STRICT"]&.tap { |s|
+      @strict = s =~ /[1-9]|true|yes|on|enable/i
+    }
     class <<self
       attr_accessor :strict
     end
@@ -99,8 +102,11 @@ module Neovim
 
 
     def message str
-      call_api :out_write, str
-      str.end_with? $/ or call_api :out_write, $/
+      call_api :echo, [ [ str]], true, {}
+    end
+
+    def message_err msg
+      call_api :echo, [ [ msg]], true, err: true
     end
 
 

data/lib/neovim/connection.rb

@@ -47,6 +47,12 @@ module Neovim
       api_info[ "error_types"].each { |type,info|
         register_error type, info[ "id"]
       }
+      if api_info["version"]["api_level"] < 13 then
+        log :warn, "Using nvim_err_writeln() which is deprecated in since Neovim 0.11.0"
+        @client.define_singleton_method :message_err do |msg|
+          call_api :err_writeln, msg
+        end
+      end
       nil
     end
 
@@ -133,6 +139,7 @@ module Neovim
 
       def stdpath what
         cmd = [ path, "--headless", ]
+        cmd.push "-u", "NONE"
         cmd.push "-c", "echo stdpath(#{what.to_s.inspect})"
         cmd.push "-c", "q"
         (pipe_stderr cmd)&.tap { |x| x.chomp! }

data/lib/neovim/foreign/supplement.rb

@@ -1,5 +1,5 @@
 #
-#  neovim/foreign/supplement.rb  --  Addition usefull Ruby functions
+#  neovim/foreign/supplement.rb  --  Additional useful Ruby functions
 #
 
 # The purpose of this is simply to reduce dependencies.
@@ -10,6 +10,9 @@ rescue LoadError
   class NilClass ; def notempty? ;                      end ; end
   class String   ; def notempty? ; self unless empty? ; end ; end
   class Array    ; def notempty? ; self unless empty? ; end ; end
+  class Array    ; def first= val ; self[ 0] = val ; end ; end
+  class Array    ; def last=  val ; self[-1] = val ;
+                    rescue IndexError ; a.push val ; end ; end
   class NilClass   ; def to_bool ; false ; end ; end
   class FalseClass ; def to_bool ; false ; end ; end
   class Object     ; def to_bool ; true  ; end ; end
@@ -43,5 +46,6 @@ rescue LoadError
     alias starts_with starts_with?
     alias ends_with   ends_with?
   end
+  class Dir ; def entries! ; entries - %w(. ..) ; end ; end
 end
 

data/lib/neovim/info.rb

@@ -1,10 +1,10 @@
 require "neovim/meta.rb"
 Neovim::INFO = Neovim::Meta.new "nvim",
-  version: "1.7.0",
+  version: "1.9.0",
   license: "BSD-2-Clause+",
   authors: ["Bertram Scharpf"],
   email: "software@bertram-scharpf.de",
   summary: "Yet another Ruby client for Neovim",
   description: "A simple Ruby client for Neovim.\nClean code, minimal dependecies, no frills, no wokeness.",
   homepage: "https://github.com/BertramScharpf/ruby-nvim",
-  commit: "4e96338"
+  commit: "a24b682"

data/lib/neovim/output.rb

@@ -69,7 +69,7 @@ module Neovim
           else
             a = a.to_s
             write a
-            write $/ unless a.end_with? $/
+            a.end_with? $/ or write $/
           end
         }
       end
@@ -90,27 +90,36 @@ module Neovim
         end
       end
     end
-  end
-
-  class WriteOut < WriteStd
+    def initialize *args
+      super
+      @str = ""
+    end
     def write *args
-      args.each { |a|
-        a = a.to_s
-        a.notempty? or next
-        @client.out_write a
-        @line_open = !(a.end_with? $/)
-      }
+      args.each { |a| @str << a.to_s }
+      loop do
+        l, r = @str.split $/, 2
+        r or break
+        write_line l
+        @str = r
+      end
       nil
     end
     def finish
-      if @line_open then
-        @client.out_write $/
-        @line_open = nil
+      if @str.notempty? then
+        write_line @str
+        @str = nil
       end
     end
   end
 
-  class WriteErr < Write
+  class WriteOut < WriteStd
+    private
+    def write_line l
+      @client.message l
+    end
+  end
+
+  class WriteErr < WriteStd
     class <<self
       def redirect *args, **kwargs
         open *args, **kwargs do |i|
@@ -121,52 +130,30 @@ module Neovim
         end
       end
     end
-    def write *args
-      args.each { |a|
-        @rest ||= ""
-        @rest << a.to_s
-        while @rest =~ /#$// do
-          @client.err_writeln $`
-          @rest = $'
-        end
-      }
-      nil
-    end
-    def finish
-      if @rest.notempty? then
-        @client.err_writeln @rest
-        @rest = nil
-      end
+    private
+    def write_line l
+      @client.message_err l
     end
   end
 
   class WriteBuf < WriteStd
     def initialize *args, whole: nil, top: nil
       super
-      @lines, @last = [], ""
+      @lines = []
       @whole, @top = whole, top
     end
-    def write *args
-      args.each { |a| @last << a.to_s }
-      loop do
-        n, r = @last.split $/, 2
-        r or break
-        @lines.push n
-        @last = r
-      end
-      nil
-    end
     def finish
-      if @last.notempty? then
-        @lines.push @last
-        @last = nil
-      end
+      super
       if @whole then
         @client.buf_set_lines 0, 0, -1, true, @lines
       else
         @client.put @lines, "l", true, !@top
       end
     end
+    private
+    def write_line l
+      @lines.push l
+    end
   end
 
 end

data/lib/neovim/ruby_provider.rb

@@ -81,9 +81,14 @@ module Neovim
             yield client, *args
           end
         end
-      rescue ScriptError, StandardError
-        line = $@.first[ /:(\d+):/, 1]
-        client.err_writeln "Ruby #$! (#{$!.class}), line #{line}"
+      rescue Exception
+        msg = $!.to_s
+        if msg =~ /\A.*?:(\d+):\s*/ then
+          line, msg = $1, $'
+        else
+          line = $@.first[ /:(\d+):in\b/, 1]
+        end
+        client.message_err "Ruby #{$!.class}:#{line}: #{msg}"
       end
     end
 
@@ -116,23 +121,6 @@ module Neovim
   plugin_provider do |dsl|
 
     dsl.setup do |client|
-      r = client.get_var "ruby_require" rescue nil
-      case r
-      when String then r = r.split
-      when Array  then
-      when Hash   then r = r.keys
-      when nil    then nil
-      else             r = [r.to_s]
-      end
-      if r.notempty? then
-        WriteOut.redirect client do  # Protect the RPC interface against erroneous output.
-          r.each do |l|
-            require l
-          rescue LoadError
-            client.out_write "Warning: #$!"
-          end
-        end
-      end
       $curbuf = client.get_current_buf
       $curwin = client.get_current_win
     end
@@ -164,7 +152,13 @@ module Neovim
         set_globals client, fst..lst do |lines|
           client.command "#{lst}"
           WriteBuf.redirect client do
-            r = script_binding.eval lines.to_s, "ruby_run"
+            r = begin
+              script_binding.eval lines.to_s, "ruby_run"
+            rescue Exception
+              $@.pop until $@.empty? or $@.last.ends_with? ":in `empty_binding'"
+              raise unless $rescue
+              $!
+            end
             unless no_out or r.nil? then
               script_binding.local_variable_set :_, r
               puts "#=> #{r.inspect}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nvim
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies: []
 email: software@bertram-scharpf.de
 executables:
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Yet another Ruby client for Neovim
 test_files: []