nvim 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91e5ad07b2fd0ea6dd1da251df0e55dad1312b3ac4fa585cae59658dbccf666
-  data.tar.gz: bde8ff51d7a22f70aca3c58f83051b32357f0d56603bdbd7ce209ce6acf94de9
+  metadata.gz: e1aa2670517c218f7981b8165338f7e985e2e33dcc704a3313326b3ba7de3fd8
+  data.tar.gz: 5bb1a4e2b677fb4f0727c46d1d4cbbe10a40ee6e77677faba5280cf1826b252c
 SHA512:
-  metadata.gz: c5d55983ed98e326fe1a5a6c15e764ac0a3aff858dadf3538c6edcee5339d7fb117b33984d80334d2fb18d7f8fbd505d89ca854aec09bbbf6513c07b5f9c48ee
-  data.tar.gz: c7dc22c69ddcb550b1d1a412963788b33f77337f5520ea87bc4bf2edabed162bcd59402e605eac6a46109c1953994024f88211c2d21af12efb9722e3eab36422
+  metadata.gz: e3df9c57b705347c248c743185efeaf86a59291d16309709d4223dd20295632c1ebb413a92cacf501852877796350d37882930f2a77b04596a6efc72b993a26b
+  data.tar.gz: d781ec641a20ad904f82bad5162007bca0674f28ac3009dc928460de5d6943f03fcd9ea9b79e7e1a8a0016ad9c8465014c87170a495d0f60ac8c69560afd3292

data/INFO.yaml

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

data/README.md

@@ -69,14 +69,11 @@ 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.
+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 +200,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.
@@ -224,7 +268,7 @@ Further, the variables `$range` and `$lines` will be set.
  2 bar
  3 baz
 ~
-:%ruby puts $range.inspect, $lines.inspect
+:%ruby puts $range, $lines
 ```
 
 The legacy variables `$curbuf` and `$curwin` are supported.
@@ -417,15 +461,20 @@ rubyfile <neovim/tools/copy>
 '<,'>ruby tmuxbuf $lines
 ```
 
