nvim 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8207d1ea220ae3a18b71de6377beaac8f117b7b8fb2c816f773a36dc2852043
-  data.tar.gz: eb0c7bf8c52bc66a26952c5985edc3a0ffca154b0ba51560f9802428e51594b2
+  metadata.gz: 86b10be9d49da003c89060559febe3e475e543660e957e6c3dffc15522fbbdd5
+  data.tar.gz: 5d4ea6f5bf523a0a8918eb5a6defbbdf58bfd001fde2ba77d75c4ccd2a75858b
 SHA512:
-  metadata.gz: 17c4b731220d2da8b667da00bfba85b63f27664d0d6119f4d021b92e66c24ecabd279abc090b8cba6b5ff84baeb2561d6ce3410c7fabb1c91a94857c82d2f82e
-  data.tar.gz: 3197fe71bdd9506350206fff209e2b0c9fb93bfa926f204e4bebcbacfee849a566b42f9f576efdeb86ee751fbc7b8197a07329fe6e2e9191b735ad86ac3c9604
+  metadata.gz: 976dbd80726c5626ff8aacefe48f3b9a3f30b432eb915ab82dca589604bc23260f8073184bf007a168acf7576d1923c8ede6fc3d59f64f7751ec54e4d4a37867
+  data.tar.gz: 8f1f04a090a323ffed4011a7a8c22953a3d294034d5e319f5825307c9c45528766a6ac1268483ba540e773d3b6763048580032aa6f4dfc191d89d7e8355fb648

data/INFO.yaml

@@ -3,7 +3,7 @@
 #
 
 nvim:
-  version: 1.0.0
+  version: 1.1.0
   license: BSD-2-Clause+
   authors:
     - Bertram Scharpf
@@ -14,5 +14,5 @@ nvim:
     A simple Ruby client for Neovim.
     Clean code, minimal dependecies, no frills, no wokeness.
 
-  homepage: http://bertram-scharpf.de
+  homepage: https://github.com/BertramScharpf/ruby-nvim
 

data/README.md

@@ -69,6 +69,9 @@ 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
@@ -129,6 +132,8 @@ This results in:
 :
 ```
 
+The anonymous variable `_` hold this last result.
+
 Output will be added to the buffer, too.
 
 ```
