nvim 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f33b262cf70f6226c1af40d6b6173c56f5d808e7e4ba6629caa342f3131944
-  data.tar.gz: b78833e0442c2ba8e6a74786576bb4dcfecf5ecebf005bd45dd1c9b4a49732f5
+  metadata.gz: d91e5ad07b2fd0ea6dd1da251df0e55dad1312b3ac4fa585cae59658dbccf666
+  data.tar.gz: bde8ff51d7a22f70aca3c58f83051b32357f0d56603bdbd7ce209ce6acf94de9
 SHA512:
-  metadata.gz: 49a0ba665e6d93a4f629b1b0375c29237d90cbb2510bb99d4ff3e4533f7e5cab68c76ee841cc7b25a5117411f5fb5e2ab24d3763f9cf4fa9617b9bef4d693cab
-  data.tar.gz: 1dafb13f71a994566f383577de178766fa6e0dc05a36075dc2af53c77cf3c5a0c8b21ac8dc08835fcbe89824441b857a193cfa8a503537f8ad642775276b8f6b
+  metadata.gz: c5d55983ed98e326fe1a5a6c15e764ac0a3aff858dadf3538c6edcee5339d7fb117b33984d80334d2fb18d7f8fbd505d89ca854aec09bbbf6513c07b5f9c48ee
+  data.tar.gz: c7dc22c69ddcb550b1d1a412963788b33f77337f5520ea87bc4bf2edabed162bcd59402e605eac6a46109c1953994024f88211c2d21af12efb9722e3eab36422

data/INFO.yaml

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

data/LICENSE

@@ -1,6 +1,6 @@
 # BSD-2-clause license, extended by language use conditions
 
-Copyright (C) 2024, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2024-2025, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -207,6 +207,52 @@ Yet, you should avoid to use `fork` and `exec`, except when
 you're absolutely sure what you're doing.
 
 