-Make a hex dump.
+Maybe you like to install the
+[Nxxd](https://github.com/BertramScharpf/ruby-nxxd) gem.
+
+```vim
+rubyfile <nxxd>
+ruby r = (0...0x80).to_a.map { |c| c.chr }.join
+ruby puts Nxxd::Dump.new.run r
+```
+
+Or even:
 
 ```vim
-ruby <<EOT
-  require "neovim/foreign/nxxd"
-  bn = $curbuf.get_name
-  $vim.command :enew!
-  File.open bn do |b| Nxxd::Dump.new.run b do |l| $vim.put [l], "l", false, true end end
-EOT
+rubyfile <nxxd>
+HexDump /etc/localtime
 ```
 
 
@@ -433,4 +482,5 @@ EOT
 
   * (C) 2024,2025 Bertram Scharpf <software@bertram-scharpf.de>
   * License: [BSD-2-Clause+](./LICENSE)
+  * Repository: [ruby-nvim](https://github.com/BertramScharpf/ruby-nvim)
 

data/Rakefile

@@ -51,7 +51,7 @@ end
 
 
 task :diffdeps do
-  %w(mplight nxxd).each { |gem|
+  %w(mplight).each { |gem|
     c = `gem contents #{gem}`
     unless $?.success? then
       puts "Gem #{gem} not installed. Cannot compare."

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
@@ -114,5 +117,64 @@ module Neovim
 
   end
 
+  class Lines
+
+    include Enumerable
+
+    def initialize client, range
+      case client
+      when Buffer then @client, @buffer = client.client, client.index
+      else             @client, @buffer = client,        0
+      end
+      @i, @last = range.begin, range.end
+    end
+
+    def to_s
+      (@client.buf_get_lines @buffer, @i-1, @last, true).join $/
+    end
+
+    def method_missing sym, *args, **kwargs, &block
+      to_a.send sym, *args, **kwargs, &block
+    end
+
+    def each
+      while @i <= @last do
+        @inc = 1
+        l, = @client.buf_get_lines @buffer, @i-1, @i, true
+        yield l
+        @i += @inc
+      end
+    ensure
+      @i = nil
+    end
+    alias each_line each
+
+    def each_with_no
+      each do |l|
+        yield l, @i
+      end
+    end
+
+    def map!
+      each do |l|
+        h = l.hash
+        m = yield l, @i
+        r =
+          case m
+          when String     then m.lines unless m.hash == h
+          when Enumerable then m.map { |l| l.to_s }
+          when nil, false then []
+          end
+        if r then
+          r.each { |l| l.chomp! }
+          @client.buf_set_lines @buffer, @i-1, @i, true, r
+          @inc = r.length
+          @last += @inc-1
+        end
+      end
+    end
+
+  end
+
 end
 

data/lib/neovim/connection.rb

@@ -47,6 +47,11 @@ module Neovim
       api_info[ "error_types"].each { |type,info|
         register_error type, info[ "id"]
       }
+      if api_info["version"]["api_level"] >= 13 then
+        @client.define_singleton_method :err_writeln do |msg|
+          call_api :echo, [ [ msg], [ $/]], true, err: true
+        end
+      end
       nil
     end
 

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.6.1",
+  version: "1.8.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: "f393e6b"

data/lib/neovim/remote.rb

@@ -191,7 +191,7 @@ module Neovim
           if @responses.key? message.request_id then
             @responses[ message.request_id] = message
           else
-            log :warning, "Dropped response", message.request_id
+            log :warning, "Dropped response", rid: message.request_id
           end
         when Message::Request, Message::Notification then
           h = find_handler message.method_name

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.err_writeln "Ruby #{$!.class}:#{line}: #{msg}"
       end
     end
 
@@ -100,18 +105,13 @@ module Neovim
 
     def set_globals client, range
       set_global_client client do
-        lines = get_lines client, range
-        $range, $lines = range, lines
-        yield lines
+        $range, $lines = range, (Lines.new client, range)
+        yield $lines
       end
     ensure
       $range, $lines = nil, nil
     end
 
-    def get_lines client, range
-      client.buf_get_lines 0, range.begin-1, range.end, true
-    end
-
     def plugin_provider &block
       run_dsl DslProvider, &block
     end
@@ -123,11 +123,13 @@ module Neovim
     dsl.setup do |client|
       r = client.get_var "ruby_require" rescue nil
       case r
-      when Array then r = r.notempty?
-      when nil   then nil
-      else            r = [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 then
+      if r.notempty? then
         WriteOut.redirect client do  # Protect the RPC interface against erroneous output.
           r.each do |l|
             require l
@@ -164,11 +166,16 @@ module Neovim
       code.rstrip!
       if code =~ /\A\|?(-)?\z/ then  # | is a workaround because Neovim doesn't allow empty code (the ultimate Quine).
         no_out = $1
-        set_global_client client do
+        set_globals client, fst..lst do |lines|
           client.command "#{lst}"
-          code = (get_lines client, fst..lst).join $/
           WriteBuf.redirect client do
-            r = script_binding.eval code, "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}"
@@ -219,20 +226,10 @@ module Neovim
     # This is called by the +:rubydo+ command.
     dsl.rpc :ruby_do_range do |client,fst,lst,code|
       set_globals client, fst..lst do |lines|
-        i = fst
-        lines.each do |l|
-          h = l.hash
+        lines.map! do |l,i|
           (script_binding.eval 'proc do |l,i| $_, $. = l, i end').call l, i
           script_binding.eval code, "ruby_do_range"
-          m = script_binding.eval '$_'
-          if m.hash != h then
-            m = m.lines
-            m.each { |x| x.chomp! }
-            client.buf_set_lines 0, i-1, i, true, m
-            i += m.length
-          else
-            i += 1
-          end
+          script_binding.eval '$_'
         end
       end
       nil

data/lib/neovim/tools/copy.rb

@@ -63,9 +63,9 @@ module Kernel
 
   def cmd_write cmd, data
     case data
-    when Array  then data = data.join $/
-    when String then nil
-    else             data = data.to_s
+    when Enumerable then data = data.join $/
+    when String     then nil
+    else                 data = data.to_s
     end
     IO.popen cmd, "w" do |t| t.write data end
   end

data/nvim.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   if false then
     spec.add_dependency "supplement", "~> 2.18"
     spec.add_dependency "mplight",    "~> 1.0"
-    spec.add_dependency "nxxd",       "~> 1.0"
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nvim
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies: []
 email: software@bertram-scharpf.de
 executables:
@@ -46,7 +46,6 @@ files:
 - lib/neovim/connection.rb
 - lib/neovim/foreign/mplight.rb
 - lib/neovim/foreign/mplight/bufferio.rb
-- lib/neovim/foreign/nxxd.rb
 - lib/neovim/foreign/supplement.rb
 - lib/neovim/foreign/supplement/socket.rb
 - lib/neovim/handler.rb
@@ -80,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Yet another Ruby client for Neovim
 test_files: []

data/lib/neovim/foreign/nxxd.rb

@@ -1,216 +0,0 @@
-#
-#  neovim/foreign/nxxd.rb  --  Hex Dump Tool
-#
-
-# The purpose of this is simply to reduce dependencies.
-
-begin
-  require "nxxd"
-rescue LoadError
-
-# ----------------------------------------------------------------
-#
-#  nxxd.rb  --  Hex Dump Tool
-#
-
-
-module Nxxd
-
-  module ReadChunks
-
-    private
-
-    def read_chunks input
-      case input
-      when String then
-        i = 0
-        while i < input.bytesize do
-          b = input.byteslice i, @line_size
-          yield b
-          i += @line_size
-        end
-      else
-        loop do
-          b = input.read @line_size
-          break unless b
-          yield b
-          break if b.length < @line_size
-        end
-      end
-    end
-
-  end
-
-  class Dump
-
-    include ReadChunks
-
-    LINE_SIZE = 16
-    ADDR_FMT = "%%0%dx:"
-
-    def initialize full: nil, upper: false, line_size: nil, addr_len: nil, input: nil
-      @full = full
-      @input = input
-      @line_size = line_size||LINE_SIZE
-      @addr_fmt = ADDR_FMT % (addr_len||8)
-      @nib_fmt = "%02x"
-      if upper then
-        @addr_fmt.upcase!
-        @nib_fmt.upcase!
-      end
-    end
-
-    def run input
-      addr = 0
-      prev, repeat = nil, false
-      yield "# #@input" if @input
-      read_chunks input do |b|
-        if b == prev and not @full then
-          unless repeat then
-            yield "*"
-            repeat = true
-          end
-        else
-          r = @addr_fmt % addr
-          r << " "
-          h =  b.unpack "C*"
-          sp = false
-          @line_size.times {
-            x = h.shift
-            r << (x ? @nib_fmt % x : "  ")
-            r << " " if sp
-            sp = !sp
-          }
-          r << " " << (b.gsub /[^ -~]/, ".")
-          yield r
-          prev, repeat = b, false
-        end
-        addr += b.size
-      end
-      yield @addr_fmt % addr
-      nil
-    end
-
-
-    class <<self
-
-      def reverse input, output = nil
-        output ||= ""
-        o = String === output ? (WriteChunksString.new output) : output
-        o.set_encoding Encoding::ASCII_8BIT
-        r, repeat = nil, false
-        input.each_line { |l|
-          l.chomp!
-          case l
-            when /^\s*(?:#|$)/                  then nil
-            when /^\*/                          then repeat = true
-            when /^(?:(\h+):)?\s*((?:\h\h ?)*)/ then
-              addr, nibs = $~.captures
-              if addr then
-                addr = $1.to_i 0x10
-                if repeat then
-                  loop do
-                    s = addr - o.tell
-                    break if s <= 0
-                    o.write s >= r.length ? r : r[ 0, s]
-                  end
-                  repeat = false
-                else
-                end
-                o.seek addr
-              end
-              r = (nibs.scan /\h\h/).map { |x| x.to_i 0x10 }.pack "C*"
-              o.write r
-            else
-              raise "Uninterpretable hex dump: #{l.chomp}"
-          end
-        }
-        output
-      end
-
-    end
-
-  end
-
-  class DumpNums
-
-    include ReadChunks
-
-    LINE_SIZE = 12
-
-    def initialize upper: false, line_size: nil, capitals: nil, input: nil
-      @line_size = line_size||LINE_SIZE
-      @nib_fmt = "%#04x"
-      @nib_fmt.upcase! if upper
-      if input then
-        @varname = input.dup
-        @varname.insert 0, "__" if @varname =~ /\A\d/
-        @varname.gsub! /[^a-zA-Z0-9]/, "_"
-        @varname.upcase! if capitals
-      end
-    end
-
-    def run input, &block
-      if @varname then
-        yield "unsigned char #@varname[] = {"
-        len = run_plain input, &block
-        yield "};"
-        yield "unsigned int #@varname\_len = %d;" % len
-      else
-        run_plain input, &block
-      end
-      nil
-    end
-
-    private
-
-    def run_plain input
-      prev, len = nil, 0
-      read_chunks input do |b|
-        if prev then
-          prev << ","
-          yield prev
-        end
-        prev = "  " + ((b.unpack "C*").map { |x| @nib_fmt % x }.join ", ")
-        len += b.bytesize
-      end
-      yield prev if prev
-      len
-    end
-
-  end
-
-  class WriteChunksString
-    def initialize str
-      @str = str
-    end
-    def set_encoding enc
-      @str.force_encoding enc
-    end
-    def tell ; @pos || @str.length ; end
-    def seek pos
-      s = pos - @str.length
-      if s >= 0 then
-        s.times { @str << "\0".b }
-      else
-        @pos = pos
-      end
-    end
-    def write b
-      if @pos then
-        l = b.length
-        @str[ @pos, l] = b
-        @pos += l
-        @pos = nil if @pos >= @str.length
-      else
-        @str << b
-      end
-    end
-  end
-
-end
-
-# ----------------------------------------------------------------
-
-end
-