@@ -257,6 +262,29 @@ main:1:004> \q!!
 ```
 
 
+#### Miscellaneous Tools
+
+Put text into an X selection or a TMux register.
+
+```vim
+let g:ruby_require = "neovim/tools/copy"
+'<,'>ruby xsel $lines
+'<,'>ruby xsel! $ines
+'<,'>ruby tmuxbuf $lines
+```
+
+Make a hex dump.
+
+```vim
+ruby <<EOT
+  require "neovim/foreign/xxd"
+  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
+EOT
+```
+
+
 ## Copyright
 
   * (C) 2024 Bertram Scharpf <software@bertram-scharpf.de>

data/bin/neovim-ruby-host

@@ -9,6 +9,11 @@ require "neovim/host"
 
 module Neovim
 
+  if $*.delete "--version" then
+    puts [ INFO.name, INFO.version].join " "
+    exit
+  end
+
   class <<self
 
     def plugin &block
@@ -18,33 +23,31 @@ module Neovim
 
     private
 
-    def run_dsl dsl
-      @host or raise "Can't add plugins outside of a running session."
-      dsl.open @path, @host do |dsl|
-        yield dsl
-      end
+    def run_dsl dsl, &block
+      @plugins or raise "Can't add plugins outside of a running session."
+      @plugins[ @path] = dsl.open @path, &block
     end
 
-  end
-
-  if $*.delete "--version" then
-    puts [ Neovim::INFO.name, Neovim::INFO.version].join " "
-    exit
-  end
-
-  r = Host.run do |h|
-    begin
-      @host = h
-      $*.each do |p|
-        @path = p
-        Kernel.load @path, true
+    public
+
+    def load_plugins
+      begin
+        @plugins = {}
+        $*.each do |p|
+          @path = p
+          Kernel.load @path, true
+        ensure
+          @path = nil
+        end
+        @plugins
       ensure
-        @path = nil
+        @plugins = nil
       end
-    ensure
-      @host = nil
     end
+
   end
+
+  r = Host.run load_plugins
   exit r.to_i
 
 end

data/lib/neovim/connection.rb

@@ -33,8 +33,8 @@ module Neovim
     end
 
 
-    def start comm, client_name, client_type, client_methods = nil
-      comm.notify :nvim_set_client_info, client_name, Neovim::INFO.version_h, client_type, client_methods||{}, Neovim::INFO.attributes
+    def start comm
+      comm.notify :nvim_set_client_info, comm.client_name, INFO.version_h, comm.client_type, comm.client_methods||{}, INFO.attributes
       channel_id, api_info = *(comm.request :nvim_get_api_info)
       @client = Client.new comm, channel_id
       prefixes = {}

data/lib/neovim/foreign/supplement.rb

@@ -14,6 +14,15 @@ rescue LoadError
   class FalseClass ; def to_bool ; false ; end ; end
   class Object     ; def to_bool ; true  ; end ; end
   class <<Struct ; alias [] new ; end
+  class Module
+    def plain_name
+      sep = "::"
+      n = name.dup
+      i = n.rindex sep
+      n.slice! 0, i+sep.length if i
+      n
+    end
+  end
   class String
     def axe n
       if n < length then

data/lib/neovim/foreign/xxd.rb

@@ -0,0 +1,195 @@
+#
+#  neovim/foreign/xxd.rb  --  Xxd reimplementation
+#
+
+# The purpose of this is simply to reduce dependencies.
+
+begin
+  require "xxd"
+rescue LoadError
+
+# ----------------------------------------------------------------
+#
+#  xxd.rb  --  A Reimplementation of Xxd in plain Ruby
+#
+
+module Xxd
+
+  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
+    end
+
+    class <<self
+
+      def reverse input
+        r = nil
+        pos = 0
+        repeat = false
+        input.each_line { |l|
+          case l
+            when /^\s*#/ then
+            when /^\*/   then repeat = true
+            else
+              if (l.slice! /^(\h+):\s*/) 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
+                  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
+              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
+          end
+        }
+      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[] = {"
+        yield "};"
+        len = run_plain input, &block
+        yield "unsigned int #@varname\_len = %d;" % len
+      else
+        run_plain input, &block
+      end
+    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
+
+end
+
+# ----------------------------------------------------------------
+
+end
+

data/lib/neovim/handler.rb

@@ -29,9 +29,8 @@ module Neovim
     def sync ; @spec[ :sync] ; end
     alias sync? sync
 
-    def execute *args
-      @block.call *args
-    end
+    def needs_client? ; true ; end
+    def execute *args ; @block.call *args ; end
 
     private
 
@@ -49,18 +48,30 @@ module Neovim
 
   end
 
+  class HandlerPlain < Handler
+
+    def initialize *args, **kwargs
+      super *args, **kwargs do |client,*a|
+        yield *a
+      end
+    end
+
+    def needs_client? ; false ; end
+
+  end
+
   class DslBase
 
     class Plugins
 
       attr_reader :type
 
-      def initialize type, setup_blocks, handlers
-        @type, @setup_blocks, @handlers = type, setup_blocks, handlers
+      def initialize type, setups, handlers
+        @type, @setups, @handlers = type, setups, handlers
       end
 
       def setup client
-        @setup_blocks.each { |b| b.call client }
+        @setups.each { |b| b.call client }
       end
 
       def get_handler name
@@ -81,46 +92,48 @@ module Neovim
 
     class <<self
       private :new
-      def open source, host
-        i = new source
+      def open *args
+        i = new *args
         yield i
-        i.add_plugins source, host
+        i.mkplugin
       end
     end
 
-    def initialize source
-      @setup_blocks = []
+    def initialize
+      @setups = []
       @handlers = {}
     end
 
-    def add_plugins source, host
-      host.add_plugins source, (Plugins.new self.class::TYPE, @setup_blocks, @handlers)
+    def mkplugin
+      Plugins.new self.class::TYPE, @setups, @handlers
     end
 
     private
 
+    HANDLER = Handler
+
     def add_handler qualified_name, name, type = nil, sync = nil, **opts, &block
       name = name.to_s
       qualified_name ||= name
-      h = Handler.new name, type, sync, **opts, &block
+      h = self.class::HANDLER.new name, type, sync, **opts, &block
       log :info, "Adding Handler", qualified_name: qualified_name, handler: h.spec
       @handlers[ qualified_name] = h
     end
 
     def add_setup_block &block
-      @setup_blocks.push block
+      @setups.push block
     end
 
   end
 
   class DslPlain < DslBase
 
-    TYPE = :base
+    TYPE = nil
 
-    def plain name, **opts
-      add_handler nil, name, **opts do |client,*args|
-        yield *args
-      end
+    HANDLER = HandlerPlain
+
+    def plain name, **opts, &block
+      add_handler nil, name, **opts, &block
     end
 
   end

data/lib/neovim/host.rb

@@ -3,29 +3,48 @@
 #
 
 require "neovim/remote"
+require "neovim/handler"
 
 
 module Neovim
 
-  class Host < Remote
+  class Provider < Remote
 
     class <<self
 
-      def start
-        super ConnectionStdio do |h|
+      def start plugins
+        super plugins, ConnectionStdio do |h|
           yield h
         end
       end
 
+      def run plugins
+        $stdin.tty? and raise "This program expects to be called by Neovim. It can't run interactively."
+        start plugins do |h|
+          h.run
+          nil
+        rescue Remote::Disconnected
+          log :fatal, "Disconnected"
+          nil
+        rescue SignalException
+          n = $!.signm
+          log :fatal, "Signal was caught: #{n}"
+          (n =~ /\A(?:SIG)?TERM\z/) ? 0 : 1
+        rescue Exception
+          log_exception :fatal
+          2
+        end
+      end
+
     end
 
-    attr_reader :plugins
+  end
 
-    BASE = :base
+  class Host < Provider
 
-    def initialize conn
-      super
-      DslPlain.open BASE, self do |dsl|
+    def initialize plugins, conn
+      super plugins, conn
+      @plugins[ :base] = DslPlain.open do |dsl|
         dsl.plain "poll" do
           start
           @plugins.each_value { |p| p.setup @conn.client }
@@ -42,45 +61,6 @@ module Neovim
       end
     end
 
-    def client_name
-      types = @plugins.map { |_,p| p.type if p.type != BASE }
-      types.uniq!
-      types.compact!
-      name = types.join "-"
-      log :info, "Client Name", name: name
-      "ruby-#{name}-host"
-    end
-
-    def client_methods
-      r = {}
-      @plugins[ BASE].options { |name,opts| r[ name] = opts }
-      r
-    end
-
-
-    class <<self
-
-      def run
-        $stdin.tty? and raise "This program expects to be called by Neovim. It can't run interactively."
-        Host.start do |h|
-          yield h
-          h.run
-          nil
-        rescue Messager::Disconnected
-          log :fatal, "Disconnected"
-          nil
-        rescue SignalException
-          n = $!.signm
-          log :fatal, "Signal was caught: #{n}"
-          (n =~ /\A(?:SIG)?TERM\z/) ? 0 : 1
-        rescue Exception
-          log_exception :fatal
-          2
-        end
-      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.0.0",
+  version: "1.1.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: "http://bertram-scharpf.de",
-  commit: "e927f7e"
+  homepage: "https://github.com/BertramScharpf/ruby-nvim",
+  commit: "45c1473"

data/lib/neovim/logging.rb

@@ -5,6 +5,15 @@
 require "neovim/foreign/supplement"
 
 
+class Object
+  def class_name
+    obj = self
+    while not obj.is_a? Module do obj = obj.class end
+    obj.plain_name
+  end
+end
+
+
 module Neovim
 
   module Logging
@@ -111,7 +120,7 @@ module Neovim
 
     class Text < Stream
       NAME = "file"
-      def initialize file, color: nil, short: nil
+      def initialize file, color: nil, short: nil, maxlen: 256
         super
         @color =
           case color
@@ -120,7 +129,7 @@ module Neovim
           when Integer     then true
           else                  @file.tty?
           end
-        @short = short
+        @short, @maxlen = short, maxlen
       end
       COLORS = %w(33 32 34;1 4 31;1 35;1 36)
       def put **fields
@@ -131,8 +140,8 @@ module Neovim
           (fields.delete :caller).to_s[ %r([^/]+:\d+)],
           (fields.delete :level),
           (fields.delete :message).inspect,
-          ((fields.delete :class).to_s.sub /.*::/, ""),
-          ((fields.map { |k,v| "#{k}:#{v}" }.join " ").axe 256),
+          (fields.delete :sender).class_name,
+          ((fields.map { |k,v| "#{k}:#{v}" }.join " ").axe @maxlen),
         ]
         if @color then
           l = l.zip COLORS
@@ -216,16 +225,16 @@ module Neovim
 
     def log level, message, **kwargs
       Logging.put level, message,
-        class: self.class, caller: (caller 1, 1).first,
+        sender: self, caller: (caller 1, 1).first,
         **kwargs
     end
 
     def log_exception level
       Logging.put level, "Exception: #$!",
-        class: self.class, caller: (caller 1, 1).first,
+        sender: self, caller: (caller 1, 1).first,
         exception: $!.class
       $@.each { |b|
-        Logging.put :debug3, "Backtrace", line: b
+        Logging.put :debug3, "Backtrace", sender: self, line: b
       }
       nil
     end