+#### Global variables
+
+The global variable `$vim` will be set to the client.
+
+```
+~
+~
+:ruby $vim.command "split"
+```
+
+Further, the variables `$range` and `$lines` will be set.
+
+```
+ 1 foo
+ 2 bar
+ 3 baz
+~
+:%ruby puts $range.inspect, $lines.inspect
+```
+
+The legacy variables `$curbuf` and `$curwin` are supported.
+
+```
+~
+~
+:ruby puts $curbuf.get_name, $curwin.get_height
+```
+
+
+### Requiring Ruby files
+
+In addition to the `:rubyfile` command as documented, that command can also be
+used to just require a Ruby file. Set the name into angle brackets, and the
+file will be searched in `$:`. Sorry, file name completion will not work.
+
+```
+~
+~
+:rubyfile <yaml>
+```
+
+In this case, the global variables `$range` and `$lines` will not be set. Yet,
+`$vim` still will be available. See the
+[Nxxd](https://github.com/BertramScharpf/ruby-nxxd) gem for a nice example.
+
+
 ### List all API functions
 
 To show a list of the API functions call something like this:
@@ -365,7 +411,7 @@ main:1:004> \q!!
 Put text into an X selection or a TMux register.
 
 ```vim
-let g:ruby_require = "neovim/tools/copy"
+rubyfile <neovim/tools/copy>
 '<,'>ruby xsel $lines
 '<,'>ruby xsel! $lines
 '<,'>ruby tmuxbuf $lines
@@ -375,16 +421,16 @@ Make a hex dump.
 
 ```vim
 ruby <<EOT
-  require "neovim/foreign/xxd"
+  require "neovim/foreign/nxxd"
   bn = $curbuf.get_name
-  $vim.command :new
-  File.open bn do |b| Xxd::Dump.new.run b do |l| $vim.put [l], "l", false, true end end
+  $vim.command :enew!
+  File.open bn do |b| Nxxd::Dump.new.run b do |l| $vim.put [l], "l", false, true end end
 EOT
 ```
 
 
 ## Copyright
 
-  * (C) 2024 Bertram Scharpf <software@bertram-scharpf.de>
+  * (C) 2024,2025 Bertram Scharpf <software@bertram-scharpf.de>
   * License: [BSD-2-Clause+](./LICENSE)
 

data/Rakefile

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

data/lib/neovim/client.rb

@@ -16,9 +16,6 @@ module Neovim
       attr_accessor :strict
     end
 
-    class UnknownApiFunction       < RuntimeError ; end
-    class UnknownApiObjectFunction < RuntimeError ; end
-
 
     attr_reader :channel_id
 

data/lib/neovim/foreign/{xxd.rb → nxxd.rb}

@@ -1,19 +1,20 @@
 #
-#  neovim/foreign/xxd.rb  --  Xxd reimplementation
+#  neovim/foreign/nxxd.rb  --  Hex Dump Tool
 #
 
 # The purpose of this is simply to reduce dependencies.
 
 begin
-  require "xxd"
+  require "nxxd"
 rescue LoadError
 
 # ----------------------------------------------------------------
 #
-#  xxd.rb  --  A Reimplementation of Xxd in plain Ruby
+#  nxxd.rb  --  Hex Dump Tool
 #
 
-module Xxd
+
+module Nxxd
 
   module ReadChunks
 
@@ -87,53 +88,44 @@ module Xxd
         addr += b.size
       end
       yield @addr_fmt % addr
+      nil
     end
 
+
     class <<self
 
-      def reverse input
-        r = nil
-        pos = 0
-        repeat = false
+      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
-            when /^\*/   then repeat = true
-            else
-              if (l.slice! /^(\h+):\s*/) then
+            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
-                  while pos + r.length < addr do
-                    yield r
-                    pos += r.length
-                  end
-                  if pos < addr then
-                    yield r[ 0, addr - pos]
-                    pos = addr
+                  loop do
+                    s = addr - o.tell
+                    break if s <= 0
+                    o.write s >= r.length ? r : r[ 0, s]
                   end
                   repeat = false
                 else
-                  if pos < addr then
-                    r = ([0].pack "C*") * (addr - pos)
-                    yield r
-                    pos = addr
-                  elsif pos > addr then
-                    yield nil, addr
-                    pos = addr
-                  end
                 end
+                o.seek addr
               end
-              row = []
-              while (nib = l.slice! /^\h\h ?/) do
-                row.push nib.to_i 0x10
-              end
-              if row.any? then
-                r = row.pack "C*"
-                yield r
-                pos += r.length
-              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
@@ -161,12 +153,13 @@ module Xxd
     def run input, &block
       if @varname then
         yield "unsigned char #@varname[] = {"
-        yield "};"
         len = run_plain input, &block
+        yield "};"
         yield "unsigned int #@varname\_len = %d;" % len
       else
         run_plain input, &block
       end
+      nil
     end
 
     private
@@ -187,6 +180,34 @@ module Xxd
 
   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
 
 # ----------------------------------------------------------------

data/lib/neovim/info.rb

@@ -1,10 +1,10 @@
 require "neovim/meta.rb"
 Neovim::INFO = Neovim::Meta.new "nvim",
-  version: "1.5.1",
+  version: "1.6.1",
   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: "3508371"
+  commit: "4e96338"

data/lib/neovim/remote_object.rb

@@ -38,6 +38,9 @@ module Neovim
   end
 
 
+  class UnknownApiFunction       < RuntimeError ; end
+  class UnknownApiObjectFunction < RuntimeError ; end
+
 
   class RemoteObject
 

data/lib/neovim/ruby_provider.rb

@@ -203,11 +203,17 @@ module Neovim
 
     # This is called by the +:rubyfile+ command.
     dsl.rpc :ruby_execute_file do |client,path,fst,lst|
-      set_globals client, fst..lst do ||
-        r = File.read path
-        script_binding.eval r, "ruby_file #{path}"
+      if path =~ /<(.*)>\z/ then
+        set_global_client client do
+          require $1
+        end
+      else
+        set_globals client, fst..lst do ||
+          r = File.read path
+          script_binding.eval r, "ruby_file #{path}"
+        end
+        nil
       end
-      nil
     end
 
     # This is called by the +:rubydo+ command.

data/nvim.gemspec

@@ -25,6 +25,7 @@ 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.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies: []
 email: software@bertram-scharpf.de
 executables:
@@ -46,9 +46,9 @@ 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/foreign/xxd.rb
 - lib/neovim/handler.rb
 - lib/neovim/host.rb
 - lib/neovim/info.rb