nvim 1.0.0 → 1.2.0

data/lib/neovim/tools/calculator.rb

@@ -0,0 +1,112 @@
+#
+#  neovim/tools/calculator.rb  --  Simple calculator
+#
+
+require "supplement"
+require "bigdecimal"
+
+
+module Neovim
+
+  class Calculator
+
+    def result
+      r = @result.round @decs
+      case r
+      when BigDecimal then
+        r = r.to_s "F"
+        r.sub! /(?:(\.)([0-9]+))?\z/ do
+          (@sep||$1) + ($2.to_s.ljust @decs, "0")
+        end
+      when Integer    then
+        r = r.to_s
+      end
+      r
+    end
+
+    def reset!
+      @result = nil
+    end
+
+    def decs= d ; @decs = Integer d ; end
+
+    def dot!   ; @sep, @grp = ".", "," ; end
+    def comma! ; @sep, @grp = ",", "." ; end
+    def dot?   ; @sep == "." ; end
+    def comma? ; @sep == "," ; end
+
+    def add line
+      line = line.chomp
+      line.slice! /#.*/
+      if $& =~ /!(\w+)/ then
+        case $1
+          when "c", "comma", "k", "komma" then comma!
+          when "d", "dot", "p", "point"   then dot!
+          when /\A\d+\z/                  then @decs = $1.to_i
+        end
+      end
+      line.slice! /^.*:/
+      line.strip!
+      line.notempty? or return
+
+      products = []
+      line.split /(?<![,.])[+-]/ do |p|
+        products.push [ (split_products p), $& == "-"]
+      end
+
+      minus = false
+      products.each { |p,nm|
+        if not @result then @result =  p
+        elsif minus    then @result -= p
+        else                @result += p
+        end
+        minus = nm
+      }
+      @result
+    end
+
+    private
+
+    def split_products p
+      nums = []
+      p.split /[*\/]/ do |n|
+        nums.push [ (parse_number n), $& == "/"]
+      end
+
+      inv = false
+      prod = nil
+      nums.each  { |n,ni|
+        if not prod then prod =  n
+        elsif inv   then prod /= n
+        else             prod *= n
+        end
+        inv = ni
+      }
+      @prev = prod
+    end
+
+    def parse_number n
+      n.strip!
+      if n =~ %r/ *%\z/ then
+        @prev * (BigDecimal $`) / 100
+      else
+        comma! if not @sep and n =~ /\d,\d/
+        case @sep
+        when "," then n.gsub! @grp, "_" ; n.sub! @sep, "."
+        when "." then n.gsub! @grp, "_"
+        end
+        if    n =~ /\.-/ then
+          n = $`
+          @decs ||= 2
+        elsif n =~ /\.(\d*)/ then
+          d = $1.length
+          @decs = d if not @decs or @decs < d
+        end
+        @decs.nonzero? ? (BigDecimal n) : (Integer n)
+      end
+    end
+
+  end
+
+end
+

data/lib/neovim/tools/copy.rb

@@ -0,0 +1,78 @@
+#
+#  neovim/tools/copy.rb  --  Set X11 selection and Tmux buffer
+#
+
+
+module Kernel
+
+  private
+
+  def xsel data = nil, sel: :primary
+    if    ($xsel  ||= command? "xsel" ) then
+      cmd = [ $xsel]
+      case sel
+      when :primary   then cmd.push "-p"
+      when :secondary then cmd.push "-s"
+      when :clipboard then cmd.push "-b"
+      end
+      ci, co = "-i", "-o"
+    elsif ($xclip ||= command? "xclip") then
+      cmd = [ $xclip, "-selection", sel.to_s]
+      ci, co = "-i", "-o"
+    end
+    cmd or raise ScriptError, "Sorry, Neither xsel nor xclip seem to be installed."
+    if data then
+      cmd.push ci
+      cmd_write cmd, data
+    else
+      cmd.push co
+      cmd_read  cmd
+    end
+  end
+  def xsel! data, sel: :clipboard
+    xsel data, sel: sel
+  end
+
+  def tmuxbuf data = nil, name: nil
+    $tmux ||= command? "tmux"
+    $tmux or raise ScriptError, "Sorry, TMux doesn't seem to be installed."
+    args = []
+    if name then
+      args.push "-b", name
+    end
+    args.push "-"
+    if data then
+      cmd_write [ $tmux, "load-buffer", *args], data
+    else
+      cmd_read  [ $tmux, "save-buffer", *args]
+    end
+  end
+
+
+  def command? cmd
+    if cmd[ File::SEPARATOR] then
+      cmd if File.executable? cmd
+    else
+      (ENV[ "PATH"].split File::PATH_SEPARATOR).each { |p|
+        c = File.join p, cmd
+        return c if File.executable? c
+      }
+      nil
+    end
+  end
+
+  def cmd_write cmd, data
+    case data
+    when Array  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
+
+  def cmd_read cmd
+    IO.popen cmd, "r" do |t| t.read end
+  end
+
+end
+

data/lib/neovim/vimscript_provider.rb

@@ -12,7 +12,7 @@ module Neovim
     TYPE = :rplugin
 
     def initialize source
-      super
+      super *[]
       @source = source
     end
 

data/lib/neovim.rb

@@ -7,13 +7,23 @@ require "neovim/host"
 
 module Neovim
 
+  class Job < Provider
+
+    def initialize plugins, conn
+      super plugins, conn
+      start
+    end
+
+  end
+
   class <<self
 
     def start_remote &block
-      Host.run do |h|
-        DslRemote.open :remote, h, &block
-        h.start
-      end
+      Job.run mk_plugins &block
+    end
+
+    def mk_plugins &block
+      { remote: (DslRemote.open &block) }
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nvim
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email: software@bertram-scharpf.de
@@ -29,18 +29,20 @@ files:
 - lib/neovim/foreign/mplight/bufferio.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
 - lib/neovim/logging.rb
-- lib/neovim/messager.rb
 - lib/neovim/meta.rb
+- lib/neovim/output.rb
 - lib/neovim/remote.rb
 - lib/neovim/remote_object.rb
 - lib/neovim/ruby_provider.rb
-- lib/neovim/session.rb
+- lib/neovim/tools/calculator.rb
+- lib/neovim/tools/copy.rb
 - lib/neovim/vimscript_provider.rb
-homepage: http://bertram-scharpf.de
+homepage: https://github.com/BertramScharpf/ruby-nvim
 licenses:
 - BSD-2-Clause+
 metadata: {}
@@ -59,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Yet another Ruby client for Neovim

data/lib/neovim/messager.rb

@@ -1,185 +0,0 @@
-#
-#  neovim/messager.rb  --  Send and Receive Messages
-#
-
-require "neovim/foreign/supplement"
-
-require "neovim/logging"
-
-
-module Neovim
-
-  class Messager
-
-    class Message
-
-      @subs, @subh = [], {}
-
-      class <<self
-
-        def from_array ary
-          kind, *payload = *ary
-          klass = find kind
-          klass[ *payload]
-        end
-
-        def inherited cls ; @subs.push cls ; end
-        def find id
-          @subh[ id] ||= @subs.find { |c| c::ID == id }
-        end
-
-        alias [] new
-
-      end
-
-      def initialize *args
-        z = self.class::KEYS.zip args
-        @cont = z.inject Hash.new do |c,(h,k)| c[h] = k ; c end
-      end
-
-      def inspect
-        c = self.class.name.sub /.*::/, ""
-        "#<#{c} #@cont>"
-      end
-
-      def to_s
-        c = self.class.name.sub /.*::/, ""
-        j = @cont.map { |k,v| "#{k}:#{v}" if v }.compact.join ","
-        "#{c}(#{j})"
-      end
-
-      def method_missing sym, *args
-        if @cont.key? sym then @cont[ sym] else super end
-      end
-
-      def respond_to_missing? sym, priv = nil
-        @cont.key? sym.to_sym
-      end
-
-      def methods *args
-        super.concat @cont.keys
-      end
-
-      def to_h ; @cont ; end
-
-      def fields ; @cont.fetch_values *self.class::KEYS ; end
-
-      def to_a
-        [self.class::ID, *fields]
-      end
-
-      class Request < Message
-        ID = 0
-        KEYS = %i(request_id method_name arguments)
-      end
-
-      class Response < Message
-        ID = 1
-        KEYS = %i(request_id error value)
-        def initialize *args
-          super
-          e = @cont[ :error]
-          if e and not Array === e then
-            @cont[ :error] = [0, e]
-          end
-        end
-
-      end
-
-      class Notification < Message
-        ID = 2
-        KEYS = %i(method_name arguments)
-      end
-
-    end
-
-    class ResponseError < StandardError ; end
-
-    class Disconnected < RuntimeError
-      def initialize
-        super "Lost connection to nvim process"
-      end
-    end
-
-
-    include Logging
-
-    def initialize conn, session
-      @conn, @session = conn, session
-      @request_id = 0
-      @responses = {}
-    end
-
-    def run until_id = nil
-      loop do
-        message = get
-        case message
-        when Message::Response then
-          if @responses.key? message.request_id then
-            @responses[ message.request_id] = message
-          else
-            log :warning, "Dropped response", message.request_id
-          end
-        when Message::Request then
-          begin
-            r = @session.execute_handler message.method_name, message.arguments
-            log :debug1, "Request result", result: r
-          rescue
-            e = [ 0, $!.to_s]
-            log_exception :error
-          end
-          rsp = Message::Response.new message.request_id, e, r
-          put rsp
-        when Message::Notification then
-          begin
-            @session.execute_handler message.method_name, message.arguments
-          rescue
-            log_exception :error
-          end
-        end
-        break if until_id and @responses[ until_id]
-      end
-    end
-
-    def request method, *args
-      @request_id += 1
-      put Message::Request[ @request_id, method, args]
-      @responses[ @request_id] = nil
-      run @request_id
-      r = @responses.delete @request_id
-      if r.error then
-        t, e = *r.error
-        t = @conn.error t
-        raise ResponseError, "#{t}: #{e}"
-      end
-      r.value
-    end
-
-    def notify method, *args
-      put Message::Notification[ method, args]
-    end
-
-    private
-
-    def put msg
-      log :debug1, "Sending Message", data: msg
-      @conn.put msg.to_a
-      self
-    rescue Errno::EPIPE
-      raise Disconnected
-    end
-
-    def get
-      IO.select [@conn.input], nil, nil
-      raise Disconnected if @conn.eof?
-      msg = Message.from_array @conn.get
-      log :debug1, "Received Message", data: msg
-      msg
-    rescue EOFError
-      raise Disconnected
-    end
-
-  end
-
-end
-

data/lib/neovim/session.rb

@@ -1,60 +0,0 @@
-#
-#  neovim/session.rb  --  Sessions
-#
-
-require "neovim/foreign/supplement"
-
-require "neovim/logging"
-require "neovim/connection"
-require "neovim/messager"
-
-
-module Neovim
-
-  class Session
-
-    include Logging
-
-    class <<self
-
-      private :new
-
-      def open conntype, *args, **kwargs
-        conntype.open_files *args, **kwargs do |conn|
-          yield (new conn)
-        end
-      end
-
-      include Logging
-
-      def start *args
-        open_logfile do
-          log :info, "Starting", args: $*
-          open *args do |i|
-            yield i
-          end
-        ensure
-          log :info, "Leaving"
-        end
-      end
-
-    end
-
-    def initialize conn
-      @conn = conn
-      @comm = Messager.new @conn, self
-    end
-
-    def execute_handler name, args
-      raise "No handler found for #{name.inspect}."
-    end
-
-
-    def run ; @comm.run ; end
-    def request method, *args ; @comm.request method, *args ; end
-    def notify  method, *args ; @comm.notify  method, *args ; end
-
-  end
-
-end
-